212 files changed, 73100 insertions, 40619 deletions

diff --git a/ChangeLog b/ChangeLog
index 0cc6dbf274..54402ed777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,105 @@
+2008-08-07  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #535745
+
+	* configure.in: Require and link calendar libs with libgdata
+	and libgdata-google.
+
+2008-08-06  Michael Monreal  <mmonreal@svn.gnome.org>
+
+	** Fix for bug #467115
+
+	* addressbook/gui/component/addressbook-view.c:
+	(addressbook_view_init):
+	* calendar/gui/GNOME_Evolution_Calendar.server.in.in:
+	* calendar/gui/memos-component.c: (create_component_view):
+	* calendar/gui/tasks-component.c: (create_component_view):
+	* data/icons/Makefile.am:
+	* mail/GNOME_Evolution_Mail.server.in.in:
+	* mail/mail-component.c: (impl_createView):
+	Ship and use tango icons for the mail, tasks and memos components.
+
+2008-08-06  Michael Monreal  <mmonreal@svn.gnome.org>
+
+	** Fix for bug #531288
+
+	* data/icons/Makefile.am:
+	* mail/GNOME_Evolution_Mail.server.in.in:
+	Use proxy icon from tango-icon-theme and fall back to the icon
+	shipped by gnome-control-center (thanks to Josef Vybíral).
+
+2008-08-04  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS: Evolution 2.23.6 release and version bump.
+
+2008-08-04  Matthias Braun <matze@braunis.de>
+
+	** Fix for bug #544051 - Added a plugin for the WebDAV addressbook 
+	account setup. 
+
+	* configure.in:
+	* plugins/webdav-account-setup/Makefile.am:
+	* plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
+	:
+	* plugins/webdav-account-setup/webdav-contacts-source.c
+	(ensure_webdav_contacts_source_group),
+	(remove_webdav_contacts_source_group), (print_uri_noproto),
+	(set_ui_from_source), (set_source_from_ui), (on_entry_changed),
+	(on_toggle_changed), (destroy_ui_data), (plugin_webdav_contacts),
+	(e_plugin_lib_enable):
+
+2008-07-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545558
+
+	* configure.in:
+	Mark the "hula-account-setup" plugin as experimental.
+
+2008-07-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Bump eds_minimum_version to 2.23.6 for CAMEL_PROVIDER_CONF_OPTIONS.
+
+2008-07-23  Johnny Jacob  <jjohnny@novell.com>
+
+	* configure.in: Version bumped to 2.23.6.
+	* NEWS: Updates for 2.23.5
+
+2008-07-22  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #544022
+
+	* configure.in: Do not redefine DBUS_VERSION define supplied
+	by dbus itself, rather rename our define to FOUND_DBUS_VERSION.
+	
+2008-07-21  Johnny Jacob  <jjohnny@novell.com>
+
+	* data/hicolor_actions_24x24_query-free-busy.png: Moved to 
+	data/icons/hicolor_actions_24x24_query-free-busy.png as per 
+	rev 35753.
+	
+2008-07-21  Matthew Barnes  <mbarnes@redhat.com>
+
+	* Makefile.am:
+	Add doltcompile and doltlibtool to DISTCLEANFILES to fix
+	distcheck breakage.
+	
+2008-07-20  Bharath Acharya  <abharath@novell.com>
+
+	** Part of fix for bug #200147
+
+	* configure.in: Added a new plugin templates, which will make it 
+	possible for users to use standard templates to reply to their messages.
+
+2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
+
+	* data/icons/hicolor_actions_24x24_query-free-busy.png:
+	Moved here from art/query-free-busy.png so we can treat it as a
+	named icon.
+
+	* data/icons/Makefile.am:
+	Add hicolor_actions_24x24_query-free-busy.png.
+
 2008-07-03  Matthew Barnes  <mbarnes@redhat.com>
 
 	* configure.in:
diff --git a/Makefile.am b/Makefile.am
index 65b219f6f7..e9bf3c62e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,8 @@ SUBDIRS += help
 endif
 
 DISTCLEANFILES = 		\
+	doltcompile		\
+	doltlibtool		\
 	intltool-extract	\
 	intltool-merge 		\
 	intltool-update 	\
diff --git a/NEWS b/NEWS
index ee731f4f80..3a6dc5e49c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,141 @@
+Evolution 2.23.6 2008-08-04
+---------------------------
+
+New in 2.23.6:
+	WebDAV contacts plugin (Matthias Braun)
+
+Bug Fixes:
+	#211267: Report correct number of pages to print and print them as requested (Milan Crha)
+	#249844: Use fully qualified names for "New" submenu entries (Matthew Barnes)
+	#256540: Do not use GtkNotebook with only one tab (Milan Crha)
+	#329821: Recalculate returned row to the model row, if we are sorting (Milan Crha)
+	#353927: Do not blink the icon more than 15 seconds (Milan Crha)
+	#428384: Improve buttons in the "exit-unsaved" dialog by replacing "Cancel" with "Continue Editing" and "Save Message" with "Save Draft". (Matthew Barnes)
+	#491176: Word-wrap the summary if necessary; keep the text and action buttons aligned on the left (Milan Crha)
+	#500389: New ability to define Options (ComboBox) in provider's options (Milan Crha)
+	#504417: Preferences windows cut off (Lucian Langa)
+	#514006: Quote literal values (Matthew Barnes)
+	#517151: Give a mnemonic to "Composer in External Editor" (Matthew Barnes)
+	#517825: Fix duplicate mnemonic.  "_Work Offline" -> "Work _Offline" (Matthew Barnes)
+	#529460: Change "Startup Wizard" to "Setup Assistant".  Also make the plugin description less lame (Matthew Barnes)
+	#530388: Fix a crash when editing labels (Milan Crha)
+	#537088: Fix empty headers if FROM/Sender is NULL (Paul Bolle)
+	#539268: Fix attachment description (Paul Bolle)
+	#543058: Properly capitalize INBOX (Paul Bolle)
+	#543411: Don't load known folders (Srinivasa Ragavan)
+	#543532: Let free memory when we are done with it, not before. (Milan Crha)
+	#543754: Reword "insufficient-permissions" error message (Matthew Barnes)
+	#543755: Fix a typo (Matthew Barnes)
+	#543756: Make question better translatable (Milan Crha)
+	#543943: Fix a memory leak (Milan Crha)
+	#544252: Use consistent naming to the GUI for different components (Paul Bolle)
+	#544157: Sort View / Window (sub)menu in shortcut order. (Paul Bolle)
+	#544383: Put contact list members in reverse order (Milan Crha)
+	#544857: Fix a typo (Matthew Barnes)
+	#544859: Clarify description of "sync_interval" key. (Matthew Barnes)
+	#544860: Add translator comments for split "update every" sentence (Matthew Barnes)
+	#544861: Reword "invalid-user" error message (Matthew Barnes)
+	#544862: Clarify description of "use_authentication" key (Matthew Barnes)
+	#544958: Use email, not e-mail (per documentation guidelines) (Matthew Barnes)
+	#544969: Added the hook for folder custom icon (Lucian Langa)
+	#544994: Typos/Syntax improvements (Claude Paroz)
+	#545300: Add a translatable tag in "_Merge" string (Takao Fujiwara)
+	#545303: Add gettext in the xml string (Takao Fujiwara)
+	#545436: Check the info before accessing it (Srinivasa Ragavan)
+	#545558: Hula support is disabled by default now, so remove any  mention of it from the User Guide (Matthew Barnes)
+	#545568: Make sure system plugins are enabled on startup (Matthew Barnes)
+	#545820: Fix a typo. (Nicolas Kaiser)
+	#546057: Use "x-office-calendar" icon name instead of "stock_calendar" (Matthew Barnes)
+
+Updated Translations:
+	Ignacio Casal Quinteiro (gl)
+	Frco. Javier Rial Rodríguez (gl)
+	Kjartan Maraas (nb)
+	Changwoo Ryu (ko)
+	Abou Manal (ar)
+	Petr Kovar (cs)
+	Fabrício Godoy (pt_BR)
+	Jorge Gonzalez (es)
+	Bruno Brouard and Claude Paroz (fr)
+	Zabeeh Khan (ps)
+	Pavel Sefranek (cs)
+
+
+Evolution 2.23.5 2008-07-21
+---------------------------
+New in 2.23.5
+	Camel DB Summary support. (Srinivasa Ragavan & Sankar P)
+	New EPlugin for message templates. (Bharath Acharya & Diego Escalante Urrelo)
+	Google Contacts support (Jörgen Scheibengruber)
+
+Bug Fixes:
+	#543753: Addressbook error string fixes (Andre Klapper)
+	#228725: Contacts view should not say "no items in this view" until the backend is done responding (Milan Crha)
+	#543134: Mail notification plugin should provide a right-click menu for preferences (Milan Crha)
+	#269152: Work-around for MS Outlook/Lookout that use X-MimeOLE (Milan Crha)
+	#200147: Added basic Template support (Bharath Acharya)
+	#206592: Action to invoke New Message window from the composer itself (Milan Crha)
+	#207802: Do not allow drop messages to the same message list as is the source. (Milan Crha)
+	#243201: Escape rule title so that can contain also XML entities in the file (Milan Crha)
+	#310988: Don't even show the "send-options" action unless an Exchange or GroupWise account appears in the From combo box (Matthew Barnes)
+	#318089: Ask for destination source only when have more than one writable source defined (Milan Crha)
+	#329821: Show tooltips over task's table (Milan Crha)
+	#368038: Ensure only one Birthdays & Anniversaries source (Milan Crha)
+	#370731: (Novell Bugzilla) Use MAX to determine the minimal size for each cell. This prevents the numbers and day-names from getting fuzzy when using large font-sizes (Suman Manjunath)
+	#382783: Grab focus of new rule part on adding and scroll to the bottom too (Milan Crha)
+	#395636: Added accel key Ctrl+Shift+B for collapsing all threads and Ctrl+/ for marking all messages as read (Roshan Kumar Singh)
+	#423395: Put the anchor where the message body begins and let GtkHTML know the anchor name to place the cursor there in caret mode on the first focus (Milan Crha)
+	#440818: Convert line to UTF-8 if not a valid one. Pretend it to be an ISO-8859-1 line (Rodrigo Castro)
+	#477082,#438479: Fixed documentation (Andre Klapper)
+	#478469: Changed the progress dialog to be more HIG compliant (Milan Crha)
+	#519536: Handle freeing of data safely. (Srinivasa Ragavan)
+	#524130: Pass description text through 'camel_text_to_html' to have links clickable in a preview (Milan Crha)
+	#526262: Handle _title element in analogical way as title (Maciej Piechotka)
+	#530069: Don't show the configuration tab unless the selected plugin actually has configuration options (Matthew Barnes)
+	#532472: Strip the account URL (via CAMEL_URL_HIDE_ALL) before comparing it to the already-stripped 'transport_url', to avoid unnecessary password prompts (Matthew Barnes)
+	#532597: Do not leave selected more than one item if somebody else took care or reposition of the cursor row before the delete (Milan Crha)
+	#534039: Track folders even when Search Folders disabled, to have them known when enabling Search Folders on demand (Milan Crha)
+	#536488: Remove '~/.evolution/.running' file before backup/after restore, thus Evolution will not claim next start it was closed incorrectly (Milan Crha)
+	#537275: Do not pass data to the child structure if we were canceled (Milan Crha)
+	#537725: Set the autosaved flag so we don't get pestered with a save dialog if the user then decides to close the composer window (Matthew Barnes)
+	#538741: Strip preceding tabs from Date headers too (Paul Bolle)
+	#538908: Desensitize the "send-options" action unless we've selected as Exchange or GroupWise account. (Paul Bolle)
+	#539268: Do not use both filename and description if these are identical (Paul Bolle)
+	#539755: Do not access memory beyond the columns array (Milan Crha)
+	#540152: Fix some memory leaks (Milan Crha)
+	#540160: Remember whether we come from none/multi select to single select and properly update the preview. (Milan Crha)
+	#540274: After restore walk through all account, addressbook, calendar, task and memo sources and fix the base uri if required (Milan Crha)
+	#540282: Remove the "printing" GConf key.  We use a key file now (Matthew Barnes)
+	#540282: Store printer and page settings in a key file rather than GConf (Matthew Barnes)
+	#540400: Make Evolution Backup follow symbolic links (Roger Zauner)
+	#540516: Sanitize user input while accepting path/filename of the backup (Tobias Mueller)
+	#540972: Small memory leak fix. (Milan Crha)
+	#541355: Removes any freed objects from the 'locals' list in each conduit which otherwise frees them again when the conduit is closed (Keith Packard)
+	#541365: Do not call 'camel_folder_sort_uids' when we do not have folder or uid (Milan Crha)
+	#542101: Escape PlaceOfTheMeeting in the Location: line of the tooltip (Paul Bolle)
+	#542125: Remove unnecessary files from source control (Matthew Barnes)
+	#542149: Display an error message to restart if user tries to subscribe to other's mailbox (Bharath Acharya)
+	#542587: New widget implements the online/offline button used in the main window. (Matthew Barnes)
+	#542631: Use g_format_size_for_display instead of cut and pasted code (Paolo Borelli)
+	#542889: Port to the new gtk tooltip api (Paolo Borelli)
+	#543758: Never mark empty strings for translations (Tor Lillqvist)
+
+Other Contributors:
+	Sort the uids so that moving/copying messages preserves mailbox ordering rather than jumbled randomness. (Jeffrey Stedfast)
+	Add dolt revision 5e9eef10 to the autotools build system. Speeds up the build, otherwise falls back to libtool (Alp Toker)
+	Configure email-custom-header plugin within the plugin-manager. (Ashish Shrivastava)
+
+Updated Translations:
+	Andre Klapper (de)
+	Jorge Gonzalez (es)
+	Kjartan Maraas (nb)
+	Jorge Gonzalez (es)
+	Ivar Smolin (et)
+	Yannig Marchegay (oc)
+	Leonardo Ferreira Fontenelle (pt_BR)
+	Timo Jyrinki (fi)
+	Lucas Lommer (cs)
+
 Evolution 2.23.4 2008-06-16
 ---------------------------
 New in 2.23.4
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c62f154be6..bb251b4963 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,78 @@
+2008-08-07  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #324203
+
+	* gui/component/ldap-config.glade:
+	* gui/component/addressbook-config.c: (canbrowse_toggled_cb),
+	(eabc_details_limit): New check box to be able to set LDAP
+	address books browseable until reaches given limits.
+
+2008-08-06  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #249844
+
+	* gui/component/addressbook-component.c:
+	(impl__get_userCreatableItems): Do not let compiler claim.
+
+2008-08-06  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #546263
+
+	* gui/widgets/e-minicard.c: (add_field), (add_email_field), (remodel):
+	Add 'width' property as the last one for 'new' item, thus it will know
+	all the information to properly calculate column widths. Also don't
+	set field names for the contact-lists. Both changes prevents messing
+	of minicard painting for changed contact-lists.
+
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* gui/component/addressbook-component.c
+	(impl__get_userCreatableItems): 
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
+2008-08-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #546057
+
+	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
+	* gui/contact-list-editor/contact-list-editor.glade:
+	Use "x-office-address-book" icon name instead of "stock_addressbook".
+
+2008-07-30  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #211267
+
+	* printing/e-contact-print.c: (struct _EContactPrintContext),
+	(e_contact_print_letter_heading), (e_contact_start_new_page),
+	(e_contact_print_contact), (contact_draw_page),
+	(e_contact_print): Report correct number of pages to print
+	and print them as requested.
+
+2008-07-30  Takao Fujiwara  <takao.fujiwara@sun.com>
+
+	Reviewed by Andre Klapper <a9016009@gmx.de>
+
+	** Fix for bug #545300
+
+	* gui/merging/eab-contact-duplicate-detected.glade:
+	Add a translatable tag in "_Merge" string.
+
+2008-07-28  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #544383
+
+	* gui/contact-list-editor/e-contact-list-editor.c:
+	(e_contact_list_editor_get_contact): Put list members in reverse order,
+	because 'e_vcard_add_attribute' uses prepend, thus changes order on
+	every single save of the contact list.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* addressbook.error.xml: Fix some strings. See bug #543753.
+
 2008-07-13  Keith Packard  <keithp@keithp.com>
 
 	** Fix for bug #541355
@@ -8,6 +83,16 @@
 	handle. This patch removes any freed objects from the 'locals' list in 
 	each conduit which otherwise frees them again when the conduit is closed.
 
+2008-07-09  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #228725
+
+	* gui/widgets/e-minicard-view.h: (struct _EMinicardView):
+	* gui/widgets/e-minicard-view.c: (set_empty_message),
+	(stop_state_changed), (e_minicard_view_set_property),
+	(e_minicard_view_dispose), (e_minicard_view_init):
+	Show different message in a view when searching.
+
 2008-07-03  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #540152
diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index ceec857adf..bfea4ce405 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -110,18 +110,18 @@
 
  <error id="gw-book-list-init" type="warning">
   <_primary>GroupWise Address book creation:</_primary> 
-  <_secondary>Currently you can access only GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once, to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders.</_secondary>
+  <_secondary>Currently you can access only GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once, to get your GroupWise Frequent Contacts and GroupWise Personal Contacts folders.</_secondary>
  </error>
 
  <error id="contact-delete-error-perm" type="warning">
   <_primary>Failed to delete contact</_primary> 
-  <_secondary>You do not have enough permissions to delete contact in this Address Book.</_secondary>
+  <_secondary>You do not have permission to delete contacts in this address book.</_secondary>
  </error>
 
  <error id="error-read-only" type="error" default="GTK_RESPONSE_YES">
   <_primary>Cannot add new contact</_primary>
   <!-- For Translators: {0} is the name of the address book source -->
-  <_secondary>'{0}' is a read-only address book source. Switch to Contacts View and highlight an address book that can accept contacts.</_secondary>
+  <_secondary>'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view.</_secondary>
   <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
  </error>
 
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
index feef3bdfc9..4fe2ce7a6a 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -50,7 +50,7 @@
         <oaf_attribute name="evolution:button_label" type="string" _value="Contacts"/>
 		<oaf_attribute name="evolution:button_tooltips" type="string" _value="Contacts"/>
         <oaf_attribute name="evolution:button_sort_order" type="string" value="-9"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_addressbook"/>
+        <oaf_attribute name="evolution:button_icon" type="string" value="x-office-address-book"/>
 
 </oaf_server>
 
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index b55cb9bd16..82f00f00c3 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -226,7 +226,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = "contact";
 	list->_buffer[0].description = _("New Contact");
-	list->_buffer[0].menuDescription = _("_Contact");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Contact");
 	list->_buffer[0].tooltip = _("Create a new contact");
 	list->_buffer[0].menuShortcut = 'c';
 	list->_buffer[0].iconName = "contact-new";
@@ -234,7 +234,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = "contact_list";
 	list->_buffer[1].description = _("New Contact List");
-	list->_buffer[1].menuDescription = _("Contact _List");
+	list->_buffer[1].menuDescription = (char *) C_("New", "Contact _List");
 	list->_buffer[1].tooltip = _("Create a new contact list");
 	list->_buffer[1].menuShortcut = 'l';
 	list->_buffer[1].iconName = "stock_contact-list";
@@ -242,7 +242,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = "address_book";
 	list->_buffer[2].description = _("New Address Book");
-	list->_buffer[2].menuDescription = _("Address _Book");
+	list->_buffer[2].menuDescription = (char *) C_("New", "Address _Book");
 	list->_buffer[2].tooltip = _("Create a new address book");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "address-book-new";
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 76b5dca5c1..2b749a6dd8 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -111,6 +111,7 @@ struct _AddressbookSourceDialog {
 	GtkWidget *search_filter;
 	GtkWidget *timeout_scale;
 	GtkWidget *limit_spinbutton;
+	GtkWidget *canbrowsecheck;
 
 	/* display name page fields */
 	GtkWidget *display_name;
@@ -925,6 +926,15 @@ limit_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
 	e_source_set_property(sdialog->source, "limit", limit);
 }
 
+static void
+canbrowse_toggled_cb (GtkWidget *toggle_button, ESource *source)
+{
+	if (!source || !toggle_button)
+		return;
+
+	e_source_set_property (source, "can-browse", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle_button)) ? "1" : NULL);
+}
+
 static GtkWidget *
 eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
 {
@@ -956,6 +966,10 @@ eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st
 	gtk_spin_button_set_value((GtkSpinButton *)sdialog->limit_spinbutton, tmp?g_strtod(tmp, NULL):100.0);
 	g_signal_connect (sdialog->limit_spinbutton, "value_changed", G_CALLBACK (limit_changed_cb), sdialog);
 
+	sdialog->canbrowsecheck = glade_xml_get_widget (gui, "canbrowsecheck");
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sdialog->canbrowsecheck), e_source_get_property (sdialog->source, "can-browse") && strcmp (e_source_get_property (sdialog->source, "can-browse"), "1") == 0);
+	g_signal_connect (sdialog->canbrowsecheck, "toggled", G_CALLBACK (canbrowse_toggled_cb), sdialog->source);
+
 	g_object_unref(gui);
 
 	return w;
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index cb66508eac..3db5bbdf36 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -1330,7 +1330,7 @@ addressbook_view_init (AddressbookView *view)
 	e_activity_handler_attach_task_bar (priv->activity_handler,
 					    E_TASK_BAR (priv->statusbar_widget));
 
-	priv->info_widget = e_info_label_new("contact-new");
+	priv->info_widget = e_info_label_new("x-office-address-book");
 	e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), "");
 	gtk_widget_show (priv->info_widget);
 
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
index 1641741075..1e1c4d5fea 100644
--- a/addressbook/gui/component/ldap-config.glade
+++ b/addressbook/gui/component/ldap-config.glade
@@ -1179,7 +1179,7 @@
 		  <child>
 		    <widget class="GtkTable" id="table34">
 		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
+		      <property name="n_rows">3</property>
 		      <property name="n_columns">3</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">6</property>
@@ -1405,6 +1405,28 @@
 			  <property name="y_options">shrink|fill</property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="canbrowsecheck">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes" comments="To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached">B_rowse this book until limit reached</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">3</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -2707,7 +2729,7 @@
 		    <widget class="GtkTable" id="table11">
 		      <property name="border_width">12</property>
 		      <property name="visible">True</property>
-		      <property name="n_rows">2</property>
+		      <property name="n_rows">3</property>
 		      <property name="n_columns">3</property>
 		      <property name="homogeneous">False</property>
 		      <property name="row_spacing">6</property>
@@ -2930,6 +2952,28 @@
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="canbrowsecheck">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes" comments="To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached">B_rowse this book until limit reached</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">3</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		  </child>
 
diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
index 3402e27542..497be08c85 100644
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ b/addressbook/gui/contact-list-editor/contact-list-editor.glade
@@ -28,7 +28,7 @@
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="icon_size">6</property>
-                <property name="icon_name">stock_addressbook</property>
+                <property name="icon_name">x-office-address-book</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index d3121185a6..7039bb5086 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -1334,6 +1334,7 @@ e_contact_list_editor_get_contact (EContactListEditor *editor)
 	GtkTreeIter iter;
 	gboolean iter_valid;
 	const gchar *text;
+	GSList *attrs = NULL, *a;
 
 	g_return_val_if_fail (E_IS_CONTACT_LIST_EDITOR (editor), NULL);
 
@@ -1367,13 +1368,20 @@ e_contact_list_editor_get_contact (EContactListEditor *editor)
 
 		gtk_tree_model_get (model, &iter, 0, &dest, -1);
 		attr = e_vcard_attribute_new (NULL, EVC_EMAIL);
-		e_vcard_add_attribute (E_VCARD (contact), attr);
+		attrs = g_slist_prepend (attrs, attr);
 		e_destination_export_to_vcard_attribute (dest, attr);
 		g_object_unref (dest);
 
 		iter_valid = gtk_tree_model_iter_next (model, &iter);
 	}
 
+	/* Put it in reverse order because e_vcard_add_attribute also uses prepend,
+	   but we want to keep order of mails there. Hopefully noone will change
+	   the behaviour of the e_vcard_add_attribute. */
+	for (a = attrs; a; a = a->next) {
+		e_vcard_add_attribute (E_VCARD (contact), a->data);
+	}
+
 	return contact;
 }
 
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
index 1a85fac29e..70efc737ca 100644
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.glade
+++ b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
@@ -61,7 +61,7 @@
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">_Merge</property>
+	      <property name="label" translatable="yes">_Merge</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index daa41b1e2f..30a384091d 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -155,28 +155,34 @@ static void
 set_empty_message (EMinicardView *view)
 {
 	char *empty_message;
-	gboolean editable = FALSE, perform_initial_query = FALSE;
+	gboolean editable = FALSE, perform_initial_query = FALSE, searching = FALSE;
 	EBook *book;
 
 	if (view->adapter) {
+		EABModel *model = NULL;
+
 		g_object_get (view->adapter,
 			      "editable", &editable,
+			      "model", &model,
 			      NULL);
 
 		g_object_get (view->adapter, "book", &book, NULL);
 		if (!e_book_check_static_capability (book, "do-initial-query"))
 			perform_initial_query = TRUE;
+
+		searching = model && eab_model_can_stop (model);
 	}
 
-	if (editable) {
+	if (searching) {
+		empty_message = _("\n\nSearching for the Contacts...");
+	} else if (editable) {
 		if (perform_initial_query)
 			empty_message = _("\n\nSearch for the Contact\n\n"
 					  "or double-click here to create a new Contact.");
 		else
 			empty_message = _("\n\nThere are no items to show in this view.\n\n"
 					  "Double-click here to create a new Contact.");
-	}
-	else {
+	} else {
 		if (perform_initial_query)
 			empty_message = _("\n\nSearch for the Contact.");
 		else
@@ -195,6 +201,12 @@ writable_status_change (EABModel *model, gboolean writable, EMinicardView *view)
 }
 
 static void
+stop_state_changed (EABModel *model, EMinicardView *view)
+{
+	set_empty_message (view);
+}
+
+static void
 adapter_changed (EMinicardView *view)
 {
 	set_empty_message (view);
@@ -216,19 +228,23 @@ e_minicard_view_set_property (GObject *object,
 	switch (prop_id){
 	case PROP_ADAPTER:
 		if (view->adapter) {
-			if (view->writable_status_id) {
+			if (view->writable_status_id || view->stop_state_id) {
 				EABModel *model;
 				g_object_get (view->adapter,
 					      "model", &model,
 					      NULL);
 				if (model) {
-					g_signal_handler_disconnect (model, view->writable_status_id);
+					if (view->writable_status_id)
+						g_signal_handler_disconnect (model, view->writable_status_id);
+					if (view->stop_state_id)
+						g_signal_handler_disconnect (model, view->stop_state_id);
 				}
 			}
 
 			g_object_unref (view->adapter);
 		}
 		view->writable_status_id = 0;
+		view->stop_state_id = 0;
 		view->adapter = g_value_get_object (value);
 		g_object_ref (view->adapter);
 		adapter_changed (view);
@@ -244,6 +260,9 @@ e_minicard_view_set_property (GObject *object,
 				view->writable_status_id =
 					g_signal_connect (model, "writable_status",
 							  G_CALLBACK (writable_status_change), view);
+				view->stop_state_id =
+					g_signal_connect (model, "stop_state_changed",
+							  G_CALLBACK (stop_state_changed), view);
 			}
 
 		}
@@ -317,19 +336,23 @@ e_minicard_view_dispose (GObject *object)
 	}
 
 	if (view->adapter) {
-		if (view->writable_status_id) {
+		if (view->writable_status_id || view->stop_state_id) {
 			EABModel *model;
 			g_object_get (view->adapter,
 				      "model", &model,
 				      NULL);
 			if (model) {
-				g_signal_handler_disconnect (model, view->writable_status_id);
+				if (view->writable_status_id)
+					g_signal_handler_disconnect (model, view->writable_status_id);
+				if (view->stop_state_id)
+					g_signal_handler_disconnect (model, view->stop_state_id);
 			}
 		}
 
 		g_object_unref (view->adapter);
 	}
 	view->writable_status_id = 0;
+	view->stop_state_id = 0;
 	view->adapter = NULL;
 
 	if (G_OBJECT_CLASS(parent_class)->dispose)
@@ -548,6 +571,7 @@ e_minicard_view_init (EMinicardView *view)
 	view->adapter = NULL;
 	view->canvas_drag_data_get_id = 0;
 	view->writable_status_id = 0;
+	view->stop_state_id = 0;
 
 	set_empty_message (view);
 }
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 1d8eef963c..eb6d07f034 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -70,6 +70,7 @@ struct _EMinicardView
 
 	guint canvas_drag_data_get_id;
 	guint writable_status_id;
+	guint stop_state_id;
 };
 
 struct _EMinicardViewClass
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index b617292a0f..a4bda1ac4a 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -780,21 +780,21 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
 	new_item = e_minicard_label_new(group);
 
 	if (e_minicard->contact && e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST))
-		gnome_canvas_item_set( new_item,
-				       "width", e_minicard->width - 4.0,
-				       "fieldname", is_rtl ? "" : string,
-			    	       "field", is_rtl ? string : "",
-			 	      "max_field_name_length", left_width,
-			    	   "editable", FALSE /* e_minicard->editable */,
-			    	   NULL );
+		gnome_canvas_item_set (new_item,
+					"fieldname", is_rtl ? "" : string,
+					"field", is_rtl ? string : "",
+					"max_field_name_length", left_width,
+					"editable", FALSE /* e_minicard->editable */,
+					"width", e_minicard->width - 4.0,
+					NULL );
 	else
-		gnome_canvas_item_set( new_item,
-				       "width", e_minicard->width - 4.0,
-				       "fieldname", is_rtl ? string : name,
-			    	   "field", is_rtl ? name : string,
-			 	      "max_field_name_length", left_width,
-			    	   "editable", FALSE /* e_minicard->editable */,
-			    	   NULL );
+		gnome_canvas_item_set (new_item,
+					"fieldname", is_rtl ? string : name,
+					"field", is_rtl ? name : string,
+					"max_field_name_length", left_width,
+					"editable", FALSE /* e_minicard->editable */,
+					"width", e_minicard->width - 4.0,
+					NULL );
 
 
 #ifdef notyet
@@ -831,7 +831,7 @@ get_email_location (EVCardAttribute *attr)
 }
 
 static void
-add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, int limit)
+add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, int limit, gboolean is_list)
 {
 	GnomeCanvasItem *new_item;
 	GnomeCanvasGroup *group;
@@ -850,8 +850,13 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i
 		char *parsed_name = NULL;
 		gboolean parser_check;
 
-		tmp = get_email_location ((EVCardAttribute *) l->data);
-		name = g_strdup_printf ("%s:", tmp);
+		/* do not use name for fields in the contact list */
+		if (is_list) {
+			name = (char *)"";
+		} else {
+			tmp = get_email_location ((EVCardAttribute *) l->data);
+			name = g_strdup_printf ("%s:", tmp);
+		}
 
 		parser_check = eab_parse_qp_email ((const gchar *) le->data, &parsed_name, &email);
 		if (parser_check) {
@@ -864,12 +869,12 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i
 
 		new_item = e_minicard_label_new(group);
 
-		gnome_canvas_item_set( new_item,
-				       "width", e_minicard->width - 4.0,
+		gnome_canvas_item_set (new_item,
 				       "fieldname", is_rtl ? string : name,
 				       "field", is_rtl ? name : string,
 				       "max_field_name_length", left_width,
 				       "editable", FALSE /* e_minicard->editable */,
+				       "width", e_minicard->width - 4.0,
 				       NULL );
 
 #ifdef notyet
@@ -888,7 +893,8 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i
 		e_minicard->fields = g_list_append( e_minicard->fields, minicard_field);
 		e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
 		count++;
-		g_free (name);
+		if (!is_list)
+			g_free (name);
 		g_free (string);
 		g_free (parsed_name);
 		g_free (email);
@@ -1005,7 +1011,7 @@ remodel( EMinicard *e_minicard )
 
 					limit = 5 - count;
 					email = e_contact_get_attributes (e_minicard->contact, E_CONTACT_EMAIL);
-					add_email_field (e_minicard, email, left_width, limit);
+					add_email_field (e_minicard, email, left_width, limit, is_list);
 					if (count+limit >5)
 						count = 5;
 					else
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index a707235944..f82335335a 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -57,6 +57,8 @@ struct _EContactPrintContext
 	EContactPrintStyle *style;
 	gboolean first_section;
 
+	gint page_nr, pages;
+
 	PangoFontDescription *letter_heading_font;
 	gchar *section;
 	gboolean first_contact;
@@ -178,8 +180,15 @@ e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *letter)
 	pango_layout_set_width (layout, width);
 	pango_layout_get_size (layout, NULL, &height);
 
-	/* Draw white text centered in a black rectangle. */
+	if (ctxt->page_nr == -1 || ctxt->pages != ctxt->page_nr) {
+		/* only calculating number of pages
+		   or on page we do not want to print */
+		ctxt->y += pango_units_to_double (height);
+
+		return;
+	}
 
+	/* Draw white text centered in a black rectangle. */
 	cr = gtk_print_context_get_cairo_context (ctxt->context);
 
 	cairo_save (cr);
@@ -207,10 +216,11 @@ e_contact_start_new_page (EContactPrintContext *ctxt)
 
 	cr = gtk_print_context_get_cairo_context (ctxt->context);
 
-	cairo_show_page (cr);
+	/*cairo_show_page (cr);*/
 
        	ctxt->x = ctxt->y = .0;
 	ctxt->column = 0;
+	ctxt->pages++;
 }
 
 static void
@@ -226,7 +236,7 @@ e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt)
 
 	file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
 
-	if (ctxt->style->print_using_grey) {
+	if (ctxt->style->print_using_grey && ctxt->pages == ctxt->page_nr) {
 		cairo_save (cr);
 		cairo_set_source_rgb (cr, .85, .85, .85);
 		cairo_rectangle (cr, ctxt->x, ctxt->y, ctxt->column_width,
@@ -236,9 +246,10 @@ e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt)
 		cairo_restore (cr);
 	}
 
-	e_contact_output (
-		ctxt->context, ctxt->style->headings_font,
-		ctxt->x, ctxt->y, ctxt->column_width + 4, file_as);
+	if (ctxt->pages == ctxt->page_nr)
+		e_contact_output (
+			ctxt->context, ctxt->style->headings_font,
+			ctxt->x, ctxt->y, ctxt->column_width + 4, file_as);
 	ctxt->y += e_contact_text_height (
 		ctxt->context, ctxt->style->headings_font, file_as);
 
@@ -258,9 +269,10 @@ e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt)
 		text = g_strdup_printf ("%s:  %s",
 			e_contact_pretty_name (field), value);
 
-		e_contact_output (
-			ctxt->context, ctxt->style->body_font,
-			ctxt->x, ctxt->y, -1, text);
+		if (ctxt->pages == ctxt->page_nr)
+			e_contact_output (
+				ctxt->context, ctxt->style->body_font,
+				ctxt->x, ctxt->y, -1, text);
 
 		ctxt->y += e_contact_text_height (
 			ctxt->context, ctxt->style->body_font, text);
@@ -540,51 +552,6 @@ load_contacts (EContactPrintContext *ctxt)
 }
 
 static void
-free_contacts (EContactPrintContext *ctxt)
-{
-	g_list_foreach (ctxt->contact_list, (GFunc) g_object_unref, NULL);
-	g_list_free (ctxt->contact_list);
-}
-
-static void
-contact_begin_print (GtkPrintOperation *operation,
-                     GtkPrintContext *context,
-                     EContactPrintContext *ctxt)
-{
-	GtkPageSetup *setup;
-	gdouble page_width;
-
-	e_contact_build_style (ctxt->style);
-
-	setup = gtk_print_context_get_page_setup (context);
-	page_width = gtk_page_setup_get_page_width (setup, GTK_UNIT_POINTS);
-
-	ctxt->context = context;
-	ctxt->x = ctxt->y = .0;
-	ctxt->column = 0;
-	ctxt->first_contact = TRUE;
-	ctxt->first_section = TRUE;
-	ctxt->section = NULL;
-
-	ctxt->column_spacing = gtk_print_context_get_dpi_x (context) / 4;
-	ctxt->column_width = (page_width + ctxt->column_spacing) /
-		ctxt->style->num_columns - ctxt->column_spacing;
-
-	ctxt->letter_heading_font = pango_font_description_new ();
-	pango_font_description_set_family (
-		ctxt->letter_heading_font,
-		pango_font_description_get_family (
-			ctxt->style->headings_font));
-	pango_font_description_set_size (
-		ctxt->letter_heading_font,
-		pango_font_description_get_size (
-			ctxt->style->headings_font) * 1.5);
-
-	if (ctxt->book != NULL)
-		load_contacts (ctxt);
-}
-
-static void
 contact_draw (EContact *contact, EContactPrintContext *ctxt)
 {
 	GtkPageSetup *setup;
@@ -638,11 +605,71 @@ contact_draw (EContact *contact, EContactPrintContext *ctxt)
 }
 
 static void
+free_contacts (EContactPrintContext *ctxt)
+{
+	g_list_foreach (ctxt->contact_list, (GFunc) g_object_unref, NULL);
+	g_list_free (ctxt->contact_list);
+}
+
+static void
+contact_begin_print (GtkPrintOperation *operation,
+                     GtkPrintContext *context,
+                     EContactPrintContext *ctxt)
+{
+	GtkPageSetup *setup;
+	gdouble page_width;
+
+	e_contact_build_style (ctxt->style);
+
+	setup = gtk_print_context_get_page_setup (context);
+	page_width = gtk_page_setup_get_page_width (setup, GTK_UNIT_POINTS);
+
+	ctxt->context = context;
+	ctxt->x = ctxt->y = .0;
+	ctxt->column = 0;
+	ctxt->first_contact = TRUE;
+	ctxt->first_section = TRUE;
+	ctxt->section = NULL;
+
+	ctxt->column_spacing = gtk_print_context_get_dpi_x (context) / 4;
+	ctxt->column_width = (page_width + ctxt->column_spacing) /
+		ctxt->style->num_columns - ctxt->column_spacing;
+
+	ctxt->letter_heading_font = pango_font_description_new ();
+	pango_font_description_set_family (
+		ctxt->letter_heading_font,
+		pango_font_description_get_family (
+			ctxt->style->headings_font));
+	pango_font_description_set_size (
+		ctxt->letter_heading_font,
+		pango_font_description_get_size (
+			ctxt->style->headings_font) * 1.5);
+
+	if (ctxt->book != NULL) {
+		load_contacts (ctxt);
+		ctxt->page_nr = -1;
+		ctxt->pages = 1;
+		g_list_foreach (ctxt->contact_list, (GFunc) contact_draw, ctxt);
+		gtk_print_operation_set_n_pages (operation, ctxt->pages);
+	}
+}
+
+static void
 contact_draw_page (GtkPrintOperation *operation,
                    GtkPrintContext *context,
                    gint page_nr,
                    EContactPrintContext *ctxt)
 {
+	/* only text on page_nr == pages will be drawn, the pages is recalculated */
+	ctxt->page_nr = page_nr;
+	ctxt->pages = 0;
+
+	ctxt->x = ctxt->y = .0;
+	ctxt->column = 0;
+	ctxt->first_contact = TRUE;
+	ctxt->first_section = TRUE;
+	ctxt->section = NULL;
+
 	g_list_foreach (ctxt->contact_list, (GFunc) contact_draw, ctxt);
 }
 
@@ -681,6 +708,8 @@ e_contact_print (EBook *book, EBookQuery *query,
 		ctxt.contact_list = contact_list;
 	}
 	ctxt.style = &style;
+	ctxt.page_nr = 0;
+	ctxt.pages = 0;
 
 	operation = e_print_operation_new ();
 	gtk_print_operation_set_n_pages (operation, 1);
diff --git a/art/ChangeLog b/art/ChangeLog
index 1e853a15ee..71bc919db2 100644
--- a/art/ChangeLog
+++ b/art/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #542125
+
+	* Makefile.am:
+	Move query-free-busy.png to data/icons.
+
 2007-10-12  Michael Monreal <michael.monreal@gmail.com>
 
          ** Migration of theme icons to data/icons/ (bug #479257)
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f33f8c9bba..75c9143ca0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,135 @@
+2008-08-06  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #249844
+
+	* gui/tasks-component.c: (impl__get_userCreatableItems):
+	* gui/memos-component.c: (impl__get_userCreatableItems):
+	Do not let compiler claim.
+	* gui/calendar-component.c: (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro.
+	Use fully qualified names for "New" submenu entries.
+
+2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #544157
+
+	* gui/GNOME_Evolution_Calendar.server.in.in:
+	Sort View / Window (sub)menu in shortcut order.
+
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* gui/memos-component.c (impl__get_userCreatableItems):
+	* gui/tasks-component.c (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
+2008-08-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #546057
+
+	* gui/GNOME_Evolution_Calendar.server.in.in:
+	* gui/calendar-component.c:
+	* gui/e-calendar-view.c:
+	* gui/dialogs/alarm-dialog.c:
+	* gui/dialogs/alarm-list-dialog.c:
+	* gui/dialogs/changed-comp.c:
+	* gui/dialogs/comp-editor.c:
+	* gui/dialogs/delete-error.c:
+	* gui/dialogs/select-source-dialog.c:
+	Use "x-office-calendar" icon name instead of "stock_calendar".
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #544857
+
+	* gui/memotypes.xml: Fix a typo.
+
+2008-08-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #353927
+
+	* gui/alarm-notify/alarm-queue.c: (tray_icon_blink_cb),
+	(display_notification): Do not blink the icon more than 15 seconds.
+
+2008-07-30  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #211267
+
+	* gui/print.c: (bound_text), (print_attendees), (print_day_event),
+	(print_todo_details), (print_comp_draw_real), (print_comp_draw_page),
+	(print_comp_begin_print), (print_comp): When printing only one event,
+	then divide it to more pages if required, also word-wrap description
+	text if necessary to fit the page.
+
+2008-07-29  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #329821
+
+	* gui/e-calendar-table.c: (query_tooltip_cb):
+	Recalculate returned row to the model row, if we are sorting.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* calendar.error.xml: Fix some strings. See bug #543753.
+
+2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #542125
+
+	** This set of changes migrates CompEditor, CompEditorPage and the
+	   various subclasses from using BonoboUI to GtkUIManager for menus
+	   and toolbars.  It also substantially cleans up the code and
+	   streamlines the CompEditorPage API, making more effective use
+	   of GObject properties.
+
+	Core changes:
+	* gui/dialogs/comp-editor-page.c:
+	* gui/dialogs/comp-editor-page.h:
+	* gui/dialogs/comp-editor.c:
+	* gui/dialogs/comp-editor.h:
+	* gui/dialogs/event-editor.c:
+	* gui/dialogs/event-editor.h:
+	* gui/dialogs/event-page.c:
+	* gui/dialogs/event-page.h:
+	* gui/dialogs/memo-editor.c:
+	* gui/dialogs/memo-editor.h:
+	* gui/dialogs/memo-page.c:
+	* gui/dialogs/memo-page.h:
+	* gui/dialogs/recurrence-page.c:
+	* gui/dialogs/recurrence-page.h:
+	* gui/dialogs/schedule-page.c:
+	* gui/dialogs/schedule-page.h:
+	* gui/dialogs/task-details-page.c:
+	* gui/dialogs/task-details-page.h:
+	* gui/dialogs/task-editor.c:
+	* gui/dialogs/task-editor.h:
+	* gui/dialogs/task-page.c:
+	* gui/dialogs/task-page.h:
+
+	Supporting changes:
+	* gui/calendar-component.c:
+	* gui/comp-editor-factory.c:
+	* gui/e-cal-popup.c:
+	* gui/e-calendar-table.c:
+	* gui/e-calendar-view.c:
+	* gui/e-comp-editor-registry.c:
+	* gui/e-memo-table.c:
+	* gui/e-tasks.c:
+	* gui/gnome-cal.c:
+	* gui/memos-component.c:
+	* gui/tasks-component.c:
+	* gui/dialogs/alarm-dialog.c:
+	* gui/dialogs/comp-editor-util.c:
+
+2008-07-15  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #329821
+
+	* gui/e-calendar-table.c: (get_time_as_text), (query_tooltip_cb),
+	(e_calendar_table_init): Show tooltips over task's table.
+
 2008-17-14  Paolo Borelli  <pborelli@katamail.com>
 
 	** Fix for bug #542889
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index bca6593eb9..d7bd50b85d 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -231,14 +231,14 @@
  <error id="prompt-read-only-cal" type="error" default="GTK_RESPONSE_YES">
   <_primary>Cannot create a new event</_primary>
   <!-- For Translators: {0} is the name of the calendar source -->
-  <_secondary>'{0}' is a read-only calendar source. Switch to Calendar View and highlight a calendar that can accept appointments.</_secondary>
+  <_secondary>'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view.</_secondary>
   <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-read-only-cal-editor" type="error" default="GTK_RESPONSE_YES">
   <_primary>Cannot save event</_primary>
   <!-- For Translators: {0} is the name of the calendar source -->
-  <_secondary>'{0}' is a read-only calendar source. Change Calendar to one that can accept appointments.</_secondary>
+  <_secondary>'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments.</_secondary>
   <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
  </error>
 
@@ -250,7 +250,7 @@
 
  <error id="prompt-no-contents-offline-memos" type="error" default="GTK_RESPONSE_YES">
   <_primary>Error loading memo list</_primary>
-  <_secondary>The memo list is not marked for offline usage</_secondary>
+  <_secondary>The memo list is not marked for offline usage.</_secondary>
   <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
  </error>
 
diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
index 577efc4130..ad228ff451 100644
--- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in
+++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in
@@ -47,7 +47,7 @@
 	<oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*3"/>
 	<oaf_attribute name="evolution:button_label" type="string" _value="Calendars"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string" _value="Calendars"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_calendar"/>
+        <oaf_attribute name="evolution:button_icon" type="string" value="x-office-calendar"/>
 	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
 
 <!-- FIXME: See bug 407104: Write a interface to launch without shell.
@@ -74,8 +74,8 @@
 	<oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*4"/>
 	<oaf_attribute name="evolution:button_label" type="string" _value="Tasks"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string" _value="Tasks"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_todo"/>
-	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
+        <oaf_attribute name="evolution:button_icon" type="string" value="evolution-tasks"/>
+	<oaf_attribute name="evolution:button_sort_order" type="string" value="-7"/>
 
         <oaf_attribute name="evolution:uri_schemas" type="stringv">
           <item value="task"/>
@@ -99,8 +99,8 @@
 	<oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*5"/>
 	<oaf_attribute name="evolution:button_label" type="string" _value="Memos"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string" _value="Memos"/>
-        <oaf_attribute name="evolution:button_icon" type="string" value="stock_notes"/>
-	<oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
+        <oaf_attribute name="evolution:button_icon" type="string" value="evolution-memos"/>
+	<oaf_attribute name="evolution:button_sort_order" type="string" value="-6"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:@VERSION@"
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 9bc19d4aad..219dfdc82d 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -79,7 +79,7 @@ static GList *tray_icons_list = NULL;
 /* Top Tray Image */
 static GtkStatusIcon *tray_icon = NULL;
 static int tray_blink_id = -1;
-static int tray_blink_state = FALSE;
+static int tray_blink_countdown = 0;
 static AlarmNotify *an;
 
 /* Structure that stores a client we are monitoring */
@@ -1383,11 +1383,13 @@ popup_menu (GtkStatusIcon *icon, guint button, guint activate_time)
 static gboolean
 tray_icon_blink_cb (gpointer data)
 {
+	static gboolean tray_blink_state = FALSE;
 	GdkPixbuf *pixbuf;
 
-	tray_blink_state = tray_blink_state == TRUE ? FALSE: TRUE;
+	tray_blink_countdown--;
+	tray_blink_state = !tray_blink_state;
 
-	pixbuf = e_icon_factory_get_icon  (tray_blink_state == TRUE?
+	pixbuf = e_icon_factory_get_icon  ((tray_blink_state || tray_blink_countdown <= 0)?
 					   "stock_appointment-reminder-excl" :
 					   "stock_appointment-reminder",
 					   E_ICON_SIZE_LARGE_TOOLBAR);
@@ -1396,7 +1398,10 @@ tray_icon_blink_cb (gpointer data)
 		gtk_status_icon_set_from_pixbuf (tray_icon, pixbuf);
 	g_object_unref (pixbuf);
 
-	return TRUE;
+	if (tray_blink_countdown <= 0)
+		tray_blink_id = -1;
+
+	return tray_blink_countdown > 0;
 }
 
 
@@ -1536,8 +1541,10 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 		open_alarm_dialog (tray_data);
 		gtk_window_stick (GTK_WINDOW (alarm_notifications_dialog->dialog));
 	} else {
-		if (tray_blink_id == -1)
+		if (tray_blink_id == -1) {
+			tray_blink_countdown = 30;
 			tray_blink_id = g_timeout_add (500, tray_icon_blink_cb, tray_data);
+		}
 	}
 }
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5ec0c400dc..b30729c554 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -613,7 +613,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem ecc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "x-office-calendar", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR, "20.bar" },
@@ -1399,7 +1399,7 @@ create_component_view (CalendarComponent *calendar_component)
 					     GTK_SHADOW_IN);
 	gtk_widget_show (selector_scrolled_window);
 
-	component_view->info_label = (EInfoLabel *)e_info_label_new("stock_calendar");
+	component_view->info_label = (EInfoLabel *)e_info_label_new("x-office-calendar");
 	e_info_label_set_info (component_view->info_label, _("Calendars"), "");
 	gtk_widget_show (GTK_WIDGET (component_view->info_label));
 
@@ -1594,7 +1594,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_EVENT_ID;
 	list->_buffer[0].description = _("New appointment");
-	list->_buffer[0].menuDescription = _("_Appointment");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Appointment");
 	list->_buffer[0].tooltip = _("Create a new appointment");
 	list->_buffer[0].menuShortcut = 'a';
 	list->_buffer[0].iconName = "appointment-new";
@@ -1602,7 +1602,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = CREATE_MEETING_ID;
 	list->_buffer[1].description = _("New meeting");
-	list->_buffer[1].menuDescription = _("M_eeting");
+	list->_buffer[1].menuDescription = (char *) C_("New", "M_eeting");
 	list->_buffer[1].tooltip = _("Create a new meeting request");
 	list->_buffer[1].menuShortcut = 'e';
 	list->_buffer[1].iconName = "stock_new-meeting";
@@ -1610,7 +1610,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
 	list->_buffer[2].description = _("New all day appointment");
-	list->_buffer[2].menuDescription = _("All Day A_ppointment");
+	list->_buffer[2].menuDescription = (char *) C_("New", "All Day A_ppointment");
 	list->_buffer[2].tooltip = _("Create a new all-day appointment");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "stock_new-24h-appointment";
@@ -1618,10 +1618,10 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[3].id = CREATE_CALENDAR_ID;
 	list->_buffer[3].description = _("New calendar");
-	list->_buffer[3].menuDescription = _("Cale_ndar");
+	list->_buffer[3].menuDescription = (char *) C_("New", "Cale_ndar");
 	list->_buffer[3].tooltip = _("Create a new calendar");
 	list->_buffer[3].menuShortcut = '\0';
-	list->_buffer[3].iconName = "stock_calendar";
+	list->_buffer[3].iconName = "x-office-calendar";
 	list->_buffer[3].type = GNOME_Evolution_CREATABLE_FOLDER;
 
 	return list;
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 9a57a9c8e5..48402bbab3 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -1178,7 +1178,7 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
 
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 99230f667e..8bce8f0eaa 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -293,7 +293,7 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
 
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index c2d5f4e365..c994fb6303 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -105,7 +105,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_YES_NO, "%s", str);
 
-	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index ae56633d85..9a08009b6c 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -927,7 +927,7 @@ update_window_border (CompEditor *editor,
 
 	if (editor->priv->comp == NULL) {
 		title = g_strdup (_("Edit Appointment"));
-		icon_name = "stock_calendar";
+		icon_name = "x-office-calendar";
 		goto exit;
 
 	} else switch (e_cal_component_get_vtype (editor->priv->comp)) {
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index 6c5462837d..d1280da16a 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -106,7 +106,7 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_OK, "%s", str);
 	if (vtype == E_CAL_COMPONENT_EVENT)
-		icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+		icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	else if (vtype == E_CAL_COMPONENT_TODO)
 		icon_list = e_icon_factory_get_icon_list ("stock_todo");
 
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 624cfe90fe..a669dfcafc 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -58,7 +58,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
 	dialog = e_source_selector_dialog_new (parent, source_list);
 
 	if (obj_type == E_CAL_SOURCE_TYPE_EVENT)
-		icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+		icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
 	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
 		icon_list = e_icon_factory_get_icon_list ("stock_todo");
         else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index bfc0a12e2d..487ed4e9c5 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -522,6 +522,9 @@ date_changed_cb (EDateEdit *dedit,
 	icalproperty_status status;
 	gboolean date_set;
 
+	tdpage = TASK_DETAILS_PAGE (data);
+	priv = tdpage->priv;
+
 	if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (tdpage)))
 		return;
 
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 7c5400568c..31c10b5dc2 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1482,6 +1482,9 @@ date_changed_cb (EDateEdit *dedit,
 	struct icaltimetype start_tt = icaltime_null_time();
 	struct icaltimetype due_tt = icaltime_null_time();
 
+	tpage = TASK_PAGE (data);
+	priv = tpage->priv;
+
 	if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (tpage)))
 		return;
 
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index e7c0efe417..4038c73c04 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -37,6 +37,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gnome.h>
+#include <gtk/gtktooltip.h>
 #include <misc/e-gui-utils.h>
 #include <table/e-cell-checkbox.h>
 #include <table/e-cell-toggle.h>
@@ -46,6 +47,8 @@
 #include <e-util/e-util-private.h>
 #include <misc/e-cell-date-edit.h>
 #include <misc/e-cell-percent.h>
+#include <libecal/e-cal-time-util.h>
+#include <libedataserver/e-time-utils.h>
 
 #include "calendar-component.h"
 #include "calendar-config.h"
@@ -54,6 +57,7 @@
 #include "dialogs/task-editor.h"
 #include "e-cal-model-tasks.h"
 #include "e-calendar-table.h"
+#include "e-calendar-view.h"
 #include "e-cell-date-edit-text.h"
 #include "e-comp-editor-registry.h"
 #include "print.h"
@@ -260,6 +264,209 @@ row_appended_cb (ECalModel *model, ECalendarTable *cal_table)
 }
 
 static void
+get_time_as_text (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone, char *buff, int buff_len)
+{
+        struct tm tmp_tm;
+
+	buff [0] = 0;
+
+	tmp_tm = icaltimetype_to_tm_with_zone (tt, f_zone, t_zone);
+        e_time_format_date_and_time (&tmp_tm,
+                                     calendar_config_get_24_hour_format (),
+                                     FALSE, FALSE,
+                                     buff, buff_len);
+}
+
+static gboolean
+query_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
+{
+	ECalendarTable *cal_table;
+	ECalModelComponent *comp;
+	int row = -1, col = -1;
+	GtkWidget *box, *l, *w;
+	GtkStyle *style = gtk_widget_get_default_style ();
+	char *tmp;
+	const char *str;
+	GString *tmp2;
+	char buff[1001];
+	gboolean free_text = FALSE;
+	ECalComponent *new_comp;
+	ECalComponentOrganizer organizer;
+	ECalComponentDateTime dtstart, dtdue;
+	icaltimezone *zone, *default_zone;
+	GSList *desc, *p;
+	int len;
+	ETable *etable;
+	ESelectionModel *esm;
+
+	if (keyboard_mode)
+		return FALSE;
+
+	g_return_val_if_fail (widget != NULL, FALSE);
+	g_return_val_if_fail (E_IS_CALENDAR_TABLE (user_data), FALSE);
+	g_return_val_if_fail (tooltip != NULL, FALSE);
+
+	cal_table = E_CALENDAR_TABLE (user_data);
+
+	etable = e_calendar_table_get_table (cal_table);
+	e_table_get_mouse_over_cell (etable, x, y, &row, &col);
+	if (row == -1 || !etable)
+		return FALSE;
+
+	/* respect sorting option, the 'e_table_get_mouse_over_cell' returns sorted row, not the model one */
+	esm = e_table_get_selection_model (etable);
+	if (esm && esm->sorter && e_sorter_needs_sorting (esm->sorter))
+		row = e_sorter_sorted_to_model (esm->sorter, row);
+
+	comp = e_cal_model_get_component_at (cal_table->model, row);
+	if (!comp || !comp->icalcomp)
+		return FALSE;
+
+	new_comp = e_cal_component_new ();
+	if (!e_cal_component_set_icalcomponent (new_comp, icalcomponent_new_clone (comp->icalcomp))) {
+		g_object_unref (new_comp);
+		return FALSE;
+	}
+
+	box = gtk_vbox_new (FALSE, 0);
+
+	str = e_calendar_view_get_icalcomponent_summary (comp->client, comp->icalcomp, &free_text);
+	if (!(str && *str)) {
+		if (free_text)
+			g_free ((char *)str);
+		free_text = FALSE;
+		str = _("* No Summary *");
+	}
+
+	l = gtk_label_new (NULL);
+	tmp = g_markup_printf_escaped ("<b>%s</b>", str);
+	gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
+	gtk_label_set_markup (GTK_LABEL (l), tmp);
+	gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+	w = gtk_event_box_new ();
+
+	gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_SELECTED]));
+	gtk_widget_modify_fg (l, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
+	gtk_container_add (GTK_CONTAINER (w), l);
+	gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
+	g_free (tmp);
+
+	if (free_text)
+		g_free ((char *)str);
+	free_text = FALSE;
+
+	w = gtk_event_box_new ();
+	gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_NORMAL]));
+
+	l = gtk_vbox_new (FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (w), l);
+	gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
+	w = l;
+
+	e_cal_component_get_organizer (new_comp, &organizer);
+	if (organizer.cn) {
+		char *ptr ;
+		ptr = strchr( organizer.value, ':');
+
+		if (ptr) {
+			ptr++;
+			/* To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>" */
+			tmp = g_strdup_printf (_("Organizer: %s <%s>"), organizer.cn, ptr);
+		} else {
+			/* With SunOne accounts, there may be no ':' in organiser.value */
+			tmp = g_strdup_printf (_("Organizer: %s"), organizer.cn);
+		}
+
+		l = gtk_label_new (tmp);
+		gtk_label_set_line_wrap (GTK_LABEL (l), FALSE);
+		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
+		g_free (tmp);
+	}
+
+	e_cal_component_get_dtstart (new_comp, &dtstart);
+	e_cal_component_get_due (new_comp, &dtdue);
+
+	default_zone = e_cal_model_get_timezone  (cal_table->model);
+
+	if (dtstart.tzid) {
+		zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (new_comp), dtstart.tzid);
+		if (!zone)
+			e_cal_get_timezone (comp->client, dtstart.tzid, &zone, NULL);
+		if (!zone)
+			zone = default_zone;
+	} else {
+		zone = NULL;
+	}
+
+	tmp2 = g_string_new ("");
+
+	if (dtstart.value) {
+		get_time_as_text (dtstart.value, zone, default_zone, buff, 1000);
+
+		if (buff [0]) {
+			g_string_append (tmp2, _("Start: "));
+			g_string_append (tmp2, buff);
+		}
+	}
+
+	if (dtdue.value) {
+		get_time_as_text (dtdue.value, zone, default_zone, buff, 1000);
+
+		if (buff [0]) {
+			if (tmp2->len)
+				g_string_append (tmp2, "; ");
+
+			g_string_append (tmp2, _("Due: "));
+			g_string_append (tmp2, buff);
+		}
+	}
+
+	if (tmp2->len) {
+		l = gtk_label_new (tmp2->str);
+		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
+	}
+
+	g_string_free (tmp2, TRUE);
+
+	e_cal_component_free_datetime (&dtstart);
+	e_cal_component_free_datetime (&dtdue);
+
+	tmp2 = g_string_new ("");
+	e_cal_component_get_description_list (new_comp, &desc);
+	for (len = 0, p = desc; p != NULL; p = p->next) {
+		ECalComponentText *text = p->data;
+
+		if (text->value != NULL) {
+			len += strlen (text->value);
+			g_string_append (tmp2, text->value);
+			if (len > 1024) {
+				g_string_set_size (tmp2, 1020);
+				g_string_append (tmp2, "...");
+				break;
+			}
+		}
+	}
+	e_cal_component_free_text_list (desc);
+
+	if (tmp2->len) {
+		l = gtk_label_new (tmp2->str);
+		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+		gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);
+	}
+
+	g_string_free (tmp2, TRUE);
+
+	gtk_widget_show_all (box);
+	gtk_tooltip_set_custom (tooltip, box);
+
+	g_object_unref (new_comp);
+
+	return TRUE;
+}
+
+static void
 e_calendar_table_init (ECalendarTable *cal_table)
 {
 	GtkWidget *table;
@@ -489,6 +696,8 @@ e_calendar_table_init (ECalendarTable *cal_table)
 	g_signal_connect (e_table, "right_click", G_CALLBACK (e_calendar_table_on_right_click), cal_table);
 	g_signal_connect (e_table, "key_press", G_CALLBACK (e_calendar_table_on_key_press), cal_table);
 	g_signal_connect (e_table, "popup_menu", G_CALLBACK (e_calendar_table_on_popup_menu), cal_table);
+	g_signal_connect (e_table, "query-tooltip", G_CALLBACK (query_tooltip_cb), cal_table);
+	gtk_widget_set_has_tooltip (GTK_WIDGET (e_table), TRUE);
 
 	a11y = gtk_widget_get_accessible ((GtkWidget *)e_table);
 	if (a11y)
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index b1ec9624c0..8fa9c61830 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -62,7 +62,7 @@
 #include "misc.h"
 
 /* Used for the status bar messages */
-#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "stock_calendar"
+#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "x-office-calendar"
 static GdkPixbuf *progress_icon = NULL;
 
 struct _ECalendarViewPrivate {
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 0d95f2c2d8..d0d17b0945 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -1098,7 +1098,7 @@ create_component_view (MemosComponent *memos_component)
 					     GTK_SHADOW_IN);
 	gtk_widget_show (selector_scrolled_window);
 
-	component_view->info_label = (EInfoLabel *)e_info_label_new("stock_insert-note");
+	component_view->info_label = (EInfoLabel *)e_info_label_new("evolution-memos");
 	e_info_label_set_info(component_view->info_label, _("Memos"), "");
 	gtk_widget_show (GTK_WIDGET (component_view->info_label));
 
@@ -1258,7 +1258,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_MEMO_ID;
 	list->_buffer[0].description = _("New memo");
-	list->_buffer[0].menuDescription = _("Mem_o");
+	list->_buffer[0].menuDescription = (char *) C_("New", "Mem_o");
 	list->_buffer[0].tooltip = _("Create a new memo");
 	list->_buffer[0].menuShortcut = 'o';
 	list->_buffer[0].iconName = "stock_insert-note";
@@ -1266,7 +1266,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = CREATE_SHARED_MEMO_ID;
 	list->_buffer[1].description = _("New shared memo");
-	list->_buffer[1].menuDescription = _("_Shared memo");
+	list->_buffer[1].menuDescription = (char *) C_("New", "_Shared memo");
 	list->_buffer[1].tooltip = _("Create a shared new memo");
 	list->_buffer[1].menuShortcut = 'h';
 	list->_buffer[1].iconName = "stock_insert-note";
@@ -1274,7 +1274,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = CREATE_MEMO_LIST_ID;
 	list->_buffer[2].description = _("New memo list");
-	list->_buffer[2].menuDescription = _("Memo li_st");
+	list->_buffer[2].menuDescription = (char *) C_("New", "Memo li_st");
 	list->_buffer[2].tooltip = _("Create a new memo list");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "stock_notes";
diff --git a/calendar/gui/memotypes.xml b/calendar/gui/memotypes.xml
index f27da759cf..3b9a560a96 100644
--- a/calendar/gui/memotypes.xml
+++ b/calendar/gui/memotypes.xml
@@ -121,7 +121,7 @@
         <_title>International</_title>
     </option>
     <option value="Next 7 days">
-        <_title>Next 7 Days'</_title>
+        <_title>Next 7 Days</_title>
     </option>
     <option value="Birthday">
         <_title>Birthday</_title>
@@ -139,7 +139,7 @@
         <_title>Key Customer</_title>
     </option>
     <option value="Time &amp; Expenses">
-        <_title>Time &amp; Expenses </_title>
+        <_title>Time &amp; Expenses</_title>
     </option>
     <option value="Miscellaneous">
         <_title>Miscellaneous</_title>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index f208d62bde..9caf4fbdf9 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -710,9 +710,10 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 static double
 bound_text (GtkPrintContext *context,
             PangoFontDescription *font,
-            const gchar *text,
+            const gchar *text, gint len,
 	    gdouble x1, gdouble y1,
-	    gdouble x2, gdouble y2)
+	    gdouble x2, gdouble y2,
+            gboolean can_wrap, gdouble *last_page_start, gint *pages)
 {
 	PangoLayout *layout;
 	gint layout_width, layout_height;
@@ -722,23 +723,38 @@ bound_text (GtkPrintContext *context,
 	layout = gtk_print_context_create_pango_layout (context);
 
 	pango_layout_set_font_description (layout, font);
-	pango_layout_set_text (layout, text, -1);
+	pango_layout_set_text (layout, text, len);
 	pango_layout_set_width (layout, pango_units_from_double (x2 - x1));
+
+	if (can_wrap)
+		pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
+
 	pango_layout_get_size (layout, &layout_width, &layout_height);
 
-	cairo_save (cr);
+	if (last_page_start && y1 + pango_units_to_double (layout_height) > y2 + (*last_page_start)) {
+		/* draw this on new page */
+		if (pages)
+			*pages = *pages + 1;
 
-	/* Set a clipping rectangle. */
-	cairo_move_to (cr, x1, y1);
-	cairo_rectangle (cr, x1, y1, x2, y2);
-	cairo_clip (cr);
-	cairo_new_path (cr);
+		*last_page_start = *last_page_start + y2;
+		y1 = *last_page_start + 10.0;
+	}
 
-	cairo_move_to (cr, x1, y1);
-	pango_cairo_show_layout (cr, layout);
-	cairo_stroke (cr);
+	if (!last_page_start || (y1 >= 0.0 && y1 < y2)) {
+		cairo_save (cr);
 
-	cairo_restore (cr);
+		/* Set a clipping rectangle. */
+		cairo_move_to (cr, x1, y1);
+		cairo_rectangle (cr, x1, y1, x2, y2);
+		cairo_clip (cr);
+		cairo_new_path (cr);
+
+		cairo_move_to (cr, x1, y1);
+		pango_cairo_show_layout (cr, layout);
+		cairo_stroke (cr);
+
+		cairo_restore (cr);
+	}
 
 	g_object_unref (layout);
 
@@ -992,7 +1008,7 @@ get_role_as_string (icalparameter_role role)
 static double
 print_attendees (GtkPrintContext *context, PangoFontDescription *font, cairo_t *cr,
 		 double left, double right, double top, double bottom,
-		 ECalComponent *comp)
+		 ECalComponent *comp, gint page_nr, gint *pages)
 {
 	GSList *attendees = NULL, *l;
 
@@ -1035,7 +1051,7 @@ print_attendees (GtkPrintContext *context, PangoFontDescription *font, cairo_t *
 				cairo_show_page (cr);
 			}
 
-			top = bound_text (context, font, text->str, left + 40.0, top, right, bottom);
+			top = bound_text (context, font, text->str, -1, left + 40.0, top, right, bottom, FALSE, NULL, pages);
 
 			g_string_free (text, TRUE);
 		}
@@ -1213,7 +1229,7 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 			g_free (t);
 	}
 
-	bound_text (context, font, text, x1 + 2, y1, x2 - 2, y2);
+	bound_text (context, font, text, -1, x1 + 2, y1, x2 - 2, y2, FALSE, NULL, NULL);
 
 	if (free_text)
 		g_free (text);
@@ -2014,8 +2030,8 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 			cairo_stroke (cr);
 		}
 
-		y = bound_text (context, font_summary, summary.value,
-				x + 14, y + 4, xend, yend);
+		y = bound_text (context, font_summary, summary.value, -1,
+				x + 14, y + 4, xend, yend, FALSE, NULL, NULL);
 
 
 		y += get_font_size (font_summary)-5;
@@ -2404,8 +2420,9 @@ print_calendar (GnomeCalendar *gcal, GtkPrintOperationAction action,
 	g_object_unref (operation);
 }
 
-static void
-print_comp_draw_page (GtkPrintOperation *operation,
+/* returns number of required pages, when page_nr is -1 */
+static gint
+print_comp_draw_real (GtkPrintOperation *operation,
                       GtkPrintContext *context,
                       gint page_nr,
                       PrintCompItem *pci)
@@ -2423,14 +2440,25 @@ print_comp_draw_page (GtkPrintOperation *operation,
 	char *categories_string, *location_string, *summary_string;
 	double header_size;
 	cairo_t *cr;
-	gdouble width, height;
+	gdouble width, height, page_start;
 	double top;
+	gint pages = 1;
 
 	setup = gtk_print_context_get_page_setup (context);
 
 	width = gtk_page_setup_get_page_width (setup, GTK_UNIT_POINTS);
 	height = gtk_page_setup_get_page_height (setup, GTK_UNIT_POINTS);
 
+	top = 0.0;
+
+	/* either draw only the right page or do not draw anything when calculating number of pages */
+	if (page_nr != -1)
+		top = top - ((page_nr) * height);
+	else
+		top = height;
+
+	page_start = top;
+
         /* PrintCompItem structure contains elements to be used
          * with the Print Context , obtained in comp_draw_page
          */
@@ -2447,27 +2475,30 @@ print_comp_draw_page (GtkPrintOperation *operation,
 	else if (vtype == E_CAL_COMPONENT_JOURNAL)
 		title = _("Memo");
 	else
-		return;
+		return pages;
 
 	cr = gtk_print_context_get_cairo_context (context);
 
 	/* Print the title in a box at the top of the page. */
 	font = get_font_for_size (18, PANGO_WEIGHT_BOLD);
 	header_size = 40;
-	print_border (context, 0.0, width, 0.0, header_size,
-		      1.0, 0.9);
-	print_text (context, font, title, PANGO_ALIGN_CENTER, 0.0, width,
-		    0.1, header_size - 0.1);
-	pango_font_description_free (font);
 
-	top = header_size + 30;
+	if (page_nr == 0) {
+		print_border (context, 0.0, width, 0.0, header_size,
+			1.0, 0.9);
+		print_text (context, font, title, PANGO_ALIGN_CENTER, 0.0, width,
+			0.1, header_size - 0.1);
+		pango_font_description_free (font);
+	}
+
+	top += header_size + 30;
 
 	/* Summary */
 	font = get_font_for_size (18, PANGO_WEIGHT_BOLD);
 	e_cal_component_get_summary (comp, &text);
 	summary_string = g_strdup_printf (_("Summary: %s"), text.value);
-	top = bound_text (context, font, summary_string, 0.0, top, width,
-			  height);
+	top = bound_text (context, font, summary_string, -1, 0.0, top, width,
+			  height, FALSE, &page_start, &pages);
 
 	g_free (summary_string);
 
@@ -2476,21 +2507,22 @@ print_comp_draw_page (GtkPrintOperation *operation,
 	if (location && location[0]) {
 		location_string = g_strdup_printf (_("Location: %s"),
 						   location);
-		top = bound_text (context, font, location_string, 0.0,
-				  top + 3, width, height);
+		top = bound_text (context, font, location_string, -1, 0.0,
+				  top + 3, width, height, FALSE, &page_start, &pages);
 		g_free (location_string);
 	}
 
 	/* Date information */
-	print_date_label (context, comp, client, 0.0, width, top + 3, top + 15);
+	if (page_nr == 0)
+		print_date_label (context, comp, client, 0.0, width, top + 3, top + 15);
 	top += 20;
 
 	/* Attendees */
 	if (e_cal_component_has_attendees (comp)) {
-		top = bound_text (context, font, _("Attendees: "), 0.0, top, width, height);
+		top = bound_text (context, font, _("Attendees: "), -1, 0.0, top, width, height, FALSE, &page_start, &pages);
 		pango_font_description_free (font);
 		font = get_font_for_size (12, PANGO_WEIGHT_NORMAL);
-		top = print_attendees (context, font, cr, 0.0, width, top, height, comp);
+		top = print_attendees (context, font, cr, 0.0, width, top, height, comp, page_nr, &pages);
 		top += get_font_size (font) - 6;
 	}
 
@@ -2529,8 +2561,8 @@ print_comp_draw_page (GtkPrintOperation *operation,
 			if (status_string) {
 				char *status_text = g_strdup_printf (_("Status: %s"),
 							      status_string);
-				top = bound_text (context, font, status_text,
-						  0.0, top, width, height);
+				top = bound_text (context, font, status_text, -1,
+						  0.0, top, width, height, FALSE, &page_start, &pages);
 				top += get_font_size (font) - 6;
 				g_free (status_text);
 			}
@@ -2545,8 +2577,8 @@ print_comp_draw_page (GtkPrintOperation *operation,
 			e_cal_component_free_priority (priority);
 
 			pri_text = g_strdup_printf (_("Priority: %s"), priority_string);
-			top = bound_text (context, font, pri_text,
-					  0.0, top, width, height);
+			top = bound_text (context, font, pri_text, -1,
+					  0.0, top, width, height, FALSE, &page_start, &pages);
 			top += get_font_size (font) - 6;
 			g_free (pri_text);
 		}
@@ -2559,8 +2591,8 @@ print_comp_draw_page (GtkPrintOperation *operation,
 			percent_string = g_strdup_printf (_("Percent Complete: %i"), *percent);
 			e_cal_component_free_percent (percent);
 
-			top = bound_text (context, font, percent_string,
-					  0.0, top, width, height);
+			top = bound_text (context, font, percent_string, -1,
+					  0.0, top, width, height, FALSE, &page_start, &pages);
 			top += get_font_size (font) - 6;
 		}
 
@@ -2571,8 +2603,8 @@ print_comp_draw_page (GtkPrintOperation *operation,
 			char *url_string = g_strdup_printf (_("URL: %s"),
 							    url);
 
-			top = bound_text (context, font, url_string,
-					  0.0, top, width, height);
+			top = bound_text (context, font, url_string, -1,
+					  0.0, top, width, height, TRUE, &page_start, &pages);
 			top += get_font_size (font) - 6;
 			g_free (url_string);
 		}
@@ -2583,8 +2615,8 @@ print_comp_draw_page (GtkPrintOperation *operation,
 	if (categories && categories[0]) {
 		categories_string = g_strdup_printf (_("Categories: %s"),
 						     categories);
-		top = bound_text (context, font, categories_string,
-				  0.0, top, width, height);
+		top = bound_text (context, font, categories_string, -1,
+				  0.0, top, width, height, TRUE, &page_start, &pages);
 		top += get_font_size (font) - 6 ;
 		g_free (categories_string);
 	}
@@ -2602,8 +2634,8 @@ print_comp_draw_page (GtkPrintOperation *operation,
 		}
 		e_cal_component_free_text_list (contact_list);
 
-		top = bound_text (context, font, contacts->str,
-				  0.0, top, width, height);
+		top = bound_text (context, font, contacts->str, -1,
+				  0.0, top, width, height, TRUE, &page_start, &pages);
 		top += get_font_size (font) - 6;
 		g_string_free (contacts, TRUE);
 	}
@@ -2612,19 +2644,48 @@ print_comp_draw_page (GtkPrintOperation *operation,
 	/* Description */
 	e_cal_component_get_description_list (comp, &desc);
 	for (l = desc; l != NULL; l = l->next) {
-		ECalComponentText *text = l->data;
-		if (top > height) {
-		top = 10; //FIXME
-		cairo_show_page (cr);
+		ECalComponentText *ptext = l->data;
+		const char *line, *next_line;
+
+		for (line = ptext->value; line != NULL; line = next_line) {
+			next_line = strchr (line, '\n');
+
+			top = bound_text (context, font, line, next_line ? next_line - line : -1, 0.0, top + 3, width, height, TRUE, &page_start, &pages);
+
+			if (next_line) {
+				next_line ++;
+				if (!*next_line)
+					next_line = NULL;
+			}
 		}
-		if (text->value != NULL)
-			top = bound_text (context, font, text->value, 0.0, top + 3, width, height) + 30;
 
 	}
 
 	e_cal_component_free_text_list (desc);
 	pango_font_description_free (font);
 
+	return pages;
+}
+
+static void
+print_comp_draw_page (GtkPrintOperation *operation,
+                      GtkPrintContext *context,
+                      gint page_nr,
+                      PrintCompItem *pci)
+{
+	print_comp_draw_real (operation, context, page_nr, pci);
+}
+
+static void
+print_comp_begin_print (GtkPrintOperation *operation,
+			GtkPrintContext   *context,
+                        PrintCompItem     *pci)
+{
+	gint pages;
+
+	pages = print_comp_draw_real (operation, context, -1, pci);
+
+	gtk_print_operation_set_n_pages (operation, pages);
 }
 
 void
@@ -2642,6 +2703,10 @@ print_comp (ECalComponent *comp, ECal *client, GtkPrintOperationAction action)
 	gtk_print_operation_set_n_pages (operation, 1);
 
 	g_signal_connect (
+		operation, "begin-print",
+		G_CALLBACK (print_comp_begin_print), &pci);
+
+	g_signal_connect (
 		operation, "draw-page",
 		G_CALLBACK (print_comp_draw_page), &pci);
 
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 3188b97d62..b7f6cc6ea2 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -1087,7 +1087,7 @@ create_component_view (TasksComponent *tasks_component)
 					     GTK_SHADOW_IN);
 	gtk_widget_show (selector_scrolled_window);
 
-	component_view->info_label = (EInfoLabel *)e_info_label_new("stock_task");
+	component_view->info_label = (EInfoLabel *)e_info_label_new("evolution-tasks");
 	e_info_label_set_info(component_view->info_label, _("Tasks"), "");
 	gtk_widget_show (GTK_WIDGET (component_view->info_label));
 
@@ -1323,7 +1323,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_TASK_ID;
 	list->_buffer[0].description = _("New task");
-	list->_buffer[0].menuDescription = _("_Task");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Task");
 	list->_buffer[0].tooltip = _("Create a new task");
 	list->_buffer[0].menuShortcut = 't';
 	list->_buffer[0].iconName = "stock_task";
@@ -1331,7 +1331,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = CREATE_TASK_ASSIGNED_ID;
 	list->_buffer[1].description = _("New assigned task");
-	list->_buffer[1].menuDescription = _("Assigne_d Task");
+	list->_buffer[1].menuDescription = (char *) C_("New", "Assigne_d Task");
 	list->_buffer[1].tooltip = _("Create a new assigned task");
 	list->_buffer[1].menuShortcut = '\0';
 	list->_buffer[1].iconName = "stock_task";
@@ -1339,7 +1339,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = CREATE_TASK_LIST_ID;
 	list->_buffer[2].description = _("New task list");
-	list->_buffer[2].menuDescription = _("Tas_k list");
+	list->_buffer[2].menuDescription = (char *) C_("New", "Tas_k list");
 	list->_buffer[2].tooltip = _("Create a new task list");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "stock_todo";
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1eeb5bb7e2..56e33a762b 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,18 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #428384
+
+	* mail-composer.error.xml:
+	Improve buttons in the "exit-unsaved" dialog by replacing "Cancel"
+	with "Continue Editing" and "Save Message" with "Save Draft".
+	Suggested by bytesmythe.
+
+2008-07-20  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #200147
+
+	* evolution-composer.ui: Added a Template placeholder
+
 2008-07-09  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #206592
diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui
index 7413770af9..1b8957640f 100644
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@ -9,6 +9,7 @@
         <menuitem action='save'/>
         <menuitem action='save-as'/>
         <menuitem action='save-draft'/>
+	<placeholder name='template-holder'/>
         <separator/>
         <menuitem action='print-preview'/>
         <menuitem action='print'/>
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index 210756bb52..6f76887bc8 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -46,8 +46,8 @@
   <_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
   <_secondary>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.</_secondary>
   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save Message" response="GTK_RESPONSE_YES"/>
+  <button _label="_Continue Editing" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Save Draft" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="no-build-message" type="error" modal="true">
diff --git a/configure.in b/configure.in
index 9b9d837414..a01bbc59e8 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, 2.23.5, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.23.90, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 
 # Some requirements have versioned package names
@@ -13,7 +13,7 @@ GTKHTML_PACKAGE=3.14
 # Required Packages
 m4_define([glib_minimum_version], [2.16.0])
 m4_define([gtk_minimum_version], [2.12.0])
-m4_define([eds_minimum_version], [2.23.5])
+m4_define([eds_minimum_version], [2.23.6])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([libbonobo_minimum_version], [2.20.3])
 m4_define([libbonoboui_minimum_version], [2.4.2])
@@ -184,7 +184,9 @@ PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER,
          libedataserver-$EDS_PACKAGE >= eds_minimum_version
          libedataserverui-$EDS_PACKAGE >= eds_minimum_version
          libegroupwise-$EDS_PACKAGE >= eds_minimum_version
-         libebackend-$EDS_PACKAGE >= eds_minimum_version])
+         libebackend-$EDS_PACKAGE >= eds_minimum_version
+	 libgdata-$EDS_PACKAGE >= eds_minimum_version
+	 libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
 
 
 dnl ******************
@@ -1570,7 +1572,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= 2.3.0)
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
@@ -1731,17 +1733,17 @@ AC_ARG_ENABLE([plugins],
 	      [enable_plugins="$enableval"],[enable_plugins=all])
 
 dnl Add any new plugins here
-plugins_base_always="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup hula-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup"
+plugins_base_always="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup"
 
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " 
 all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
 
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header" 
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" 
 
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
-plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor"
+plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup"
 plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN"
 all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
 
@@ -1824,8 +1826,8 @@ if ${PKG_CONFIG} --exists dbus-glib-1 ; then
 	# Get the version of the DBus API, so we can hack around API changes until the API stabilises:
 	# multiply by 1000 to convert decimal to integer; so e.g. 0.31 become 310
 	# since preprocessor values must be integral
-	DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
-	AC_SUBST(DBUS_VERSION)
+	FOUND_DBUS_VERSION="`$PKG_CONFIG --modversion dbus-1 | $AWK '{print 1000 * $1}'`"
+	AC_SUBST(FOUND_DBUS_VERSION)
 	AC_DEFINE(HAVE_DBUS,1,[Define if you have DBUS support])
 	AC_SUBST(HAVE_DBUS)
 	AM_CONDITIONAL(ENABLE_DBUS, true)
@@ -2046,8 +2048,10 @@ plugins/publish-calendar/Makefile
 plugins/import-ics-attachments/Makefile
 plugins/imap-features/Makefile
 plugins/tnef-attachments/Makefile
+plugins/templates/Makefile
 plugins/face/Makefile
 plugins/external-editor/Makefile
+plugins/webdav-account-setup/Makefile
 smime/Makefile
 smime/lib/Makefile
 smime/gui/Makefile
@@ -2080,6 +2084,6 @@ echo "\
 	SSL support:         $msg_ssl
 	SMIME support:       $msg_smime
 	Plugins:	     $msg_plugins
-	DBus API version:    $DBUS_VERSION
+	DBus API version:    $FOUND_DBUS_VERSION
 	User documentation:  $with_help
 "
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index ba02344f43..e97397c5cc 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -2,10 +2,25 @@ NULL =
 
 public_icons = \
 	hicolor_apps_16x16_evolution.png \
+	hicolor_apps_16x16_evolution-mail.png \
+	hicolor_apps_16x16_evolution-memos.png \
+	hicolor_apps_16x16_evolution-tasks.png \
 	hicolor_apps_22x22_evolution.png \
+	hicolor_apps_22x22_evolution-mail.png \
+	hicolor_apps_22x22_evolution-memos.png \
+	hicolor_apps_22x22_evolution-tasks.png \
 	hicolor_apps_24x24_evolution.png \
+	hicolor_apps_24x24_evolution-mail.png \
+	hicolor_apps_24x24_evolution-memos.png \
+	hicolor_apps_24x24_evolution-tasks.png \
 	hicolor_apps_32x32_evolution.png \
+	hicolor_apps_32x32_evolution-mail.png \
+	hicolor_apps_32x32_evolution-memos.png \
+	hicolor_apps_32x32_evolution-tasks.png \
 	hicolor_apps_48x48_evolution.png \
+	hicolor_apps_48x48_evolution-mail.png \
+	hicolor_apps_48x48_evolution-memos.png \
+	hicolor_apps_48x48_evolution-tasks.png \
 	hicolor_apps_scalable_evolution.svg \
 	$(NULL)
 
@@ -49,6 +64,7 @@ private_icons = \
 	hicolor_categories_48x48_preferences-composer.png \
 	hicolor_categories_48x48_preferences-mail.png \
 	hicolor_categories_48x48_preferences-mail-accounts.png \
+	hicolor_categories_48x48_preferences-system-network-proxy.png \
 	hicolor_places_16x16_mail-inbox.png \
 	hicolor_places_16x16_mail-outbox.png \
 	hicolor_places_16x16_mail-sent.png \
diff --git a/art/query-free-busy.png b/data/icons/hicolor_actions_24x24_query-free-busy.png
index 228c4a5b07..228c4a5b07 100644
--- a/art/query-free-busy.png
+++ b/data/icons/hicolor_actions_24x24_query-free-busy.png
diff --git a/data/icons/hicolor_apps_16x16_evolution-mail.png b/data/icons/hicolor_apps_16x16_evolution-mail.png
new file mode 100644
index 0000000000..652d919c0a
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_evolution-mail.png
diff --git a/data/icons/hicolor_apps_16x16_evolution-memos.png b/data/icons/hicolor_apps_16x16_evolution-memos.png
new file mode 100644
index 0000000000..ad4f90064c
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_evolution-memos.png
diff --git a/data/icons/hicolor_apps_16x16_evolution-tasks.png b/data/icons/hicolor_apps_16x16_evolution-tasks.png
new file mode 100644
index 0000000000..b8faae63ae
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_evolution-tasks.png
diff --git a/data/icons/hicolor_apps_22x22_evolution-mail.png b/data/icons/hicolor_apps_22x22_evolution-mail.png
new file mode 100644
index 0000000000..27f867e461
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_evolution-mail.png
diff --git a/data/icons/hicolor_apps_22x22_evolution-memos.png b/data/icons/hicolor_apps_22x22_evolution-memos.png
new file mode 100644
index 0000000000..f03b6ab05b
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_evolution-memos.png
diff --git a/data/icons/hicolor_apps_22x22_evolution-tasks.png b/data/icons/hicolor_apps_22x22_evolution-tasks.png
new file mode 100644
index 0000000000..3c0db1dcc5
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_evolution-tasks.png
diff --git a/data/icons/hicolor_apps_24x24_evolution-mail.png b/data/icons/hicolor_apps_24x24_evolution-mail.png
new file mode 100644
index 0000000000..876715661a
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_evolution-mail.png
diff --git a/data/icons/hicolor_apps_24x24_evolution-memos.png b/data/icons/hicolor_apps_24x24_evolution-memos.png
new file mode 100644
index 0000000000..11b3168d41
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_evolution-memos.png
diff --git a/data/icons/hicolor_apps_24x24_evolution-tasks.png b/data/icons/hicolor_apps_24x24_evolution-tasks.png
new file mode 100644
index 0000000000..14f6278c14
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_evolution-tasks.png
diff --git a/data/icons/hicolor_apps_32x32_evolution-mail.png b/data/icons/hicolor_apps_32x32_evolution-mail.png
new file mode 100644
index 0000000000..736a134d82
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_evolution-mail.png
diff --git a/data/icons/hicolor_apps_32x32_evolution-memos.png b/data/icons/hicolor_apps_32x32_evolution-memos.png
new file mode 100644
index 0000000000..a3c2bb12b2
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_evolution-memos.png
diff --git a/data/icons/hicolor_apps_32x32_evolution-tasks.png b/data/icons/hicolor_apps_32x32_evolution-tasks.png
new file mode 100644
index 0000000000..2d12fb51e3
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_evolution-tasks.png
diff --git a/data/icons/hicolor_apps_48x48_evolution-mail.png b/data/icons/hicolor_apps_48x48_evolution-mail.png
new file mode 100644
index 0000000000..33ad416682
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_evolution-mail.png
diff --git a/data/icons/hicolor_apps_48x48_evolution-memos.png b/data/icons/hicolor_apps_48x48_evolution-memos.png
new file mode 100644
index 0000000000..8bdc4b42d1
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_evolution-memos.png
diff --git a/data/icons/hicolor_apps_48x48_evolution-tasks.png b/data/icons/hicolor_apps_48x48_evolution-tasks.png
new file mode 100644
index 0000000000..694c921140
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_evolution-tasks.png
diff --git a/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png b/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png
new file mode 100644
index 0000000000..e3a4ce2887
--- /dev/null
+++ b/data/icons/hicolor_categories_48x48_preferences-system-network-proxy.png
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index ca1e193c40..785383c11b 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* e-plugin.c (ep_load):
+	Make sure system plugins are enabled on startup.
+
 2008-07-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #540282
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index b22c59b5f9..85c1edb060 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -470,9 +470,10 @@ ep_load(const char *filename, int load_level)
 				/* README: May be we can use load_levels to achieve the same thing.
 				   But it may be confusing for a plugin writer */
 				is_system_plugin = e_plugin_xml_prop (root, "system_plugin");
-				if (is_system_plugin && !strcmp (is_system_plugin, "true"))
+				if (is_system_plugin && !strcmp (is_system_plugin, "true")) {
+					e_plugin_enable (ep, TRUE);
 					ep->flags |= E_PLUGIN_FLAGS_SYSTEM_PLUGIN;
-				else
+				} else
 					ep->flags &= ~E_PLUGIN_FLAGS_SYSTEM_PLUGIN;
 				g_free (is_system_plugin);
 
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 1e713d561e..145ae2c029 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,22 @@
+2008-07-30  Takao Fujiwara  <takao.fujiwara@sun.com>
+
+	Reviewed by Srinivasa Ragavan <sragavan@novell.com>
+
+	** Fix for bug #545303
+
+	* filter-rule.c: (xml_decode): Add gettext in the xml string.
+
+2008-07-28  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #530388
+
+	* filter-label.c: (filter_label_init), (filter_label_finalise),
+	(fill_options), (filter_label_count), (filter_label_label),
+	(filter_label_index): Make 'cache_lock' a rec mutex.
+	* filter-label.c: (regen_label_options): Guard also regeneration
+	of each tracked item with the rec lock, thus noone will touch
+	'tracked_filters' GSList until we are fully done with it.
+
 2008-07-03  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #243201
diff --git a/filter/filter-label.c b/filter/filter-label.c
index 90906e8ba1..7291e36b4c 100644
--- a/filter/filter-label.c
+++ b/filter/filter-label.c
@@ -74,7 +74,7 @@ filter_label_get_type (void)
 	return type;
 }
 
-static GStaticMutex cache_lock = G_STATIC_MUTEX_INIT;
+static GStaticRecMutex cache_lock = G_STATIC_REC_MUTEX_INIT;
 static guint cache_notifier_id = 0;
 static GSList *tracked_filters = NULL;
 static GSList *labels_cache = NULL;
@@ -103,7 +103,7 @@ filter_label_init (FilterLabel *fl)
 {
 	((FilterOption *) fl)->type = "label";
 
-	g_static_mutex_lock (&cache_lock);
+	g_static_rec_mutex_lock (&cache_lock);
 
 	if (!tracked_filters) {
 		fill_cache ();
@@ -115,7 +115,7 @@ filter_label_init (FilterLabel *fl)
 
 	tracked_filters = g_slist_prepend (tracked_filters, fl);
 
-	g_static_mutex_unlock (&cache_lock);
+	g_static_rec_mutex_unlock (&cache_lock);
 }
 
 static void
@@ -123,7 +123,7 @@ filter_label_finalise (GObject *obj)
 {
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 
-	g_static_mutex_lock (&cache_lock);
+	g_static_rec_mutex_lock (&cache_lock);
 
 	tracked_filters = g_slist_remove (tracked_filters, obj);
 
@@ -138,7 +138,7 @@ filter_label_finalise (GObject *obj)
 		gconf_client = NULL;
 	}
 
-	g_static_mutex_unlock (&cache_lock);
+	g_static_rec_mutex_unlock (&cache_lock);
 }
 
 /**
@@ -176,7 +176,7 @@ fill_options (FilterOption *fo)
 {
 	GSList *l;
 
-	g_static_mutex_lock (&cache_lock);
+	g_static_rec_mutex_lock (&cache_lock);
 
 	for (l = labels_cache; l; l = l->next) {
 		EUtilLabel *label = l->data;
@@ -197,7 +197,7 @@ fill_options (FilterOption *fo)
 		g_free (title);
 	}
 
-	g_static_mutex_unlock (&cache_lock);
+	g_static_rec_mutex_unlock (&cache_lock);
 }
 
 static void
@@ -222,12 +222,13 @@ regen_label_options (FilterOption *fo)
 static void
 gconf_labels_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-	g_static_mutex_lock (&cache_lock);
+	g_static_rec_mutex_lock (&cache_lock);
+
 	clear_cache ();
 	fill_cache ();
-	g_static_mutex_unlock (&cache_lock);
-
 	g_slist_foreach (tracked_filters, (GFunc)regen_label_options, NULL);
+
+	g_static_rec_mutex_unlock (&cache_lock);
 }
 
 /* ************************************************************************* */
@@ -237,11 +238,11 @@ filter_label_count (void)
 {
 	int res;
 
-	g_static_mutex_lock (&cache_lock);
+	g_static_rec_mutex_lock (&cache_lock);
 
 	res = g_slist_length (labels_cache);
 
-	g_static_mutex_unlock (&cache_lock);
+	g_static_rec_mutex_unlock (&cache_lock);
 	
 	return res;
 }
@@ -253,7 +254,7 @@ filter_label_label (int i)
 	GSList *l;
 	EUtilLabel *label;
 
-	g_static_mutex_lock (&cache_lock);
+	g_static_rec_mutex_lock (&cache_lock);
 	
 	l = g_slist_nth (labels_cache,  i);
 
@@ -269,7 +270,7 @@ filter_label_label (int i)
 			res = label->tag;
 	}
 
-	g_static_mutex_unlock (&cache_lock);
+	g_static_rec_mutex_unlock (&cache_lock);
 
 	return res;
 }
@@ -280,7 +281,7 @@ filter_label_index (const char *label)
 	int i;
 	GSList *l;
 
-	g_static_mutex_lock (&cache_lock);
+	g_static_rec_mutex_lock (&cache_lock);
 
 	for (i = 0, l = labels_cache; l; i++, l = l->next) {
 		EUtilLabel *lbl = l->data;
@@ -293,7 +294,7 @@ filter_label_index (const char *label)
 			break;
 	}
 
-	g_static_mutex_unlock (&cache_lock);
+	g_static_rec_mutex_unlock (&cache_lock);
 
 	if (l)
 		return i;
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index e6e59baeac..c7e79269e6 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -444,12 +444,13 @@ xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)
 			load_set (work, fr, f);
 		} else if (!strcmp ((char *)work->name, "title") || !strcmp ((char *)work->name, "_title")) {
 			if (!fr->name) {
-				char *str, *decstr;
+				char *str, *decstr = NULL;
 
 				str = (char *)xmlNodeGetContent (work);
-				decstr = g_strdup (str);
-				if (str)
+				if (str) {
+					decstr = g_strdup (_(str));
 					xmlFree (str);
+				}
 				fr->name = decstr;
 			}
 		}
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index c71124de68..b133201602 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -88,10 +88,10 @@
     <para><link linkend="usage-mainwindow">Getting Started</link></para>
    </listitem>
    <listitem>
-    <para><link linkend="usage-mail">Sending and Receiving E-Mail</link></para>
+    <para><link linkend="usage-mail">Sending and Receiving Email</link></para>
    </listitem>
    <listitem>
-    <para><link linkend="usage-mail-organize">Organizing Your E-Mail</link></para>
+    <para><link linkend="usage-mail-organize">Organizing Your Email</link></para>
    </listitem>
    <listitem>
     <para><link linkend="usage-contact">Evolution Contacts: the Address Book</link></para>
@@ -106,9 +106,6 @@
     <para><link linkend="usage-groupwise">Connecting to GroupWise</link></para>
    </listitem>
    <listitem>
-    <para><link linkend="b1012tkg">Connecting to Hula</link></para>
-   </listitem>
-   <listitem>
     <para><link linkend="config-prefs">Advanced Configuration</link></para>
    </listitem>
    <listitem>
@@ -131,26 +128,26 @@
    </listitem>
   </itemizedlist>
   <formalpara id="b17q8udq">
-   <title>Additional Documentation: </title>
+   <title>Additional Documentation:</title>
    <para>You can find additional help in three places:</para>
   </formalpara>
   <itemizedlist>
    <listitem>
-    <para>For information about command line options, open a terminal window and type <command>evolution --help</command>.</para>
+    <para>Evolution has a number of command line options that you can use. For information about command line options, open a terminal window and type <command>evolution --help</command>.</para>
    </listitem>
    <listitem>
     <para>In the Evolution interface, click Help &gt; Contents.</para>
    </listitem>
   </itemizedlist>
   <formalpara id="b17q8uz1">
-   <title>Documentation Conventions: </title>
+   <title>Documentation Conventions:</title>
    <para>In Novell documentation, a greater-than symbol (&gt;) is used to separate actions within a step and items in a cross-reference path. A trademark symbol (<trademark class="registered"/>, <trademark/>, etc.) denotes a Novell trademark. An asterisk (*) denotes a third-party trademark.</para>
   </formalpara>
  </preface>
 
  <chapter id="usage-mainwindow">
   <title>Getting Started</title>
-  <para><trademark>Evolution</trademark> is a <link linkend="groupware">groupware</link> application that helps you work in a group by handling e-mail, address, memos, tasks, and one or more calendars. This makes the tasks of storing, organizing, and retrieving your personal information easy, so you can work and communicate more effectively with others.</para>
+  <para><trademark>Evolution</trademark> is a <link linkend="groupware">groupware</link> application that helps you work in a group by handling email, address, memos, tasks, and one or more calendars. This makes the tasks of storing, organizing, and retrieving your personal information easy, so you can work and communicate more effectively with others.</para>
   <itemizedlist>
    <listitem>
     <para><link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link></para>
@@ -175,7 +172,7 @@
           <para>GNOME:</para>
          </entry>
          <entry colname="2">
-          <para>Click  Applications &gt; Office &gt; Evolution.</para>
+          <para>Click Applications &gt; Office &gt; Evolution.</para>
          </entry>
         </row>
         <row id="bsptywg">
@@ -202,7 +199,7 @@
 
    <section id="bse54o0">
     <title>Using the First-Run Assistant</title>
-    <para>The first time you run Evolution, it creates a directory <emphasis>.evolution</emphasis> in your home directory, where it stores all of its local data. Then, it opens a First-Run Assistant to help you set up e-mail accounts and import data from other applications.</para>
+    <para>The first time you run Evolution, it creates a directory <emphasis>.evolution</emphasis> in your home directory, where it stores all of its local data. Then, it opens a First-Run Assistant to help you set up email accounts and import data from other applications.</para>
     <para>Using the first-run assistant takes two to five minutes.</para>
     <para>Later on, if you want to change this account, or if you want to create a new one, click Edit &gt; Preferences, then click Mail Accounts. Select the account you want to change, then click Edit. Alternately, add a new account by clicking Add. See <link linkend="config-prefs-mail">Mail Preferences</link> for details.</para>
     <para>The First-Run Assistant helps you provide the information Evolution needs to get started.</para>
@@ -229,7 +226,7 @@
 
     <section id="first-step">
      <title>Defining Your Identity</title>
-     <para>The Identity window is the first step in the assistant. </para>
+     <para>The Identity window is the first step in the assistant.</para>
      <mediaobject id="bsj8pww"><imageobject><imagedata format="PNG" fileref="figures/evo_identity_a.png"/></imageobject></mediaobject>
      <para>Here, you enter some basic personal information. You can define multiple identities later by clicking Edit &gt; Preferences, then clicking Mail Accounts.</para>
      <para>When the First-Run Assistant starts, the Welcome page is displayed. Click Forward to proceed to the Identity window.</para>
@@ -238,7 +235,7 @@
        <para>Type your full name in the Full Name field.</para>
       </listitem>
       <listitem id="bstfipr">
-       <para>Type your e-mail address in the E-Mail Address field.</para>
+       <para>Type your email address in the Email Address field.</para>
       </listitem>
       <listitem id="bstfj3i">
        <para>(Optional) Select if this account is your default account.</para>
@@ -249,7 +246,7 @@
       </listitem>
       <listitem id="bstfkcz">
        <para>(Optional) Type your organization name in the Organization field.</para>
-       <para>This is the company where you work, or the organization you represent when you send e-mail.</para>
+       <para>This is the company where you work, or the organization you represent when you send email.</para>
       </listitem>
       <listitem id="bstfl19">
        <para>Click Forward.</para>
@@ -259,7 +256,7 @@
 
     <section id="second-step">
      <title>Receiving Mail</title>
-     <para>The Receiving E-mail option lets you determine where you get your e-mail.</para>
+     <para>The Receiving Email option lets you determine where you get your email.</para>
      <mediaobject id="bsj8qah"><imageobject><imagedata format="PNG" fileref="figures/evo_receive_setup_a.png"/></imageobject></mediaobject>
      <para>You need to specify the type of server you want to receive mail with. If you are unsure about the type of server to choose, ask your system administrator or ISP.</para>
      <orderedlist>
@@ -268,23 +265,19 @@
        <para>The following is a list of server types that are available:</para>
        <formalpara id="bsj74dr">
         <title>Novell GroupWise:</title>
-        <para>Select this option if you connect to Novell <trademark class="registered">GroupWise</trademark>. Novell GroupWise keeps e-mail, calendar, and contact information on the server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
+        <para>Select this option if you connect to Novell <trademark class="registered">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and contact information on the server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="bsj74ds">
         <title>Microsoft Exchange:</title>
-        <para>Available only if you have installed the Connector for Microsoft&z-3rdParty; Exchange. It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which stores e-mail, calendar, and contact information on the server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
+        <para>Available only if you have installed the Connector for Microsoft&z-3rdParty; Exchange. It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which stores email, calendar, and contact information on the server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="bsj74dt">
         <title>IMAP:</title>
-        <para>Keeps the e-mail on your server so you can access your e-mail from multiple systems. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
+        <para>Keeps the email on your server so you can access your email from multiple systems. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="bsj74du">
         <title>POP:</title>
-        <para>Downloads your e-mail to your hard disk for permanent storage, freeing up space on the e-mail server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
-       </formalpara>
-       <formalpara id="b13sa2jr">
-        <title>Hula:</title>
-        <para>Select this option if you want Hula account. Evolution provide you connectivity to <trademark class="registered">Hula</trademark> servers through IMAP and calendaring support through CalDAV. For more information refer <link linkend="b1012tkg">Connecting to Hula</link></para>
+        <para>Downloads your email to your hard disk for permanent storage, freeing up space on the email server. For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="bstgdhu">
         <title>USENET News:</title>
@@ -292,27 +285,27 @@
        </formalpara>
        <formalpara id="bsj74dv">
         <title>Local Delivery:</title>
-        <para>Choose this option if you want to move e-mail from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave e-mail in your system's spool files, choose the Standard Unix Mbox Spool option instead. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+        <para>Choose this option if you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the Standard Unix Mbox Spool option instead. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="bsj74dw">
         <title>MH Format Mail Directories:</title>
-        <para>If you download your e-mail using mh or another MH-style program, you should use this option. You need to provide the path to the mail directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+        <para>If you download your email using mh or another MH-style program, you should use this option. You need to provide the path to the mail directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="bsj74dx">
         <title>Maildir Format Mail Directories:</title>
-        <para>If you download your e-mail using Qmail or another maildir-style program, you should use this option. You need to provide the path to the mail directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+        <para>If you download your email using Qmail or another maildir-style program, you should use this option. You need to provide the path to the mail directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="bsj74dy">
         <title>Standard Unix mbox spool file:</title>
-        <para>If you want to read and store e-mail in the mail spool file on your local system, choose this option. You need to provide the path to the mail spool file you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+        <para>If you want to read and store email in the mail spool file on your local system, choose this option. You need to provide the path to the mail spool file you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="b185ajx5">
         <title>Standard Unix mbox spool directory:</title>
-        <para>If you want to read and store e-mail in the mail spool directory on your local system, choose this option. You need to provide the path to the mail spool directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
+        <para>If you want to read and store email in the mail spool directory on your local system, choose this option. You need to provide the path to the mail spool directory you want to use. For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
        </formalpara>
        <formalpara id="bsj74dz">
         <title>None:</title>
-        <para>Select this if you do not plan to check e-mail with this account. If you select this, there are no configuration options.</para>
+        <para>Select this if you do not plan to check email with this account. If you select this, there are no configuration options.</para>
        </formalpara>
       </listitem>
      </orderedlist>
@@ -322,21 +315,22 @@
       <para>If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, you need to specify additional information.</para>
       <orderedlist>
        <listitem id="bstg8f2">
-        <para>Type the server name of your e-mail server in the Server field.</para>
-        <para>If you don't know the Server, contact your administrator.</para>
+        <para>Type the server name of your email server in the Server field.</para>
+        <para>If you are unsure what your Server address is, contact your system administrator.</para>
        </listitem>
        <listitem id="bstg8sr">
-        <para>Type your username for the account in the Username field.</para>
+        <para>Type your username in the Username field.</para>
        </listitem>
        <listitem id="bstg8yn">
-        <para>Select to use a secure (SSL) connection.</para>
-        <para>If your server supports secure connections, you should enable this security option. If you are unsure if your server supports a secure connection, contact your system administrator.</para>
+        <para>Select if you want to use a secure connection (SSL or TLS).</para>
+        <para>You should enable this option if your server supports it.</para>
+        <para>Free webmail providers usually supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</para>
        </listitem>
        <listitem id="bstg9rc">
         <para>Select your authentication type in the Authentication list.</para>
         <para>or</para>
         <para>Click Check for Supported Types to have Evolution check for supported types. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</para>
-        <para>If you are unsure what authentication type you need, contact your system administrator.</para>
+        <para>Free webmail providers usually supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</para>
        </listitem>
        <listitem id="bstgaxb">
         <para>Select if you want Evolution to remember your password.</para>
@@ -345,13 +339,13 @@
         <para>Click Forward.</para>
        </listitem>
       </orderedlist>
-      <para>(Conditional) If you chose Microsoft Exchange as the server type, provide your username in the Username field and your Outlook Web Access (OWA) URL in the OWA URL field. The URL and the usernames should use the Outlook format.If the mailbox path is different from the username, the OWA path should also include mailbox path, for example http://<varname>server name</varname>/exchange/<varname>mail box path</varname>.</para>
+      <para>(Conditional) If you chose Microsoft Exchange as the server type, provide your username in the Username field and your Outlook Web Access (OWA) URL in the OWA URL field. The URL and the usernames should use the Outlook format. If the mailbox path is different from the username, the OWA path should also include mailbox path, for example http://<varname>server name</varname>/exchange/<varname>mail box path</varname>.</para>
       <para>When you have finished, continue with <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
      </section>
 
      <section id="bstgbqn">
       <title>Local Configuration Options</title>
-      <para>If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format Mail Directories, or Standard Unix mbox spool file and Standard Unix mbox spool directory, you must specify the path to the local files in the path field. Continue with<link linkend="more-mail-options">Receiving Mail Options</link> .</para>
+      <para>If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool directory, you must specify the path to the local files in the path field. Continue with<link linkend="more-mail-options">Receiving Mail Options</link>.</para>
      </section>
     </section>
 
@@ -400,20 +394,20 @@
         <para>Select if you want to check for new messages in all folders.</para>
        </listitem>
        <listitem id="bsthlol">
-        <para>Select if you want to apply filters to new messages in the Inbox on the server.</para>
+        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
         <para>For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
        </listitem>
        <listitem id="bsthlvl">
         <para>Select if you want to check new messages for junk content.</para>
-        <para>For additional information on junk content, see  <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link> and <link linkend="mail-prefs-junk">Junk </link>.</para>
+        <para>For additional information on junk content, see <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link> and <link linkend="mail-prefs-junk">Junk</link>.</para>
        </listitem>
        <listitem id="bsthm9q">
         <para>Select if you want to only check for junk messages in the Inbox folder.</para>
        </listitem>
        <listitem id="bsthmhx">
-        <para>Select if you want to automatically synchronize remote mail locally.</para>
-        <para>Evolution, by default downloads only the header information such as From, Subject, and Date.  The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
-        <para>If you check this option, evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition to that, you can download the mails for reading them offline, when you have checked this option.</para>
+        <para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
+        <para>Evolution, by default downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
+        <para>If you check this option, evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition to that, you can download the mail for reading them offline, when you have checked this option.</para>
        </listitem>
        <listitem id="bsthnab">
         <para>Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port field.</para>
@@ -445,22 +439,22 @@
         <para>The Global Catalog Server contains the user information for users. If you are unsure what your Global Catalog server name is, contact your system administrator.</para>
        </listitem>
        <listitem id="bstglhn">
-        <para>Select if you want to limit the number of Global Address Lists (GAL). </para>
-        <para>The GAL contains a list of all e-mail addresses. If you select this option, you need to specify the maximum number of responses.</para>
+        <para>Select if you want to limit the number of Global Address Lists (GAL).</para>
+        <para>The GAL contains a list of all email addresses. If you select this option, you need to specify the maximum number of responses.</para>
        </listitem>
        <listitem id="bstgsrp">
         <para>Select if you want to use a password expire warning time period.</para>
         <para>If you select this option, you need to specify how often Evolution should send the password expire message.</para>
        </listitem>
        <listitem id="bv6uqm7">
-        <para>Select automatically synchronize remote mail locally to download the messages to your local system.</para>
+        <para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
        </listitem>
        <listitem id="b13sbpg5">
-        <para>Select apply filters to new messages in inbox on this server to apply filters.</para>
+        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
        </listitem>
        <listitem id="b13sbqmb">
-        <para>Select check new messages for junk contents to filter new messages for spam messages. </para>
-        <para>For more information refer <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link></para>
+        <para>Select if you want to check new messages for junk content.</para>
+        <para>For additional information on junk content, see <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link> and <link linkend="mail-prefs-junk">Junk</link>.</para>
        </listitem>
        <listitem id="bstgtoj">
         <para>Click Forward.</para>
@@ -479,7 +473,7 @@
         <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
        </listitem>
        <listitem id="bstgh57">
-        <para>Select if you want Evolution to use custom commands to connect to Evolution.</para>
+        <para>Select if you want Evolution to use custom commands to connect to the IMAP server.</para>
         <para>If you select this option, specify the custom command you want Evolution to use.</para>
        </listitem>
        <listitem id="bstgi0r">
@@ -491,20 +485,20 @@
         <para>By choosing this option you can rename the folders that the server provides. If you select this option, you need to specify the namespace to use.</para>
        </listitem>
        <listitem id="bstgip8">
-        <para>Select if you want to apply filters to new messages in the Inbox.</para>
+        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
         <para>For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
        </listitem>
        <listitem id="bstgiv6">
         <para>Select if you want to check new messages for junk content.</para>
-        <para>For additional information on junk content, see <link linkend="mail-prefs-junk">Junk Mail Preferences</link>.</para>
+        <para>For additional information on junk content, see <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link> and <link linkend="mail-prefs-junk">Junk</link>.</para>
        </listitem>
        <listitem id="bstgj0g">
         <para>Select if you want to check for junk messages in the Inbox folder.</para>
        </listitem>
        <listitem id="bstgje2">
-        <para>Select if you want to automatically synchronize remote mail locally.</para>
+        <para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
         <para>Evolution, by default downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
-        <para>If you check this option, evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition to that, you can download the mails for reading them offline, when you have checked this option.</para>
+        <para>If you check this option, evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition to that, you can download the mail for reading them offline, when you have checked this option.</para>
        </listitem>
        <listitem id="bstgjlq">
         <para>Click Forward.</para>
@@ -519,13 +513,14 @@
       <para>If you select POP as your receiving server type, you need to specify the following options:</para>
       <orderedlist>
        <listitem id="bsthozk">
-        <para>Select if you want Evolution to automatically check for new mail.If you select this option, you need to specify how often Evolution should check for new messages.</para>
+        <para>Select if you want Evolution to automatically check for new mail.</para>
+        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
        </listitem>
        <listitem id="bsthpck">
         <para>Select if you want to leave messages on the server.</para>
        </listitem>
        <listitem id="bsthpn9">
-        <para>Select if you want to disable support for all POP3 extensions (support for POP3).</para>
+        <para>Select if you want to disable support for all POP3 extensions.</para>
        </listitem>
        <listitem id="bsthpur">
         <para>Click Forward.</para>
@@ -540,7 +535,8 @@
       <para>If you select USENET News as your receiving server type, you need to specify the following options:</para>
       <orderedlist>
        <listitem id="bsthqws">
-        <para>Select if you want Evolution to automatically check for new mail.If you select this option, you need to specify how often Evolution should check for new messages.</para>
+        <para>Select if you want Evolution to automatically check for new mail.</para>
+        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
        </listitem>
        <listitem id="bsthr47">
         <para>Select if you want to show folders in short notation.</para>
@@ -562,7 +558,8 @@
       <para>If you select Local Delivery as your receiving server type, you need to specify the following options:</para>
       <orderedlist>
        <listitem id="bsthsnr">
-        <para>Select if you want Evolution to automatically check for new mail.If you select this option, you need to specify how often Evolution should check for new messages.</para>
+        <para>Select if you want Evolution to automatically check for new mail.</para>
+        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
        </listitem>
        <listitem id="bsthsv1">
         <para>Click Forward.</para>
@@ -576,7 +573,8 @@
       <para>If you select MH-Format Mail Directories as your receiving server type, you need to specify the following options:</para>
       <orderedlist>
        <listitem id="bsthtg0">
-        <para>Select if you want Evolution to automatically check for new mail.If you select this option, you need to specify how often Evolution should check for new messages.</para>
+        <para>Select if you want Evolution to automatically check for new mail.</para>
+        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
        </listitem>
        <listitem id="bsthth2">
         <para>Select if you want to use the <emphasis>.folders</emphasis> summary file.</para>
@@ -595,10 +593,11 @@
       <para>If you select Maildir-Format Mail Directories as your receiving server type, you need to specify the following options:</para>
       <orderedlist>
        <listitem id="bsthu9o">
-        <para>Select if you want Evolution to automatically check for new mail.If you select this option, you need to specify how often Evolution should check for new messages.</para>
+        <para>Select if you want Evolution to automatically check for new mail.</para>
+        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
        </listitem>
        <listitem id="bsthuah">
-        <para>Select if you want to apply filters to new messages in the Inbox.</para>
+        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
         <para>For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
        </listitem>
        <listitem id="bsthuhd">
@@ -614,10 +613,11 @@
       <title>Standard Unix mbox spool file Receiving Options</title>
       <orderedlist>
        <listitem id="bsthuto">
-        <para>Select if you want Evolution to automatically check for new mail.If you select this option, you need to specify how often Evolution should check for new messages.</para>
+        <para>Select if you want Evolution to automatically check for new mail.</para>
+        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
        </listitem>
        <listitem id="bsthuv9">
-        <para>Select if you want to apply filters to new messages in the Inbox.</para>
+        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
        </listitem>
        <listitem id="bsthv0m">
         <para>Select if you want to store status headers in Elm, Pine, and Mutt formats.</para>
@@ -636,10 +636,11 @@
       <para>If you select Standard Unix mbox Spool directory as your receiving server type, you need to specify the following options:</para>
       <orderedlist>
        <listitem id="b185aln9">
-        <para>Select if you want Evolution to automatically check for new mail.If you select this option, you need to specify how often Evolution should check for new messages.</para>
+        <para>Select if you want Evolution to automatically check for new mail.</para>
+        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
        </listitem>
        <listitem id="b185alna">
-        <para>Select if you want to apply filters to new messages in the Inbox.</para>
+        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
        </listitem>
        <listitem id="b185alnb">
         <para>Select if you want to store status headers in Elm, Pine, and Mutt formats.</para>
@@ -677,7 +678,7 @@
       <mediaobject id="bsj8ujq"><imageobject><imagedata format="PNG" fileref="figures/evo_send_setup_a.png"/></imageobject></mediaobject>
       <orderedlist>
        <listitem id="bsthxta">
-        <para>Type the Server address in the Server field.</para>
+        <para>Type the server name of your email server in the Server field.</para>
         <para>If you are unsure what your Server address is, contact your system administrator.</para>
        </listitem>
        <listitem id="bsthy6f">
@@ -687,7 +688,7 @@
          <listitem id="bsw0acl">
           <para>Select your authentication type in the Authentication list.</para>
           <para>or</para>
-          <para>Click Check for Supported Types to have Evolution check for supported types. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work. </para>
+          <para>Click Check for Supported Types to have Evolution check for supported types. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</para>
          </listitem>
          <listitem id="bsw0aqr">
           <para>Type your username in the Username field.</para>
@@ -698,7 +699,7 @@
         </orderedlist>
        </listitem>
        <listitem id="bsthypm">
-        <para>Select if you use a secure connection (SSL).</para>
+        <para>Select if you want to use a secure connection (SSL or TLS).</para>
        </listitem>
        <listitem id="bsti1a0">
         <para>Click Forward.</para>
@@ -710,7 +711,7 @@
 
     <section id="bsti1ty">
      <title>Account Management</title>
-     <para>Now that you have finished the e-mail configuration process you need to give the account a name. The name can be any name you prefer. Type your account name on the Name field, then click Forward.</para>
+     <para>Now that you have finished the email configuration process you need to give the account a name. The name can be any name you prefer. Type your account name on the Name field, then click Forward.</para>
      <para>Continue with <link linkend="step-three-b">Time Zone</link><link linkend="step-three-b"/>.</para>
     </section>
 
@@ -729,17 +730,18 @@
        <para>Evolution opens with your new account created.</para>
       </listitem>
      </orderedlist>
-     <para>If you want to import e-mail from another e-mail client, continue with <link linkend="fourth-step">Importing Mail (Optional)</link>. If not, skip to <link linkend="ui-intro">Using Evolution: An Overview</link>.</para>
+     <para>If you want to import email from another email client, continue with <link linkend="fourth-step">Importing Mail (Optional)</link>. If not, skip to <link linkend="ui-intro">Using Evolution: An Overview</link>.</para>
     </section>
 
     <section id="fourth-step">
      <title>Importing Mail (Optional)</title>
-     <para>After selecting your time zone, if Evolution finds e-mail or address files from another application, it offers to import them. For a full description of the import feature, see <link linkend="importing-mail">Importing Single Files</link>.</para>
-     <para>Microsoft Outlook&z-3rdParty; and versions of Outlook Express after version 4 use proprietary formats that Evolution cannot read or import. To import information, you might want to use the Export tool under Windows&z-3rdParty;. See the instructions in <link linkend="outlook-migration-mail">Migrating Local Outlook Mail Folders</link>.</para>
-     <para>Before importing e-mail from Netscape&z-3rdParty;, make sure you have selected File &gt; Compact All Folders. If you don't, Evolution will import and undelete the messages in your Trash folders.</para>
+     <para>After selecting your time zone, if Evolution finds email or address files from another application, it offers to import them. For a full description of the import feature, see <link linkend="importing-mail">Importing Single Files</link>.</para>
+     <para>Microsoft Outlook&z-3rdParty; and versions of Outlook Express after version 4 use proprietary formats that Evolution cannot read or import.</para>
+     <para>To import information, you might want to use the Export tool under Windows&z-3rdParty;. See the instructions in <link linkend="outlook-migration-mail">Migrating Local Outlook Mail Folders</link>.</para>
+     <para>Before importing email from Netscape&z-3rdParty;, Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports and undeletes the messages in your Trash folders.</para>
      <tip>
-      <para>Evolution uses standard file types for e-mail and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <command>mbox</command> for e-mail and iCal for calendar information.</para>
-      <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export contact data, open your contacts tool and select the contacts you want to export (press Ctrl+A to select them all). Click File &gt; Save Contact as VCard.</para>
+      <para>Evolution uses standard file types for email and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <command>mbox</command> for email and iCal for calendar information.</para>
+      <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export an addressbook, click File &gt; Save Address Book As VCard". If you want to export only one contact, click File &gt; Save Contact as VCard.</para>
      </tip>
     </section>
    </section>
@@ -755,7 +757,7 @@
    </formalpara>
    <formalpara id="b17s9n8w">
     <title>Folder List:</title>
-    <para>The folder list gives you a list of the available folders for each account. To see the contents of a folder, click the folder name and the contents are displayed in the e-mail list.</para>
+    <para>The folder list gives you a list of the available folders for each account. To see the contents of a folder, click the folder name and the contents are displayed in the message list.</para>
    </formalpara>
    <formalpara id="b17s9nvy">
     <title>Toolbar:</title>
@@ -763,32 +765,32 @@
    </formalpara>
    <formalpara id="b17s9o2z">
     <title>Search Tool:</title>
-    <para>The search tool lets you search your e-mail, contacts, calendar, and tasks to easily find what you're looking for.</para>
+    <para>The search tool lets you search your email, contacts, calendar, and tasks to easily find what you're looking for.</para>
    </formalpara>
    <formalpara id="b17s9o9p">
     <title>Message List:</title>
-    <para>The message list displays a list of e-mail that you have received. To view an e-mail in the preview pane, click the e-mail in the e-mail list.</para>
+    <para>The message list displays a list of email that you have received. To view an email in the preview pane, click the email in the message list.</para>
    </formalpara>
    <formalpara id="b17s9of0">
     <title>Side bar:</title>
-    <para>The side bar lets you switch between folders and between Evolution tools. At the bottom of the side bar is the switcher that let you switch Evolution tools, and above that is a list of all the available folders for the current tool.For additional information, see <link linkend="usage-mainwindow-shortcutbar">The Side Bar</link>.</para>
+    <para>The side bar lets you switch between folders and between Evolution tools. At the bottom of the side bar is the switcher that let you switch Evolution tools, and above that is a list of all the available folders for the current tool. For additional information, see <link linkend="usage-mainwindow-shortcutbar">The Side Bar</link>.</para>
    </formalpara>
    <formalpara id="b17xycio">
     <title>Switcher:</title>
-    <para>The switcher at the bottom of the side bar lets you switch between the Evolution tools - mail, contacts, Calendars, Memos and Tasks.</para>
+    <para>The switcher at the bottom of the side bar lets you switch between the Evolution tools - Mail, Contacts, Calendars, Memos and Tasks.</para>
    </formalpara>
    <formalpara id="b17s9ol7">
     <title>Status Bar:</title>
-    <para>The status bar periodically displays a message, or tells you the progress of a task. This most often happens when you're checking or sending e-mail. These progress queues are shown in the previous figure. The Online/Offline indicator is here, too, in the lower left of the window.</para>
+    <para>The status bar periodically displays a message, or tells you the progress of a task. This most often happens when you're checking or sending email. These progress queues are shown in the previous figure. The Online/Offline indicator is here, too, in the lower left of the window.</para>
    </formalpara>
    <formalpara id="b17s9or8">
     <title>Preview Pane:</title>
-    <para>The preview pane displays the contents of the e-mail that is selected in the e-mail list.</para>
+    <para>The preview pane displays the contents of the email that is selected in the message list.</para>
    </formalpara>
 
    <section id="usage-mainwindow-menubar">
     <title>The Menu Bar</title>
-    <para>The menu bar's contents always provide all the possible actions for any given view of your data. If you're looking at your Inbox, most of the menu items relate to e-mail. Some content relates to other components of Evolution and some, especially in the File menu, relates to the application as a whole.</para>
+    <para>The menu bar's contents always provide all the possible actions for any given view of your data. If you're looking at your Inbox, most of the menu items relate to email. Some content relates to other components of Evolution and some, especially in the File menu, relates to the application as a whole.</para>
     <formalpara id="bs7g1fu">
      <title>File:</title>
      <para>Anything related to a file or to the operations of the application is listed in this menu, such as creating things, saving them to disk, printing them, and quitting the program itself.</para>
@@ -822,8 +824,8 @@
    <section id="usage-mainwindow-shortcutbar">
     <title>The Sidebar</title>
     <para>Sidebar is the vertical panel on the left side of the Evolution main window. At the bottom of the sidebar is the Switcher, that lets you switch between the Evolution tools like Mail, Memo,Tasks and Contacts. Above the Switcher you can see a list of folders for the current Evolution tool.</para>
-    <para>The folder list organizes your e-mail, calendars, contact lists, and task lists in a tree, similar to a <link linkend="filetree">file tree</link>. Most people find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one folder, called On This Computer, for local information. For example, the folder list for the e-mail tool shows any remote e-mail storage you have set up, plus local folders and search folders, which are discussed in <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>.</para>
-    <para>If you get large amounts of e-mail, you might want more folders than just your Inbox. You can create multiple calendar, task, or contacts folders.</para>
+    <para>The folder list organizes your email, calendars, address books, task lists and memo lists in a tree, similar to a <link linkend="filetree">file tree</link>. Most people find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one folder, called On This Computer, for local information. For example, the folder list for the email tool shows any remote email storage you have set up, plus local folders and search folders, which are discussed in <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>.</para>
+    <para>If you get large amounts of email, you might want more folders than just your Inbox. You can create multiple calendar, task, or contacts folders.</para>
     <para>To create a new folder:</para>
     <orderedlist>
      <listitem id="bs7fael">
@@ -842,7 +844,7 @@
 
     <section id="b17s9pb0">
      <title>Changing Switcher Appearance:</title>
-     <para>To change the appearance of  your switcher click <emphasis>View &gt; Switcher Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can select:</para>
+     <para>To change the appearance of your switcher click <emphasis>View &gt; Switcher Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can select:</para>
      <formalpara id="b13cep2o">
       <title>Icons and Text:</title>
       <para>Displays buttons with the label and the icon corresponding to it.</para>
@@ -901,41 +903,41 @@
       <para>Checks the number of total and unread messages in a folder, and, for remote folders, lets you select whether to copy the folder to your local system for offline operation.</para>
      </formalpara>
      <para>You can also rearrange folders and messages by dragging and dropping them.</para>
-     <para>Any time new e-mail arrives in a e-mail folder, that folder label is displayed in bold text, along with the number of new messages in that folder.</para>
+     <para>Any time new email arrives in a email folder, that folder label is displayed in bold text, along with the number of new messages in that folder.</para>
     </section>
    </section>
 
    <section id="basics-mail">
-    <title>E-Mail</title>
-    <para>Evolution e-mail is like other e-mail programs in several ways:</para>
+    <title>Email</title>
+    <para>Evolution email is like other email programs in several ways:</para>
     <itemizedlist>
      <listitem>
-      <para>It can send and receive e-mail in HTML or as plain text, and makes it easy to send and receive multiple file attachments. </para>
+      <para>It can send and receive email in HTML or as plain text, and makes it easy to send and receive multiple file attachments.</para>
      </listitem>
      <listitem>
-      <para>It supports multiple e-mail sources, including <link linkend="imap">IMAP</link>, <link linkend="pop">POP3</link>, and local mbox or mh spools and files created by other e-mail programs.</para>
+      <para>It supports multiple email sources, including <link linkend="imap">IMAP</link>, <link linkend="pop">POP3</link>, and local mbox or mh spools and files created by other email programs.</para>
      </listitem>
      <listitem>
-      <para>It can sort and organize your e-mail in a wide variety of ways with folders, searches, and filters.</para>
+      <para>It can sort and organize your email in a wide variety of ways with folders, searches, and filters.</para>
      </listitem>
      <listitem>
       <para>It lets you guard your privacy with encryption.</para>
      </listitem>
     </itemizedlist>
-    <para>However, Evolution has some important differences from other e-mail programs. First, It is built to handle very large amounts of e-mail. The <link linkend="usage-mail-organize-spam">junk e-mail</link>, message <link linkend="usage-mail-organize-filters">filtering</link> and <link linkend="usage-mail-organize-search">searching</link> functions were built for speed and efficiency. There's also the <link linkend="usage-mail-organize-vfolders">search folder</link>, an advanced organizational feature not found in some e-mail clients. If you get a lot of e-mail, or if you keep every message you get in case you need to refer to it later, you'll find this feature especially useful. Here's a quick explanation of what's happening in your main Evolution e-mail window.</para>
+    <para>However, Evolution has some important differences from other email programs. First, It is built to handle very large amounts of email. The <link linkend="usage-mail-organize-spam">junk email</link>, message <link linkend="usage-mail-organize-filters">filtering</link> and <link linkend="usage-mail-organize-search">searching</link> functions were built for speed and efficiency. There's also the <link linkend="usage-mail-organize-vfolders">search folder</link>, an advanced organizational feature not found in some email clients. If you get a lot of email, or if you keep every message you get in case you need to refer to it later, you will find this feature especially useful. Here's a quick explanation of what's happening in your main Evolution email window.</para>
     <mediaobject id="b159qi3q"><imageobject><imagedata format="PNG" fileref="figures/evo_mail_a.png"/></imageobject></mediaobject>
     <formalpara id="b17sa4um">
      <title>Message List:</title>
-     <para>The message list displays all the messages that you have. This includes all your read and unread messages, and e-mail that is flagged to be deleted.</para>
+     <para>The message list displays all the messages that you have. This includes all your read and unread messages, and email that is flagged to be deleted.</para>
     </formalpara>
     <formalpara id="b17sa500">
      <title>Preview Pane:</title>
-     <para>This is where your e-mail is displayed.</para>
+     <para>The preview pane displays the message that is currently chosen in the message list.</para>
     </formalpara>
     <para>If you find the preview pane too small, you can resize the pane, enlarge the whole window, or double-click the message in the message list to have it open in a new window. To change the size of a pane, drag the divider between the two panes.</para>
     <para>As with folders, you can right-click messages in the message list and get a menu of possible actions, including moving or deleting them, creating filters or search folders based on them, and marking them as junk mail.</para>
-    <para>Most of the e-mail-related actions you want to perform are listed in the Message Menu and Folder Menu in the menu bar. The most frequently used ones, like Reply and Forward, also appear as buttons in the toolbar. Most of them are also located in the right-click menu and as keyboard shortcuts.</para>
-    <para>For an in-depth guide to the e-mail capabilities of Evolution, read <link linkend="usage-mail">Sending and Receiving E-Mail</link>.</para>
+    <para>Most of the email-related actions you want to perform are listed in the Message Menu and Folder Menu in the menu bar. The most frequently used ones, like Reply and Forward, also appear as buttons in the toolbar. Most of them are also located in the right-click menu and as keyboard shortcuts.</para>
+    <para>For an in-depth guide to the email capabilities of Evolution, read <link linkend="usage-mail">Sending and Receiving Email</link>.</para>
    </section>
 
    <section id="basics-calendar">
@@ -952,7 +954,7 @@
     </formalpara>
     <formalpara id="b17sa5qs">
      <title>Task List:</title>
-     <para>Tasks are distinct from appointments because they generally don't have times associated with them. You can see a larger view of your task list by clicking Tasks in the switcher.</para>
+     <para>Tasks are distinct from appointments because they generally don't have times associated with them. You can use the list in a larger window by clicking the Tasks button in the side bar.</para>
     </formalpara>
     <para>For more information about the calendar, see <link linkend="usage-calendar">Evolution Calendar</link>.</para>
    </section>
@@ -962,9 +964,9 @@
     <para>The Evolution contacts can handle all of the functions of an address book or phone book. However, it is easier to update Evolution than it is to change an actual paper book, in part because Evolution can synchronize with Palm OS&z-3rdParty; devices and use <link linkend="ldap">LDAP</link> directories on a network.</para>
     <para>To use the contacts tool, click Contacts in the switcher. By default, the display shows all your contacts in alphabetical order, in a minicard view. You can select other views from the View menu, and adjust the width of the columns by clicking and dragging the gray column dividers.</para>
     <mediaobject id="usage-contact-fig"><imageobject><imagedata format="PNG" fileref="figures/contacts_mainwindow_a.png"/></imageobject></mediaobject>
-    <para>Another advantage of the Evolution contacts is its integration with the rest of the application. For example, you can right-click an e-mail address in Evolution mail to instantly create a contact entry.</para>
+    <para>Another advantage of the Evolution contacts is its integration with the rest of the application. For example, you can right-click an email address in Evolution mail to instantly create a contact entry.</para>
     <para><emphasis>Contact List</emphasis></para>
-    <para>The largest section of the contacts display shows a list of individual contacts. You can also search the contacts in the same way that you search e-mail folders, using the search tool on the right side of the toolbar.</para>
+    <para>The largest section of the contacts display shows a list of individual contacts. You can also search the contacts in the same way that you search email folders, using the search tool on the right side of the toolbar.</para>
     <para>For detailed instructions on how to use the address book, read <link linkend="usage-contact">Evolution Contacts: the Address Book</link>.</para>
    </section>
   </section>
@@ -996,7 +998,7 @@
     <para>This feature restores your settings from the archive.</para>
     <orderedlist>
      <listitem id="b17rbrfm">
-      <para>Select File &gt; Restore Settings to open the available evolution.tar.gz files</para>
+      <para>Select File &gt; Restore Settings to open the available evolution.tar.gz files.</para>
      </listitem>
      <listitem id="b17rbry6">
       <para>Select the evolution.tar.gz and click Save.</para>
@@ -1019,7 +1021,8 @@
   </section>
   <section id="bsekq8r">
    <title>Command Line Options</title>
-   <para>Evolution has a number of command line options that you can use. You can find the full list by entering the command <command>man evolution</command> or <command>evolution --help</command>. The most important command line options are:</para>
+   <para>Evolution has a number of command line options that you can use. For more information about command line options, open a terminal window and type <command>evolution --help</command>.</para>
+   <para>The most important command line options are:</para>
    <informaltable>
     <tgroup cols="2">
      <colspec colwidth="2.844*" colname="1" colnum="1"/>
@@ -1049,7 +1052,7 @@
        </entry>
        <entry colname="2">
         <para>Disables all the preview panes when you launch Evolution.</para>
-        <para>It lets Evolution not to open the last crashed message, task or contact when you restart Evolution. Thus, it  provides a way to avoid system crash caused by previewing message, task or contact. </para>
+        <para>It lets Evolution not to open the last crashed message, task or contact when you restart Evolution. Thus, it provides a way to avoid system crash caused by previewing message, task or contact.</para>
        </entry>
       </row>
       <row id="bsl8i03">
@@ -1057,7 +1060,7 @@
         <para>evolution mailto:<varname>joe@somewhere.net</varname></para>
        </entry>
        <entry colname="2">
-        <para>Starts Evolution and begins composing a message to the e-mail address listed.</para>
+        <para>Starts Evolution and begins composing a message to the email address listed.</para>
        </entry>
       </row>
       <row id="bsl8i04">
@@ -1097,7 +1100,7 @@
         <para>evolution <quote>%s</quote></para>
        </entry>
        <entry colname="2">
-        <para>Makes Evolution your default e-mail handler for your Web browser and in the GNOME&z-3rdParty; Control Center.</para>
+        <para>Makes Evolution your default email handler for your Web browser and in the GNOME&z-3rdParty; Control Center.</para>
        </entry>
       </row>
      </tbody>
@@ -1107,14 +1110,14 @@
  </chapter>
 
  <chapter id="usage-mail">
-  <title>Sending and Receiving E-Mail</title>
-  <para>This section, and <link linkend="usage-mail-organize">Organizing Your E-Mail</link>, provide you with an in-depth guide to the capabilities of <trademark>Evolution</trademark> as a mail client. For information about how to customize your mail account, see <link linkend="config-prefs-mail">Mail Preferences</link>.</para>
+  <title>Sending and Receiving Email</title>
+  <para>This section, and <link linkend="usage-mail-organize">Organizing Your Email</link>, provide you with an in-depth guide to the capabilities of <trademark>Evolution</trademark> as a mail client. For information about how to customize your mail account, see <link linkend="config-prefs-mail">Mail Preferences</link>.</para>
   <itemizedlist>
    <listitem>
     <para><link linkend="usage-mail-getnsend-read">Reading Mail</link></para>
    </listitem>
    <listitem>
-    <para><link linkend="usage-mail-getnsend-send">Composing New E-Mail Messages</link></para>
+    <para><link linkend="usage-mail-getnsend-send">Composing New Email Messages</link></para>
    </listitem>
    <listitem>
     <para><link linkend="rsvp-stuff">Sending Invitations by Mail</link></para>
@@ -1131,8 +1134,8 @@
    <title>Reading Mail</title>
    <para>If you are not already viewing mail, switch to the mail tool by clicking the Mail shortcut button, or press Ctrl+1. To read a message, select it in the message list; if you'd like to see it in its own window, either double-click it, press Enter, or press Ctrl+O.</para>
    <tip>
-    <para>To read mail with the keyboard, you can click the Spacebar to page down and press Backspace to page up while reading an e-mail. Ensure that you use the keys when message list is enabled.</para>
-    <para>Navigate the message list by using the arrow keys on the keyboard. To go to the next and previous unread messages, press the period (.) or comma (,) keys. On most keyboards, these keys are also marked with the &gt; and &lt; symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (]) for the next unread message, and the left square bracket ([) for the previous unread message.</para>
+    <para>To read mail with the keyboard, you can click the Spacebar to page down and press Backspace to page up while reading an email. Ensure that you use the keys when the message list is enabled.</para>
+    <para>Navigate the message list by using the arrow keys on the keyboard. To go to the next and previous unread messages, press the period (.) or comma (,) keys. On some keyboards, these keys are also marked with the &gt; and &lt; symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (]) for the next unread message, and the left square bracket ([) for the previous unread message.</para>
    </tip>
 
    <section id="b17rgdac">
@@ -1141,7 +1144,10 @@
     <para>To enable Magic Spacebar:</para>
     <orderedlist>
      <listitem id="b1axmc7p">
-      <para>Click Edit &gt; Preferences &gt; Mail Preferences and select the Enable Magic Spacebar check box.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
+     </listitem>
+     <listitem id="b1axmc7q">
+      <para>Select the Enable Magic Spacebar check box.</para>
      </listitem>
     </orderedlist>
     <para>When you are in the Mail view, the Spacebar has the following behavior:</para>
@@ -1150,13 +1156,13 @@
       <para>When you press the Spacebar for the first time, it takes you to the next unread message.</para>
      </listitem>
      <listitem>
-      <para>If the message is more than one screen long, the apacebar works as Page Down key.</para>
+      <para>If the message is more than one screen long, the Spacebar works as Page Down key.</para>
      </listitem>
      <listitem>
       <para>If you press the Spacebar after you reach the bottom of the page, it takes you to the next unread message.</para>
      </listitem>
      <listitem>
-      <para>If there are no more unread messages in the mailbox,  pressing the Spacebar takes you to the next unread message in the next folder.</para>
+      <para>If there are no more unread messages in the mailbox, pressing the Spacebar takes you to the next unread message in the next folder.</para>
      </listitem>
      <listitem>
       <para>If new messages arrive in a number of folders, the Spacebar toggles between those folders. This feature allows you to switch to the next unread message in a different folder without clicking the folder.</para>
@@ -1166,20 +1172,20 @@
 
    <section id="b13qb7i4">
     <title>Checking for New Mail</title>
-    <para>To check your mail, click Send/Receive in the toolbar. If you haven&apos;t created any mail accounts yet, the setup assistant asks you for the information it needs to check your e-mail. For information on creating mail accounts, see <link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link>.</para>
-    <para>If this is your first time checking mail, or you haven&apos;t asked Evolution to store your password, you are prompted for the password. Enter your password to download your e-mail.</para>
+    <para>To check your mail, click Send/Receive in the toolbar. If you haven&apos;t created any mail accounts yet, the setup assistant asks you for the information it needs to check your email. For information on creating mail accounts, see <link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link>.</para>
+    <para>If this is your first time checking mail, or you haven&apos;t asked Evolution to store your password, you are prompted for the password. Enter your password to download your email.</para>
     <para>If you get an error message instead of mail, you probably need to check your network settings. To learn how to do that, see <link linkend="mail-prefs-headers">Mail Header Preferences</link>, or ask your system administrator.</para>
    </section>
 
    <section id="b17qh4uo">
     <title>New Mail Notification</title>
-    <para>Evolution notifies you of new e-mail. When you receive a new mail in your inbox,  a blinking icon appears on the Switcher.</para>
+    <para>Evolution notifies you of new email. When you receive a new mail in your inbox, a blinking icon appears on the Switcher.</para>
     <mediaobject id="b1a5asi6"><imageobject><imagedata format="PNG" fileref="figures/evo_newmail.png"/></imageobject></mediaobject>
-    <para>You can also view a blinking icon <inlinegraphic format="PNG" fileref="figures/evo_blink.png"/>  in the notification area that disappears when you open the new e-mail. Mouse over the <inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> icon to view the notification message.</para>
+    <para>You can also see a blinking icon <inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> in the notification area that disappears when you open the new email. You can keep the mouse over the <inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> icon to view the notification message.</para>
    </section>
 
    <section id="b131ni8g">
-    <title>Vertical View Versus Classical View</title>      
+    <title>Vertical View Versus Classical View</title>
     <para>Evolution provides you vertical view in addition to the classical view. In the vertical view, message preview pane is located at the right side of the message list when compared to the Classical view where the message preview pane is placed below the message list. Vertical View enables you to use the extra width of the wide screen monitors.</para>
     <formalpara id="b131nl11">
      <title>Vertical View:</title>
@@ -1190,7 +1196,7 @@
       <para>Click View &gt; Preview &gt; Vertical View</para>
      </listitem>
     </orderedlist>
-    <para>In Vertical view, default message list contains a double line compressed headers, which enables you to consume the extra width in the preview column.The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</para>
+    <para>In Vertical view, default message list contains a double line compressed headers, which enables you to consume the extra width in the preview column. The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</para>
     <mediaobject id="b159qju3"><imageobject><imagedata format="PNG" fileref="figures/ver_view_a.png"/></imageobject></mediaobject>
     <formalpara id="b131nkqr">
      <title>Classical View:</title>
@@ -1210,30 +1216,32 @@
     <para>Use the following procedure to set the limit of addresses to be displayed:</para>
     <orderedlist>
      <listitem id="b131onkl">
-      <para>Click Edit &gt; Preferences</para>
+      <para>Select Edit &gt; Preferences.</para>
      </listitem>
      <listitem id="b131onsx">
-      <para>Select Mail Preferences</para>
+      <para>Select Mail Preferences.</para>
      </listitem>
      <listitem id="b131onvr">
-      <para>Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the address</para>
+      <para>Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the address.</para>
      </listitem>
      <listitem id="b131oo0c">
       <para>Enter the limit in the field.</para>
      </listitem>
     </orderedlist>
-    <para>You can expand the message headers by click the  <inlinegraphic format="PNG" fileref="figures/plus.png"/> icon or the <guilabel>...</guilabel> in the message preview pane. To collapse click  <inlinegraphic format="PNG" fileref="figures/minus.png"/> icon in the  preview pane.</para>
+    <para>You can expand the message headers by clicking the <inlinegraphic format="PNG" fileref="figures/plus.png"/> icon or the <guilabel>...</guilabel> in the message preview pane. To collapse click <inlinegraphic format="PNG" fileref="figures/minus.png"/> icon in the  preview pane.</para>
    </section>
 
    <section id="bsempjs">
     <title>Sharing Mailboxes with Other Mail Programs</title>
-    <para>If you want to use Evolution and another e-mail client, such as Mutt, at the same time, use the following procedure:</para>
+    <para>If you want to use Evolution and another email client, such as Mutt, at the same time, use the following procedure:</para>
     <orderedlist>
      <listitem id="bsen3rq">
       <para>Download your mail in the other application as you would normally.</para>
      </listitem>
      <listitem id="bsen3u8">
-      <para>In Evolution, click Edit &gt; Preferences, then click Mail Accounts. Select the account you want to use to share mail and click Edit. Instead of Edit, you might want to create a new account just for this source of mail by clicking New.</para>
+      <para>In Evolution:</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
+      <para>Select the account you want to use to share mail and click Edit. Instead of Edit, you might want to create a new account just for this source of mail by clicking New.</para>
      </listitem>
      <listitem id="bsen3wh">
       <para>Under the Receiving Mail tab, select the type of mail file that your other mail application uses, then specify the full path to that location. A typical choice would be mbox files, with the path /home/<varname>username</varname>/Mail/.</para>
@@ -1251,12 +1259,15 @@
 
     <section id="usage-mail-getnsend-get-attach-actions">
      <title>Saving or Opening Attachments</title>
-     <para>If you get an e-mail message with an attachment, Evolution can help you save the attachment or open it with the appropriate applications.</para>
+     <para>If you get an email message with an attachment, Evolution can help you save the attachment or open it with the appropriate applications.</para>
      <para>Evolution shows a right-arrow icon, the number of attachments, and a Save or Save All button to save all the attachments. Click the right-arrow icon to show the attachment bar.</para>
      <para>To save an attachment to disk:</para>
      <orderedlist>
       <listitem id="bsen45z">
-       <para>Click the down-arrow on the attachment icon, or right-click the attachment icon in the attachment bar, then click Save As.</para>
+       <para>Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar.</para> 
+      </listitem>
+      <listitem id="bsen45d">
+       <para>Click Save As.</para>
       </listitem>
       <listitem id="bsen4bg">
        <para>Select a location and name for the file.</para>
@@ -1283,7 +1294,7 @@
     <section id="usage-mail-getnsend-get-attach-html">
      <title>Inline Images in HTML Mail</title>
      <para>When someone sends you HTML mail that includes an image in the body of the message (for example, the welcome message in your Inbox), Evolution displays the image inside the message. You can create messages like this by using the Insert Image tool in the message composer. Alternately, just drag an image into the message composition area.</para>
-     <para>Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely Servered images can be slow to load and display, and can even be used by spammers to track who reads the e-mail. Not automatically loading images helps protect your privacy.</para>
+     <para>Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely servered images can be slow to load and display, and can even be used by spammers to track who reads the email. Not automatically loading images helps protect your privacy.</para>
      <para>To load the images for one message:</para>
      <orderedlist>
       <listitem id="bsen9jh">
@@ -1293,7 +1304,7 @@
      <para>To set the default action for loading images:</para>
      <orderedlist>
       <listitem id="bsenabn">
-       <para>Click Edit &gt; Preferences, then click Mail Preferences.</para>
+       <para>Select Edit &gt; Preferences, then select Mail Preferences.</para>
       </listitem>
       <listitem id="bsenajw">
        <para>Click the HTML Mail tab.</para>
@@ -1340,8 +1351,8 @@
 
    <section id="usage-mail-getnsend-get-news">
     <title>Using Evolution for News</title>
-    <para>USENET newsgroups are similar to mail, so it is often convenient to read news and mail side by side. You can add a news source, called an NNTP server, the same way you would add <link linkend="bse54o0">new e-mail account</link>, selecting USENET News as the source type. The news server appear as a remote mail server, and each news group works like an IMAP folder. When you click Send/Receive, Evolution also checks for news messages.</para>
-    <para>When you create a news group account, you are not subscribed to any groups. To subscribe to a news group:</para>
+    <para>USENET newsgroups are similar to mail, so it is often convenient to read news and mail side by side. You can add a news source, called an NNTP server, the same way you would add <link linkend="bse54o0">new email account</link>, selecting USENET News as the Server type. The news server appear as a remote mail server, and each newsgroup works like an IMAP folder. When you click Send/Receive, Evolution also checks for news messages.</para>
+    <para>When you create a newsgroup account, you are not subscribed to any groups. To subscribe to a newsgroup:</para>
     <orderedlist>
      <listitem id="bsx1euy">
       <para>Click Folder &gt; Subscriptions.</para>
@@ -1358,23 +1369,23 @@
    <section id="usage-mail-getnsend-delete">
     <title>Deleting Mail</title>
     <para>Evolution allows you to delete unwanted messages. To delete a message, select it and press the Delete key, or click the delete tool in the toolbar, press Ctrl+D, or right-click the message, then click Delete.</para>
-    <para>When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. Your e-mail is recoverable until you have expunged your mail. When you expunge a folder, you remove all the mail that you have marked for deletion.To show deleted messages, uncheck Hide Deleted Messages option from the View menu. You can view the messages striken off for later deletion. You can also find deleted messages in your Trash folder.</para>
+    <para>When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. Your email is recoverable until you have expunged your mail. When you expunge a folder, you remove all the mail that you have marked for deletion.To show deleted messages, uncheck Hide Deleted Messages option from the View menu. You can view the messages striken off for later deletion. You can also find deleted messages in your Trash folder.</para>
     <para>To permanently erase all the deleted messages in a folder, click Folder &gt; Expunge or press Ctrl+E.</para>
-    <para>Trash folders in GroupWise, local and IMAP accounts are actually virtual search folders that display all messages you have marked for later deletion. Hence, emptying Trash is nothing but expunging deleted mails from all your folders in the account.</para>
+    <para>Trash folders in GroupWise, local and IMAP accounts are actually virtual search folders that display all messages you have marked for later deletion. Hence, emptying Trash is nothing but expunging deleted mail from all your folders in the account.</para>
     <para>However, this is not true for the Trash folder on Exchange servers, which behaves just the same as it does in Outlook. It is a normal folder with actual messages in it. For more information about search folders, see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>.</para>
    </section>
 
    <section id="usage-mail-getnsend-undelete">
     <title>Undeleting Messages</title>
-    <para>You can undelete a message that has been deleted but not expunged. To undelete a message, select the message, click Edit &gt; Undelete.</para>
+    <para>You can undelete a message that has been deleted but not expunged. To undelete a message, select the message, click Edit &gt; Undelete. Note that View &gt; Hide Deleted messages in the menubar must be disabled for this.</para>
     <para>If you have marked a message for deletion, undeleting it unmarks it, and the message is removed from the Trash folder.</para>
    </section>
   </section>
 
   <section id="usage-mail-getnsend-send">
-   <title>Composing New E-Mail Messages</title>
-   <para>You can start writing a new e-mail message by clicking File &gt; New &gt; Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking New in the toolbar.</para>
-   <para>Enter an address in the To field. If you want to enter multiple email addresses, type in the addresses separated by comma. You can also use contact list to send messages to multiple recipients.Enter a subject in the Subject field, and a message in the box at the bottom of the window. After you have written your message, click Send.</para>
+   <title>Composing New Email Messages</title>
+   <para>You can start writing a new email message by clicking File &gt; New &gt; Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking New in the toolbar.</para>
+   <para>Enter an address in the To field. If you want to enter multiple email addresses, type in the addresses separated by comma. You can also use a contact list to send messages to multiple recipients. Enter a subject in the Subject field, and a message in the box at the bottom of the window. After you have written your message, click Send.</para>
    <para>New mail message window look like this:</para>
    <mediaobject id="usage-mail-newmsg-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_newmess_a.png"/></imageobject></mediaobject>
    <para>This section contains the following topics:</para>
@@ -1392,19 +1403,19 @@
      <para><link linkend="usage-mail-getnsend-send-compose">Attachments</link></para>
     </listitem>
     <listitem>
-     <para><link linkend="usage-mail-getnsend-send-to-types">Specifying Additional Recipients for E-Mail</link></para>
+     <para><link linkend="usage-mail-getnsend-send-to-types">Specifying Additional Recipients for Email</link></para>
     </listitem>
     <listitem>
      <para><link linkend="usage-mail-getnsend-send-to">Choosing Recipients Quickly</link></para>
     </listitem>
     <listitem>
-     <para><link linkend="usage-mail-getnsend-send-reply">Replying to E-Mail Messages</link></para>
+     <para><link linkend="usage-mail-getnsend-send-reply">Replying to Email Messages</link></para>
     </listitem>
     <listitem>
      <para><link linkend="usage-mail-getnsend-send-find">Searching and Replacing with the Composer</link></para>
     </listitem>
     <listitem>
-     <para><link linkend="usage-mail-getnsend-send-html">Enhancing Your E-Mail with HTML</link></para>
+     <para><link linkend="usage-mail-getnsend-send-html">Enhancing Your Email with HTML</link></para>
     </listitem>
     <listitem>
      <para><link linkend="BJEHCDFA">Mail Send Options</link></para>
@@ -1413,7 +1424,7 @@
      <para><link linkend="usage-mail-getnsend-fwd">Forwarding Mail</link></para>
     </listitem>
     <listitem>
-     <para><link linkend="usage-mail-getnsend-ettiquette">Tips for E-Mail Courtesy</link></para>
+     <para><link linkend="usage-mail-getnsend-ettiquette">Tips for Email Courtesy</link></para>
     </listitem>
    </itemizedlist>
 
@@ -1425,7 +1436,7 @@
     <section id="bsfnqkj">
      <title>Using Character Sets</title>
      <para>A character set is a computer's version of an alphabet. In the past, the ASCII character set was used almost universally. However, it contains only 128 characters, meaning it is unable to display characters in Cyrillic, Kanjii, or other non-Latin alphabets. To work around language display problems, programmers developed a variety of methods, so many human languages now have their own specific character sets, and items written in other character sets display incorrectly. Eventually, standards organizations developed the UTF-8 Unicode&z-3rdParty; character set to provide a single compatible set of codes for everyone.</para>
-     <para>Most e-mail messages state in advance which character set they use, so Evolution usually knows what to display for a given binary number. However, if you find that messages are displayed as rows of incomprehensible characters, try selecting a different character set in the mail settings screen. If your recipients can't read your messages, try selecting a different character set in the composer options dialog box. For some languages, such as Turkish or Korean, it might work best for you to select the language-specific character set. However, the best choice for most users is UTF-8, which offers the widest range of characters for the widest range of languages.</para>
+     <para>Most email messages state in advance which character set they use, so Evolution usually can display those messages correctly. However, if you find that messages are displayed as rows of incomprehensible characters, try selecting a different character set in the mail settings screen. If your recipients can't read your messages, try selecting a different character set in the composer options dialog box. For some languages, such as Turkish or Korean, it might work best for you to select the language-specific character set. However, the best choice for most users is UTF-8, which offers the widest range of characters for the widest range of languages.</para>
     </section>
    </section>
 
@@ -1447,7 +1458,7 @@
 
    <section id="usage-mail-getnsend-offline">
     <title>Working Offline</title>
-    <para>Offline mode help you communicate with remote mail storage systems like <trademark class="registered">GroupWise</trademark>, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect.</para>
+    <para>Offline mode helps you communicate with remote mail storage systems like <trademark class="registered">GroupWise</trademark>, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect.</para>
     <para>POP mail downloads all messages to your local system, but other connections usually download just the headers, and get the rest only when you want to read the message. Before you go offline, Evolution downloads the unread messages from the folders you have chosen to store.</para>
     <para>To mark a folder for offline use,</para>
     <orderedlist>
@@ -1500,7 +1511,7 @@
 
    <section id="usage-mail-getnsend-send-compose">
     <title>Attachments</title>
-    <para>To attach a file to your e-mail:</para>
+    <para>To attach a file to your email:</para>
     <orderedlist>
      <listitem id="bsfnwxr">
       <para>Click the Attach icon in the composer toolbar.</para>
@@ -1512,13 +1523,13 @@
       <para>Click OK.</para>
      </listitem>
     </orderedlist>
-    <para>You can also drag a file into the composer window. If you want to send it as an inline attachment, right-click the attachment and click Properties, then select Automatic Display of Attachments.</para>
+    <para>You can also drag a file to the attachment bar of the composer window. If you want to send it as an inline attachment, right-click the attachment and click Properties, then select Automatic Display of Attachments.</para>
     <para>When you send the message, a copy of the attached file goes with it. Be aware that large attachments can take a long time to send and receive.</para>
    </section>
    <section id="b17rcxmf">
     <title>Attachment Reminder:</title>
-    <para>Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an e-mail. If it determines that you have not attached the file, it displays the following message:</para>
-    <mediaobject id="b17rcrvr"><imageobject><imagedata format="PNG" fileref="figures/attach_reminder_a.png.png"/></imageobject></mediaobject>
+    <para>Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an email. If it determines that you have not attached the file, it displays the following message:</para>
+    <mediaobject id="b17rcrvr"><imageobject><imagedata format="PNG" fileref="figures/attach_reminder_a.png"/></imageobject></mediaobject>
     <orderedlist>
      <listitem id="b17rctav">
       <para>Click Continue Editing to attach the missing file, or click Send to send the message without any attachment.</para>
@@ -1541,16 +1552,16 @@
       <para>To edit any of the existing keywords, select the keyword, click Edit, then modify the word as desired.</para>
      </listitem>
      <listitem id="b1a57zh4">
-      <para>When you have finished making your selections, click Close to exit the Plugin Manager.</para>
+      <para>Click Close.</para>
      </listitem>
     </orderedlist>
    </section>
    <section id="usage-mail-getnsend-send-to-types">
-    <title>Specifying Additional Recipients for E-Mail</title>
-    <para><trademark>Evolution</trademark>, like most e-mail programs, recognizes three types of addressee: primary recipients, secondary recipients, and hidden (blind) recipients. The simplest way to direct a message is to put the e-mail address or addresses in the To: field, which denotes primary recipients. Use the Cc: field to send a message to secondary recipients.</para>
+    <title>Specifying Additional Recipients for Email</title>
+    <para><trademark>Evolution</trademark>, like most email programs, recognizes three types of addresses: primary recipients, secondary recipients, and hidden (blind) recipients. The simplest way to direct a message is to put the email address or addresses in the To: field, which denotes primary recipients. Use the Cc: field to send a message to secondary recipients.</para>
     <para>Addresses on the Bcc: list are hidden from the other recipients of the message. You can use it to send mail to large groups of people, especially if they don't know each other or if privacy is a concern. If your Bcc: field is absent, click View &gt; Bcc Field.</para>
-    <para>If you frequently write e-mail to the same groups of people, you can create address lists in the contacts tool, and then send them mail as though they have a single address. To learn how to do that, see <link linkend="usage-contact-organize-group-list">Creating a List of Contacts</link>.</para>
-    <para>Evolution has the ability to let you specify the Reply-To in an e-mail. Using this, you can set up a special Reply-To for an e-mail.To do this:</para>
+    <para>If you frequently write email to the same groups of people, you can create address lists in the contacts tool, and then send them mail as though they have a single address. To learn how to do that, see <link linkend="usage-contact-organize-group-list">Creating a List of Contacts</link>.</para>
+    <para>Evolution has the ability to let you specify the Reply-To in an email. Using this, you can set up a special Reply-To for an email. To do this:</para>
     <orderedlist>
      <listitem id="bsfnz55">
       <para>Open a compose window.</para>
@@ -1572,20 +1583,20 @@
 
    <section id="usage-mail-getnsend-send-to">
     <title>Choosing Recipients Quickly</title>
-    <para>Address auto completion is by default enabled in Evolution when you create contacts.Evolution makes it easy for you to quickly fill in the address field without having to remember the email address of recipients. You can type nicknames or other portions of address data in the address field and Evolution will display a drop-down list of possible address completions from your contacts. If you type a name or nickname that can go with more than one card, Evolution opens a dialog box to ask you which person you meant.</para>
-    <para>If Evolution does not complete addresses automatically, click Edit &gt; Preferences, then click Autocompletion. There, select the groups of contacts you want to use for address autocompletion in the mailer.</para>
-    <para>Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of the e-mail addresses in your contacts. Select addresses and click the arrows to move them into the appropriate address columns.</para>
-    <para>For more information about using e-mail with the contact manager and the calendar, see <link linkend="contact-automation-basic">Send Me a Card: Adding New Cards Quickly</link> and <link linkend="usage-calendar-apts">Scheduling With the Evolution Calendar</link>.</para>
+    <para>Address auto completion is by default enabled in Evolution when you create contacts. Evolution makes it easy for you to quickly fill in the address field without having to remember the email address of recipients. You can type nicknames or other portions of address data in the address field and Evolution will display a drop-down list of possible address completions from your contacts. If you type a name or nickname that can go with more than one card, Evolution opens a dialog box to ask you which person you meant.</para>
+    <para>If Evolution does not complete addresses automatically, click Edit &gt; Preferences, then click Autocompletion. There, select the address book you want to use for address autocompletion in the mailer.</para>
+    <para>Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of the email addresses in your contacts. Select addresses and click the arrows to move them into the appropriate address columns.</para>
+    <para>For more information about using email with the contact manager and the calendar, see <link linkend="contact-automation-basic">Send Me a Card: Adding New Cards Quickly</link> and <link linkend="usage-calendar-apts">Scheduling With the Evolution Calendar</link>.</para>
    </section>
 
    <section id="usage-mail-getnsend-send-reply">
-    <title>Replying to E-Mail Messages</title>
-    <para>To reply to a message, click the message to reply to in the e-mail list and click Reply, or right-click within the message and select Reply to Sender. This opens the message composer. The To: and Subject: fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the &gt; character before each line (in plain text mode), to indicate that it is part of the previous message.</para>
+    <title>Replying to Email Messages</title>
+    <para>To reply to a message, click the message to reply to in the message list and click the Reply button in the toolbar, or right-click within the message and select Reply to Sender. This opens the message composer. The To: and Subject: fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the &gt; character before each line (in plain text mode), to indicate that it is part of the previous message.</para>
     <para>If you're reading a message with several recipients, you can use Reply to All instead of Reply. If there are large numbers of people in the Cc: or To: fields, this can save substantial amounts of time.</para>
 
     <section id="bsfo4jl">
      <title>Using the Reply To All Feature</title>
-     <para>Susan sends an e-mail to a client and sends copies to Tim and to an internal company mailing list of co-workers. If Tim wants to make a comment for all of them to read, he uses Reply to All, but if he just wants to tell Susan that he agrees with her, he uses Reply. His reply does not reach anyone that Susan put on her Bcc list, because that list is not shared with anyone.</para>
+     <para>Susan sends an email to a client and sends copies to Tim and to an internal company mailing list of co-workers. If Tim wants to make a comment for all of them to read, he uses Reply to All, but if he just wants to tell Susan that he agrees with her, he uses Reply. His reply does not reach anyone that Susan put on her Bcc list, because that list is not shared with anyone.</para>
      <para>If you subscribe to a mailing list, and want your reply to go just to the list, rather than to the sender, select Reply to List instead of Reply or Reply to All.</para>
     </section>
 
@@ -1667,13 +1678,13 @@
    </section>
 
    <section id="usage-mail-getnsend-send-html">
-    <title>Enhancing Your E-Mail with HTML</title>
-    <para>Normally, you can't set text styles or insert pictures in e-mail. However, most newer e-mail programs can display images and text styles in addition to basic alignment and paragraph formatting. They do this with <link linkend="html">HTML</link>, just like Web pages do.</para>
+    <title>Enhancing Your Email with HTML</title>
+    <para>Normally, you can't set text styles or insert pictures in email. However, most newer email programs can display images and text styles in addition to basic alignment and paragraph formatting. They do this with <link linkend="html">HTML</link>, just like Web pages do.</para>
     <para>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML.</para>
 
     <section id="bsait28">
      <title>Basic HTML Formatting</title>
-     <para>You can change the format of an e-mail message from plain text to HTML by choosing Format HTML.</para>
+     <para>You can change the format of an email message from plain text to HTML by choosing Format &gt; HTML from the menu bar.</para>
      <para>To send all your mail as HTML by default, set your mail format preferences in the mail configuration dialog box. See <link linkend="config-prefs-mail-composer">Composer Preferences</link> for more information.</para>
      <para>HTML formatting tools are located in the toolbar just above the space where you actually compose the message. They also appear in the Insert and Format menus.</para>
      <para>The icons in the toolbar are explained in <link linkend="tooltip">tool-tips</link>, which appear when you hold your mouse pointer over the buttons. The buttons fall into five categories:</para>
@@ -1684,7 +1695,7 @@
      <para>For instance, instead of using asterisks to mark a bulleted list, you can use the Bulleted List style from the style drop-down list. Evolution uses different bullet styles, and handles word wrap and multiple levels of indentation.</para>
      <formalpara id="bsai86c">
       <title>Text Styles:</title>
-      <para>Use these buttons to determine the way your e-mail looks. If you have text selected, the style applies to the selected text. If you do not have text selected, the style applies to whatever you type next.</para>
+      <para>Use these buttons to determine the way your email looks. If you have text selected, the style applies to the selected text. If you do not have text selected, the style applies to whatever you type next.</para>
      </formalpara>
      <informaltable>
       <tgroup cols="2">
@@ -1754,13 +1765,13 @@
      </formalpara>
      <formalpara id="bsaialx">
       <title>Color Selection:</title>
-      <para>At the far right is the color section tool, where a box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting Style Page.</para>
+      <para>At the far right is the color section tool, where a box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting Style &gt; Page Style.</para>
      </formalpara>
     </section>
 
     <section id="bsait29">
      <title>Advanced HTML Formatting</title>
-     <para>Under the Insert menu, there are several more items you can use to style your e-mail. To use these and other HTML formatting tools, make sure you have enabled HTML mode by using Format HTML.</para>
+     <para>Under the Insert menu, there are several more items you can use to style your email. To use these and other HTML formatting tools, make sure you have enabled HTML mode by using Format &gt; HTML from the menu bar.</para>
 
      <section id="bsait2a">
       <title>Inserting a Link</title>
@@ -1785,7 +1796,7 @@
       <title>Inserting an Image</title>
       <orderedlist>
        <listitem id="bsainv6">
-        <para>Click Image.</para>
+        <para>Click Insert &gt; Image in the menubar.</para>
        </listitem>
        <listitem id="bsaio4q">
         <para>Browse to and select the image file.</para>
@@ -1801,7 +1812,7 @@
       <para>You can insert a horizontal line into the text to help divide two sections:</para>
       <orderedlist>
        <listitem id="bsaiotf">
-        <para>Click Rule.</para>
+        <para>Click Insert &gt; Rule in the menubar.</para>
        </listitem>
        <listitem id="bsaioxz">
         <para>Select the width, size, and alignment.</para>
@@ -1820,7 +1831,7 @@
       <para>You can insert a table into the text:</para>
       <orderedlist>
        <listitem id="bsaiq2x">
-        <para>Click Table.</para>
+        <para>Click Insert &gt; Table in the menubar.</para>
        </listitem>
        <listitem id="bsaiq6r">
         <para>Select the number of rows and columns.</para>
@@ -1830,7 +1841,7 @@
        </listitem>
        <listitem id="bsaiqp8">
         <para>Select a background for the table.</para>
-        <para>To insert a picture for the background, click Browse and select the desired image.</para>
+        <para>To insert a picture for the background, click the filechooser button and select the desired image.</para>
        </listitem>
        <listitem id="bsaiqs5">
         <para>Click Close.</para>
@@ -1842,10 +1853,10 @@
 
    <section id="BJEHCDFA">
     <title>Mail Send Options</title>
-    <para>You can set the following options when sending mails in Evolution.</para>
+    <para>You can set the following options when sending mail in Evolution.</para>
     <formalpara id="b101lleg">
      <title>Read Receipts:</title>
-     <para>Evolution allows you to request a receipt for your sent messages to indicate when your message is being viewed by the recipient. Receipts are useful when sending e-mail that is time-sensitive. To request a receipt, click Insert &gt; Request Read Receipt in the composer window.</para>
+     <para>Evolution allows you to request a receipt for your sent messages to indicate when your message is being viewed by the recipient. Receipts are useful when sending email that is time-sensitive. To request a receipt, click Insert &gt; Request Read Receipt in the composer window.</para>
     </formalpara>
     <formalpara id="b101llei">
      <title>Prioritize Message:</title>
@@ -1863,10 +1874,10 @@
     <para>To change your default settings,</para>
     <orderedlist>
      <listitem id="b13uu17q">
-      <para>Select Edit &gt;Preferences to open Evolution Preferences window.</para>
+      <para>Select Edit &gt; Preferences.</para>
      </listitem>
      <listitem id="b13uu2g0">
-      <para>Select the mail account you want to change the default settings.</para>
+      <para>Select the mail account whose default settings you want to change.</para>
      </listitem>
      <listitem id="b13uu7dv">
       <para>Click Edit to open Account Editor window.</para>
@@ -1920,7 +1931,7 @@
 
    <section id="usage-mail-getnsend-fwd">
     <title>Forwarding Mail</title>
-    <para>When you receive an e-mail, you can forward it to other individuals or groups that might be interested. You can forward a message as an attachment to a new message (this is the default) or you can send it <link linkend="inline">in	line</link> as a quoted portion of the message you are sending. Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding. Remember to note from whom the message came, and whether you have removed or altered content.</para>
+    <para>When you receive an email, you can forward it to other individuals or groups that might be interested. You can forward a message as an attachment to a new message (this is the default) or you can send it <link linkend="inline">in	line</link> as a quoted portion of the message you are sending. Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding. Remember to note from whom the message came, and whether you have removed or altered content.</para>
     <para>To forward a message you are reading:</para>
     <orderedlist>
      <listitem id="b10fnnjq">
@@ -1932,14 +1943,15 @@
       <para>Select an addressee as you would when sending a new message; the subject is already entered, although you can alter it if you want.</para>
      </listitem>
      <listitem id="b10fnop8">
-      <para>Add your comments on the message in the composition frame, then click Send.</para>
+      <para>Add your comments on the message in the composition frame</para>
+      <para>Click Send.</para>
      </listitem>
     </orderedlist>
     <para>Attachments to a message you are forwarding are forwarded only when you send the original message as an attachment. Inline messages do not forward any attachments.</para>
    </section>
 
    <section id="usage-mail-getnsend-ettiquette">
-    <title>Tips for E-Mail Courtesy</title>
+    <title>Tips for Email Courtesy</title>
     <itemizedlist>
      <listitem>
       <para>Don't forward chain letters. If you must, watch out for hoaxes and urban legends, and make sure the message doesn't have multiple layers of greater-than signs, (&gt;) indicating multiple layers of careless in-line forwarding.</para>
@@ -1954,7 +1966,7 @@
       <para>Check your spelling and use complete sentences. By default, Evolution puts a red line beneath words it doesn't recognize, as you type them.</para>
      </listitem>
      <listitem>
-      <para>Don't send nasty e-mails (flames). If you get one, don't write back.</para>
+      <para>Don't send nasty emails (flames). If you get one, don't write back.</para>
      </listitem>
      <listitem>
       <para>When you reply or forward, include enough of the previous message to provide context.</para>
@@ -1968,8 +1980,8 @@
 
   <section id="rsvp-stuff">
    <title>Sending Invitations by Mail</title>
-   <para>If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution e-mail tool. The invitation card is sent as an attachment in iCal format.</para>
-   <para>To send an invitation in GroupWise, right click on the calendar item and click Forward as iCalendar.</para>
+   <para>If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution email tool. The invitation card is sent as an attachment in iCal format.</para>
+   <para>To send an invitation, right click on the calendar item and click Forward as iCalendar.</para>
    <para>When you receive an invitation, you have several options:</para>
    <formalpara id="bsaizt9">
     <title>Accept:</title>
@@ -1981,10 +1993,10 @@
    </formalpara>
    <formalpara id="bsaj06a">
     <title>Decline:</title>
-    <para>Indicates you are unable to attend the meeting. The meeting is not entered into your calendar when you click OK, although your response is sent to the meeting host if you have selected the RSVP option.</para>
+    <para>Indicates you are unable to attend the meeting. The meeting is not entered into your calendar when you click OK, although your response is sent to the meeting host if you have selected the Send reply to sender option.</para>
    </formalpara>
    <formalpara id="bsaj0dc">
-    <title>RSVP:</title>
+    <title>Send reply to sender:</title>
     <para>Select this option if you want your response sent to the meeting organizers.</para>
    </formalpara>
   </section>
@@ -1997,7 +2009,7 @@
      <para>Select Folder &gt; Subscriptions.</para>
     </listitem>
     <listitem id="bsmqyid">
-     <para>If you have accounts on multiple IMAP servers, select the server where you want to manage your subscriptions. </para>
+     <para>If you have accounts on multiple IMAP servers, select the server where you want to manage your subscriptions.</para>
      <para>Evolution displays a list of available files and folders.</para>
     </listitem>
     <listitem id="bsmqyky">
@@ -2005,7 +2017,7 @@
      <para>You should select at least the Inbox folder. Depending upon the way your IMAP server is configured, the list of available files might include non-mail folders. If it does, you can ignore them.</para>
     </listitem>
     <listitem id="bsmqz9t">
-     <para>Click Subscribe to add a folder to the subscribed list.</para>
+     <para>Enable the corresponding checkbox to add a folder to the subscribed list.</para>
     </listitem>
     <listitem id="bsmqzlz">
      <para>When you have subscribed to the folders you want, close the window.</para>
@@ -2015,7 +2027,7 @@
 
   <section id="encryption">
    <title>Encryption</title>
-   <para>To protect and encode your e-mail transmissions, Evolution offers two encryption methods:</para>
+   <para>To protect and encode your email transmissions, Evolution offers two encryption methods:</para>
    <itemizedlist>
     <listitem>
      <para>GPG Encryption</para>
@@ -2025,8 +2037,8 @@
     </listitem>
    </itemizedlist>
    <para>Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), an implementation of strong <link linkend="public-key-encryption">Public Key Encryption.</link></para>
-   <para>GPG uses two keys: public and private. You can give your public key to anyone you want to receive encrypted messages, or put it on a public key server so that people can look it up before contacting you. Your private key lets you decrypt any message encrypted with your public key. Never give your private key to anyone.</para>
-   <para> When you send a message that is encrypted, you must encrypt it using your intended recipient's public key. To receive an encrypted message, you must make sure that the sender has your public key in advance. For signing messages, you encrypt the signature with your private key, so only your public key can unlock it. When you send the message, the recipient gets your public key and unlocks the signature, verifying your identity.</para>
+   <para>In order to send and receive encrypted emails using GPG, it is necessary to use two kinds of encryption keys: public and private. Public keys are used to encrypt messages and private keys to decrypt them. To send encrypted email, you must have the recepient's public key, which is used to encrypt the message. The recipient then uses his/her private key to decrypt (and read) the encrypted message.</para>
+   <para>Those who wish to send you encrypted email must first have a copy of your public key on your keyring. To this end, public keys can be shared with those who want to send encrypted messages to you. In order to do this, you may place your public key on a public key server. Private keys should not be shared with others.</para>
    <para>Evolution does not support older versions of PGP, such as OpenPGP and Inline PGP.</para>
    <para>You can use encryption in two different ways:</para>
    <itemizedlist>
@@ -2063,7 +2075,7 @@
       <para>Type your real name, then press Enter.</para>
      </listitem>
      <listitem id="bsg30bg">
-      <para>Type your e-mail address, then press Enter.</para>
+      <para>Type your email address, then press Enter.</para>
      </listitem>
      <listitem id="bsg30ec">
       <para>(Optional) Type a comment, then press Enter.</para>
@@ -2113,7 +2125,7 @@
     <title>Setting up GPG Encryption</title>
     <orderedlist>
      <listitem id="bsg364h">
-      <para>Click Edit &gt; Preferences, then click Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bsg368f">
       <para>Select the account you want to use securely, then click Edit.</para>
@@ -2131,7 +2143,7 @@
       <para>Click Close.</para>
      </listitem>
     </orderedlist>
-    <para>Evolution requires that you know your key ID. If you don't remember it, you can find it by typing <command>gpg --list-keys</command> in a console window. Your key ID is an eight-character string with random numbers and letters.</para>
+    <para>Evolution requires that you know your key ID. If you don't remember it, you can find it by typing <command>gpg --list-keys</command> in a terminal window. Your key ID is an eight-character string with random numbers and letters.</para>
    </section>
 
    <section id="bspya9p">
@@ -2145,16 +2157,17 @@
       <para>Click Security &gt; PGP Encrypt.</para>
      </listitem>
      <listitem id="bsg2prj">
-      <para>Compose your message, then click Send.</para>
+      <para>Compose your message.</para>
+      <para>Click Send.</para>
      </listitem>
     </orderedlist>
-    <para>You can set Evolution to always sign your e-mail messages:</para>
+    <para>You can set Evolution to always sign your email messages:</para>
     <orderedlist>
      <listitem id="bsaj12e">
-      <para>Click Edit &gt; Preferences, then select Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bsaj1aj">
-      <para>Select the mail account to encrypt, then click Edit.</para>
+      <para>Select the account you want to use securely, then click Edit.</para>
      </listitem>
      <listitem id="bsaj1es">
       <para>Click the Security tab.</para>
@@ -2181,14 +2194,17 @@
     <title>S/MIME Encryption</title>
     <para>S/MIME encryption also uses a key-based approach, but it has some significant advantages in convenience and security. S/MIME uses certificates, which are similar to keys. The public portion of each certificate is held by the sender of a message and by one of several certificate authorities, who are paid to guarantee the identity of the sender and the security of the message. Evolution already recognizes a large number of certificate authorities, so when you get a message with an S/MIME certificate, your system automatically receives the public portion of the certificate and decrypts or verifies the message.</para>
     <para>S/MIME is used most often in corporate settings. In these cases, administrators supply certificates that they have purchased from a certificate authority. In some cases, an organization can act as its own certificate authority, with or without a guarantee from a dedicated authority such as VeriSign&z-3rdParty; or Thawte&z-3rdParty;. In either case, the system administrator provides you with a certificate file.</para>
-    <para>If you want to use S/MIME independently, you can extract an identification certificate from your Mozilla&z-3rdParty; or Netscape* Web browser. See the Mozilla help <ulink url="http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html">Mozilla Help</ulink>for more information on security certificates.</para>
+    <para>If you want to use S/MIME independently, you can extract an identification certificate from your Mozilla&z-3rdParty; or Netscape&z-3rdParty; Web browser. See the <ulink url="http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html">Mozilla Help</ulink>for more information on security certificates.</para>
     <para>The certificate file is a password-protected file on your computer.</para>
 
     <section id="bspyee8">
      <title>Adding a Signing Certificate</title>
      <orderedlist>
       <listitem id="bsg2rkq">
-       <para>Click Edit &gt; Preferences, then click Certificate.</para>
+       <para>Select Edit &gt; Preferences.</para>
+      </listitem>
+      <listitem id="bsg2rkr">
+       <para>Click Certificates.</para>
       </listitem>
       <listitem id="bsg2rra">
        <para>Click Import.</para>
@@ -2209,7 +2225,10 @@
      <para>To have every message signed or encrypted:</para>
      <orderedlist>
       <listitem id="bsg2t55">
-       <para>Click Edit &gt; Preferences, then select the account to encrypt the messages in.</para>
+       <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
+      </listitem>
+      <listitem id="bsg2t56">
+       <para>Select the account to encrypt the messages in.</para>
       </listitem>
       <listitem id="bsg2tam">
        <para>Click Edit, then click Security.</para>
@@ -2235,11 +2254,11 @@
  </chapter>
 
  <chapter id="usage-mail-organize">
-  <title>Organizing Your E-Mail</title>
-  <para>Whether you only get a few e-mail messages a day, or you receive hundreds, you probably want to sort and organize them. <trademark>Evolution</trademark> has the tools to help you do it.</para>
+  <title>Organizing Your Email</title>
+  <para>Whether you only get a few email messages a day, or you receive hundreds, you probably want to sort and organize them. <trademark>Evolution</trademark> has the tools to help you do it.</para>
   <itemizedlist>
    <listitem>
-    <para><link linkend="importing-mail-and-settings">Importing Your Old E-Mail</link></para>
+    <para><link linkend="importing-mail-and-settings">Importing Your Old Email</link></para>
    </listitem>
    <listitem>
     <para><link linkend="usage-mail-organize-columns">Sorting the Message List</link></para>
@@ -2262,8 +2281,8 @@
   </itemizedlist>
 
   <section id="importing-mail-and-settings">
-   <title>Importing Your Old E-Mail</title>
-   <para>Evolution allows you to import old e-mail and contacts so that you don't need to worry about losing your old information.</para>
+   <title>Importing Your Old Email</title>
+   <para>Evolution allows you to import old email and contacts so that you don't need to worry about losing your old information.</para>
 
    <section id="importing-mail">
     <title>Importing Single Files</title>
@@ -2273,7 +2292,7 @@
      <para>The address book format used by the GNOME, KDE, and many other contact management applications. You should be able to export to vCard format from any address book application.</para>
     </formalpara>
     <formalpara id="b141jcun">
-     <title>vCalender:</title>
+     <title>vCalendar:</title>
      <para>A format for storing calender files, which is generally used by Evolution, Microsoft Outlook, Sunbird, and Korganizer.</para>
     </formalpara>
     <formalpara id="bsawccr">
@@ -2282,21 +2301,21 @@
     </formalpara>
     <formalpara id="b10ac57t">
      <title>Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):</title>
-     <para>CSV or Tab files saved using Evolution, Microsoft Outlook and Mozilla.</para>
+     <para>CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla.</para>
     </formalpara>
     <formalpara id="bsawckg">
      <title>Microsoft Outlook Express 4 (.mbx):</title>
-     <para>The e-mail file format used by Microsoft Outlook Express 4. For other versions of Microsoft Outlook and Outlook Express, see the workaround described in <link linkend="bsawgkk">Step 1</link>. </para>
+     <para>The email file format used by Microsoft Outlook Express 4. For other versions of Microsoft Outlook and Outlook Express, see the workaround described in <link linkend="bsawgkk">Step 1</link>.</para>
     </formalpara>
     <formalpara id="bsawdfx">
      <title>LDAP Data Interchange Format (.LDIF):</title>
-     <para>A standard data format for contact cards. </para>
+     <para>A standard data format for contact cards.</para>
     </formalpara>
     <formalpara id="bsawdmw">
      <title>Berkley Mailbox (.mbox or null extension):</title>
-     <para>The e-mail format used by Mozilla, Netscape, Evolution, Eudora&z-3rdParty;, and many other e-mail clients. </para>
+     <para>The email format used by Mozilla, Netscape, Evolution, Eudora&z-3rdParty;, and many other email clients.</para>
     </formalpara>
-    <para>To import your old e-mail:</para>
+    <para>To import your old email:</para>
     <orderedlist>
      <listitem id="bsaweb1">
       <para>Click File &gt; Import.</para>
@@ -2333,11 +2352,12 @@
      </listitem>
     </orderedlist>
     <mediaobject id="b13sf59f"><imageobject><imagedata format="PNG" fileref="figures/evo_import_asst_a.png"/></imageobject></mediaobject>
-    <para>Microsoft Outlook and versions of Outlook Express after version 4 use proprietary formats that Evolution cannot read or import. One migration method that works well is to use the Outport application. See <ulink url="http://outport.sourceforge.net">outport.sourceforge.net</ulink> for additional information. You can also import data into another Windows mail client such as Mozilla.</para>
+    <para>Microsoft Outlook&z-3rdParty; and versions of Outlook Express after version 4 use proprietary formats that Evolution cannot read or import.</para>
+    <para>One migration method that works well is to use the Outport application. See <ulink url="http://outport.sourceforge.net">outport.sourceforge.net</ulink> for additional information. You can also import data into another Windows mail client such as Mozilla.</para>
     <orderedlist>
      <listitem id="bsawgkk">
       <para>While in Windows, import your .pst files into Mozilla Mail (or another mail program such as Netscape or Eudora that uses the standard mbox format).</para>
-      <para>Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports and undeletes the messages in your Trash folders.</para>
+      <para>Before importing email from Netscape&z-3rdParty;, Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports and undeletes the messages in your Trash folders.</para>
      </listitem>
      <listitem id="bsawh7h">
       <para>Copy the files to the system or partition that Evolution is installed on.</para>
@@ -2352,12 +2372,12 @@
 
   <section id="usage-mail-organize-columns">
    <title>Sorting the Message List</title>
-   <para>Evolution helps you work by letting you sort your e-mail. To sort by sender, subject, or date, click the bars with those labels at the top of the message list. The direction of the arrow next to the label indicates the direction of the sort. Click again, to sort them in reverse order. For example, click Date to sort messages by date from oldest to newest. Click again, and Evolution sorts the list from newest to oldest. You can also right-click the message header bars to get a set of sorting options, and to add to or remove columns from the message list.</para>
-   <para>To look at the complete headers for a message, click View &gt; Message Display &gt; Show Full Headers. To see all message data, click View &gt; Message Display &gt; Show E-Mail Source.</para>
+   <para>Evolution helps you work by letting you sort your email. To sort by sender, subject, or date, click the bars with those labels at the top of the message list. The direction of the arrow next to the label indicates the direction of the sort. Click again, to sort them in reverse order. For example, click Date to sort messages by date from oldest to newest. Click again, and Evolution sorts the list from newest to oldest. You can also right-click the message header bars to get a set of sorting options, and to add to or remove columns from the message list.</para>
+   <para>To look at the complete headers for a message, click View &gt; All Message Headers. To see all message data, click View &gt; Message Source.</para>
 
    <section id="b17qguvc">
-    <title>Sorting Mail In E-mail Threads</title>
-    <para>You can also choose a threaded message view. Click View &gt; Threaded Message List to turn the threaded view on or off. When you select this option, Evolution groups the replies to a message with the original, so you can follow the thread of a conversation from one message to the next.</para>
+    <title>Sorting Mail In Email Threads</title>
+    <para>You can also choose a threaded message view. Click View &gt; Group By Threads to turn the threaded view on or off. When you select this option, Evolution groups the replies to a message with the original, so you can follow the thread of a conversation from one message to the next.</para>
     <mediaobject id="b1448dzl"><imageobject><imagedata format="PNG" fileref="figures/mail-threaded.png"/></imageobject></mediaobject>
     <para>In a thread of conversation view, each new message is stacked below of the ones that arrived before it, so that the newest message is always the one you see first. Whenever a new message arrives to an old thread as a reply, you will see it below the parent message. You always see the thread based on the date of the recent message received. The threads are sorted by the date of most recent message in the threads.</para>
     <tip>
@@ -2372,7 +2392,7 @@
 
    <section id="b17qgvet">
     <title>Sorting Mail With Column Headers</title>
-    <para>In addition to it, Evolution enables you to sort your messages by using Sort-by list.You can use any of the criteria given in the Sort-by list such as <emphasis>sender, location, to, from, size, </emphasis>and so forth to perform sorting. It returns the sorted email list that matches the criteria you have selected.</para>
+    <para>In addition to it, Evolution enables you to sort your messages by using Sort-by list. You can use any of the criteria given in the Sort-by list such as <emphasis>sender, location, to, from, size</emphasis> and so forth to perform sorting. It returns the sorted email list that matches the criteria you have selected.</para>
     <para>To sort messages, perform the following procedure:</para>
     <orderedlist>
      <listitem id="b131itxb">
@@ -2441,23 +2461,23 @@
        </listitem>
       </itemizedlist>
       <note>
-       <para>Clicking each sort criteria cycles take you through three possibilities. Sort by criteria in ascending or descending order or unsort the message. When you click any of the sort criteria reiteratively, Evolution sort the messages in a sequential order - ascending, descending and unsort. For example, when you click Recepients for the first time, Evolution sort the messages by recepients in ascending order and for the second  time, sort in the reverse order. For the next click, messages will be displayed unsorted.</para>
+       <para>Clicking each sort criteria cycles take you through three possibilities. Sort by criteria in ascending or descending order or unsort the message. When you click any of the sort criteria reiteratively, Evolution sort the messages in a sequential order - ascending, descending and unsort. For example, when you click Recepients for the first time, Evolution sort the messages by recipients in ascending order and for the second time, sort in the reverse order. For the next click, messages will be displayed unsorted.</para>
       </note>
       <formalpara id="bsawhu7">
        <title>Sort Ascending:</title>
-       <para>Sorts the messages top to bottom and returns you the sorted e-mail list in the order of oldest to the latest.</para>
+       <para>Sorts the messages top to bottom and returns you the sorted message list in the order of oldest to the latest.</para>
       </formalpara>
       <formalpara id="b1449089">
        <title>Sort Descending:</title>
-       <para>Sort descending revers the order and returns you the sorted e-mail list in the order of newest to oldest.</para>
+       <para>Sort descending revers the order and returns you the sorted message list in the order of newest to oldest.</para>
       </formalpara>
       <formalpara id="b144939d">
        <title>Unsort:</title>
        <para>Unsort removes sorting from this column, reverting to the order of messages as they were added to the folder.</para>
       </formalpara>
       <formalpara id="bsawiat">
-       <title>Removing a Column: </title>
-       <para>Remove this column from the display. You can also remove columns by dragging the header off the list and letting it drop. </para>
+       <title>Removing a Column:</title>
+       <para>Remove this column from the display. You can also remove columns by dragging the header off the list and letting it drop.</para>
       </formalpara>
       <formalpara id="bsawie2">
        <title>Adding a Column:</title>
@@ -2473,7 +2493,7 @@
       </formalpara>
      </listitem>
      <listitem id="b131iudb">
-      <para>Select the search criteria.</para>
+      <para>Select the search criteria from the list.</para>
       <para>You can view the messages in the desired order in the message list.</para>
      </listitem>
     </orderedlist>
@@ -2516,7 +2536,7 @@
     <para>Flags can help you organize your work in a number of ways. For example, you might add a Flag Status column to your message list and sort that way. Alternately, you could create a search folder that displays all your flagged messages, then clear the flags when you're done, so the search folder contains only messages with upcoming deadlines.</para>
     <formalpara id="b17s9rir">
      <title>Mark as Important Feature:</title>
-     <para>If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click Mark as Important or Select Message &gt; Mark as &gt;Important.</para>
+     <para>If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click Mark as Important or Select Message &gt; Mark as &gt; Important from the menubar.</para>
     </formalpara>
    </section>
   </section>
@@ -2524,13 +2544,13 @@
   <section id="usage-mail-organize-folders">
    <title>Getting Organized with Folders</title>
    <para>Evolution, like most other mail systems, stores mail in folders. You start out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can create as many as you like. Create new folders by clicking Folder &gt; New, or by right-clicking in the folder list and selecting New Folder.</para>
-   <para>When you click OK, your new folder appears in the folder view. You can then move the messages to it by dragging and dropping them, or right click &gt; Move to folder or press Shift+Ctrl+V. </para>
-   <para>You can also drop the messages to a particular folder by selecting Message &gt; Move to folder or press Shift+Ctrl +V. This will open Select folder window, where you can drop your message to any of the folders listed.</para>
+   <para>When you click OK, your new folder appears in the folder view. You can then move the messages to it by dragging and dropping them, or right click on the message and choose Move to folder, or press Shift+Ctrl+V.</para>
+   <para>You can also drop the messages to a particular folder by selecting Message &gt; Move to folder. This will open the Select folder window, where you can drop your message to any of the folders listed.</para>
    <mediaobject id="b13td8j9"><imageobject><imagedata format="PNG" fileref="figures/evo_select_folder.png"/></imageobject></mediaobject>
    <para>If you want to create a new folder click New at the bottom left of the window. Specify the location and enter the label of the folder at the entry box appeared at the top. You can also move the messages from one folder to another by selecting the message and then press Move tab at the bottom right.</para>
-   <para>If you create a filter with the filter assistant, you can have mail filed automatically. For that select Edit &gt; Message Filters to appear Message Filters window</para>
+   <para>If you create a filter with the filter assistant, you can have mail filed automatically. Select Edit &gt; Message Filters to bring up the Message Filters window.</para>
    <mediaobject id="b13tf6pl"><imageobject><imagedata format="PNG" fileref="figures/evo_message_filters_a.png"/></imageobject></mediaobject>
-   <para>Click the Add tab to appear Add Rule window from where you can set different criteria for filtering messages. For more information refer <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
+   <para>Click on the Add button to bring up the Add Rule window from where you can set different criteria for filtering messages. For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
    <note>
     <para>The Inbox folder on most IMAP servers cannot contain both subfolders and messages. When you create additional folders on your IMAP mail server, branch them from the root of the IMAP account's folder tree, not from the Inbox. If you create subfolders in your Inbox folder, you lose the ability to read messages that exist in your Inbox until you move the folders out of the way.</para>
    </note>
@@ -2543,13 +2563,13 @@
     <title>Quick Search:</title>
     <para>Quick Search displays all the messages that match the in-built criteria you selected from the drop-down list at the top left side, just above the message list.</para>
    </formalpara>
-   <para>To perform quick search, perform the following procedure:</para>
+   <para>To perform a quick search, perform the following procedure:</para>
    <orderedlist>
     <listitem id="b131j296">
-     <para>Click Show to expand the drop-down list.</para>
+     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
     </listitem>
     <listitem id="b131j2j8">
-     <para>Select the search criteria from the list</para>
+     <para>Select the search criteria from the list:</para>
      <itemizedlist>
       <listitem>
        <para>All Messages</para>
@@ -2600,7 +2620,7 @@
     </listitem>
    </orderedlist>
    <tip>
-    <para>The following labels need not necessarily be the same as the default names listed here.You can change the name of these labels by selecting Edit &gt; Preferences &gt; Mail Preferences &gt; Colors.</para>
+    <para>The following labels need not necessarily be the same as the default names listed here. You can change the name of these labels by selecting Edit &gt; Preferences &gt; Mail Preferences &gt; Colors.</para>
     <itemizedlist>
      <listitem>
       <para>Important</para>
@@ -2621,11 +2641,11 @@
    </tip>
    <formalpara id="b131jgie">
     <title>Customized Search:</title>
-    <para>Evolution allows you to perform customized search.To search for a message use the following procedure:</para>
+    <para>Evolution allows you to perform customized search. To search for a message use the following procedure:</para>
    </formalpara>
    <orderedlist>
     <listitem id="b131jhwt">
-     <para>Click search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to specify the search type.</para>
+     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
      <formalpara id="b131lvi6">
       <title>Subject or Sender Contain:</title>
       <para>Finds messages that contain the search text in the subject or sender. It does not search in the message body.</para>
@@ -2677,21 +2697,21 @@
    </orderedlist>
    <para>Evolution shows your search results in the message list. You might want to create a search folder instead; see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link> for more detail.</para>
    <note>
-    <para>To clear your search click the Clear button or menu, or enter a blank search. You can also  press Shift+Ctrl+Q to clear the search.</para>
+    <para>To clear your search you can click the Clear icon in the search string field, or choose Search &gt; Clear from the menubar, or enter a blank search. You can also press Shift+Ctrl+Q to clear the search.</para>
    </note>
    <tip>
-    <para>You can even perform a quick search on a customized search results as it just filters and displays  the messages in the message list.</para>
+    <para>You can even perform a quick search on a customized search results as it just filters and displays the messages in the message list.</para>
    </tip>
    <formalpara id="b13tvajl">
     <title>Advanced Search:</title>
-    <para>To perform advanced search,</para>
+    <para> You can perform an advanced search based on any of the search types.</para>
    </formalpara>
    <orderedlist>
     <listitem id="b13tvav6">
-     <para>Select Search menu</para>
+     <para>Select the Search menu.</para>
     </listitem>
     <listitem id="b13tvb7l">
-     <para>Click Advanced Search to open Advanced Search dialogue box</para>
+     <para>Click Advanced Search to open Advanced Search dialog box.</para>
      <mediaobject id="b13tvd61"><imageobject><imagedata format="PNG" fileref="figures/evo_adv_search_a.png"/></imageobject></mediaobject>
      
     </listitem>
@@ -2714,25 +2734,25 @@
    </formalpara>
    <formalpara id="b13tvnp3">
     <title>Edit Saved Searches:</title>
-    <para>To edit your saved searches</para>
+    <para>To edit your saved searches,</para>
    </formalpara>
    <orderedlist>
     <listitem id="b13tw1cm">
-     <para>Select Search </para>
+     <para>Select Search from the menu bar.</para>
     </listitem>
     <listitem id="b13tw2vp">
-     <para>Click Edit Saved Searches to open Searches dialogue box.</para>
+     <para>Click Edit Saved Searches to open the Searches dialog box.</para>
      <mediaobject id="b13tw8de"><imageobject><imagedata format="PNG" fileref="figures/evo_edit_search.png"/></imageobject></mediaobject>
      
     </listitem>
     <listitem id="b13tw8px">
-     <para>Click Edit tab to edit to open Edit Rule dialogue box</para>
+     <para>Click the Edit button to open the Edit Rule dialog box.</para>
      <para>You can also add or remove Searches from the list by using the respective buttons available at the right.</para>
      <mediaobject id="b13twan3"><imageobject><imagedata format="PNG" fileref="figures/evo_edit_rule_a.png"/></imageobject></mediaobject>
      
     </listitem>
     <listitem id="b13twb4j">
-     <para>Edit the title or search criteria from the dialogue box.</para>
+     <para>Edit the title or search criteria from the dialog box.</para>
     </listitem>
     <listitem id="b13twbu1">
      <para>Click OK.</para>
@@ -2759,11 +2779,11 @@
       
      </listitem>
      <listitem id="bsazb4y">
-      <para>Define the criteria for the filter in the If section.</para>
+      <para>Define the criteria for the filter in the first section.</para>
       <para>For each of the filter criteria, you must first select which parts of the message you want to filter:</para>
       <formalpara id="bsh25ic">
        <title>Sender:</title>
-       <para>The sender's address.</para>
+       <para>The sender's email address or the name of the sender.</para>
       </formalpara>
       <formalpara id="bsh25ui">
        <title>Recipient:</title>
@@ -2784,7 +2804,7 @@
       </formalpara>
       <formalpara id="bshkb9x">
        <title>Expression:</title>
-       <para>(For programmers only) Match a message according to an expression you write in the Scheme language, used to define filters in Evolution.</para>
+       <para>(For programmers only) Match a message according to an expression you write in the Scheme language used to define filters in Evolution.</para>
       </formalpara>
       <formalpara id="bshkbvl">
        <title>Date Sent:</title>
@@ -2796,7 +2816,7 @@
       </formalpara>
       <formalpara id="bshkcwe">
        <title>Label:</title>
-       <para>Messages can have labels of Important, Work, Personal, To Do, or Later. You can set tables with other filters or by hand.</para>
+       <para>Messages can have labels of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually.</para>
       </formalpara>
       <formalpara id="bshkdbe">
        <title>Score:</title>
@@ -2816,7 +2836,7 @@
       </formalpara>
       <formalpara id="bshkej1">
        <title>Attachments:</title>
-       <para>Creates a filter based on whether there is an attachment for the e-mail.</para>
+       <para>Creates a filter based on whether there is an attachment for the email.</para>
       </formalpara>
       <formalpara id="bshkev3">
        <title>Mailing List </title>
@@ -2840,7 +2860,7 @@
       </formalpara>
       <formalpara id="bshkh3t">
        <title>Select the Criteria for the Condition:</title>
-       <para>If you want multiple criteria for this filter, click Add Criterion and repeat step 4.</para>
+       <para>If you want multiple criteria for this filter, click Add and repeat step 4.</para>
       </formalpara>
       <formalpara id="bshkhi8">
        <title>Select the Actions for the Filter in the Then Section:</title>
@@ -2850,13 +2870,13 @@
        <listitem>
         <formalpara id="bsmr5pj">
          <title>Move to Folder:</title>
-         <para>Moves the message into a folder you specify. Click Here to select the destination folder.</para>
+         <para>Moves the message into a folder you specify.</para>
         </formalpara>
        </listitem>
        <listitem>
         <formalpara id="bsmr9sg">
          <title>Copy to Folder:</title>
-         <para>Puts a copy of the message into a folder you specify. Click Here to select the destination folder.</para>
+         <para>Puts a copy of the message into a folder you specify.</para>
         </formalpara>
        </listitem>
        <listitem>
@@ -2868,7 +2888,7 @@
        <listitem>
         <formalpara id="bsmr9zn">
          <title>Stop Processing:</title>
-         <para>Select this if you want to have all other filters ignore this message.</para>
+         <para>Select this if you want to all other filters ignore this message. Note that only filters listed after this particular rule will be ignored.</para>
         </formalpara>
        </listitem>
        <listitem>
@@ -2916,7 +2936,7 @@
        <listitem>
         <formalpara id="bsmrdip">
          <title>Pipe to Program:</title>
-         <para>Sends the message to a program of your choice. No return value is expected. This feature can be used to create automatic Web postings from e-mail messages or to perform additional message post processing not supported by Evolution.</para>
+         <para>Sends the message to a program of your choice. No return value is expected. This feature can be used to create automatic Web postings from email messages or to perform additional message post processing not supported by Evolution.</para>
         </formalpara>
        </listitem>
        <listitem>
@@ -2928,7 +2948,7 @@
       </itemizedlist>
      </listitem>
      <listitem id="bsazp1t">
-      <para>Click Add Action if you need multiple actions and click OK.</para>
+      <para>Click Add if you need multiple actions and click OK.</para>
      </listitem>
      <listitem id="bsazq81">
       <para>Click OK.</para>
@@ -2937,10 +2957,10 @@
     <para>There is an easy shortcut for fast filter or search folder creation:</para>
     <orderedlist>
      <listitem id="bsh2232">
-      <para>Right-click the message in the e-mail list.</para>
+      <para>Right-click the message in the message list.</para>
      </listitem>
      <listitem id="bsh22bz">
-      <para>Select one of the items under the Create Rule from the Message submenu.</para>
+      <para>Select one of the items under the Create Rule From Message submenu.</para>
       <para>Creating a rule based on a message opens the filter creation tool with some of the information about the message already filled in for your convenience.</para>
      </listitem>
     </orderedlist>
@@ -2981,12 +3001,12 @@
 
   <section id="usage-mail-organize-vfolders">
    <title>Using Search Folders</title>
-   <para>If filters aren't flexible enough, or you find yourself performing the same search again and again, consider a search folder. Search folders are an advanced way of viewing your e-mail messages within Evolution. If you get a lot of mail or often forget where you put messages, search folders can help you keep things organized.</para>
+   <para>If filters aren't flexible enough, or you find yourself performing the same search again and again, consider a search folder. Search folders are an advanced way of viewing your email messages within Evolution. If you get a lot of mail or often forget where you put messages, search folders can help you keep things organized.</para>
    <para>A search folder is really a hybrid of all the other organizational tools: it looks like a folder, it acts like a search, and you set it up like a filter. In other words, a conventional folder actually contains messages, but a search folder is a view of messages that might be in several different folders. The messages it contains are determined on the fly using a set of criteria you choose in advance.</para>
    <para>As messages that meet the search folder criteria arrive or are deleted, Evolution automatically adjusts the search folder contents. When you delete a message, it is erased from the folder in which it actually exists, as well as any search folders that display it.</para>
    <para>The Unmatched Search Folder is the opposite of other search folders: it displays all messages that do not appear in other search folders.</para>
-   <para>If you use remote e-mail storage like IMAP or Microsoft Exchange, and have created search folders to search through them, the Unmatched Search Folder also searches the remote folders. If you do not create any search folders that search remote mail stores, the Unmatched Search Folder does not search in them either.</para>
-   <para>As an example of using folders, searches, and search folders, consider the following: To organize his mailbox, Jim sets up a search folder for e-mail from his friend and co-worker Anna. He has another search folder for messages that have novell.com in the address and Evolution in the subject line, so he can keep a record of what people from work send him about Evolution. If Anna sends him a message about anything other than Evolution, it only shows up in the <quote>Anna</quote> search folder. When Anna sends him mail about the user interface for Evolution, he can see the message both in the <quote>Anna</quote> search folder and in the <quote>Internal Evolution Discussion</quote> search folder.</para>
+   <para>If you use remote email storage like IMAP or Microsoft Exchange, and have created search folders to search through them, the Unmatched Search Folder also searches the remote folders. If you do not create any search folders that search remote mail stores, the Unmatched Search Folder does not search in them either.</para>
+   <para>As an example of using folders, searches, and search folders, consider the following: To organize his mailbox, Jim sets up a search folder for email from his friend and co-worker Anna. He has another search folder for messages that have novell.com in the address and Evolution in the subject line, so he can keep a record of what people from work send him about Evolution. If Anna sends him a message about anything other than Evolution, it only shows up in the <quote>Anna</quote> search folder. When Anna sends him mail about the user interface for Evolution, he can see the message both in the <quote>Anna</quote> search folder and in the <quote>Internal Evolution Discussion</quote> search folder.</para>
 
    <section id="vfolder-create">
     <title>Creating A Search Folder</title>
@@ -3028,8 +3048,8 @@
        <para>Searches in the actual text of the message.</para>
       </formalpara>
       <formalpara id="bshkzum">
-       <title>Expression:(For programmers only)</title>
-       <para>Match a message according to an expression you write in the Scheme language used to define filters in Evolution.  </para>
+       <title>Expression (For programmers only):</title>
+       <para>Match a message according to an expression you write in the Scheme language used to define filters in Evolution.</para>
       </formalpara>
       <formalpara id="bshkzun">
        <title>Date Sent:</title>
@@ -3061,7 +3081,7 @@
       </formalpara>
       <formalpara id="bshkzuu">
        <title>Attachments:</title>
-       <para>Creates a filter based on whether there is an attachment for the e-mail.</para>
+       <para>Creates a filter based on whether there is an attachment for the email.</para>
       </formalpara>
       <formalpara id="bshkzuv">
        <title>Mailing List:</title>
@@ -3073,7 +3093,7 @@
       </formalpara>
      </listitem>
      <listitem id="bsazxjk">
-      <para>Select the folders where this search folder will search. Your options are:</para>
+      <para>Select which folders will be used for the search folder. Your options are:</para>
       <formalpara id="bsmr82i">
        <title> All local folders:</title>
        <para>Uses all local folders for the search folder source in addition to individual folders that are selected.</para>
@@ -3114,13 +3134,14 @@
 
   <section id="usage-mail-organize-spam">
    <title>Stopping Junk Mail (Spam)</title>
-   <para>Evolution can check for junk mail for you. Evolution uses SpamAssassin  and/ or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder.</para>
-   <para>The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it. When you first start using junk mail blocking, check the Junk folder to be sure that legitimate mail doesn't get flagged as junk mail. If good mail, is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting Mark as Not Junk or press Shift+Ctrl+J. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on.</para>
-   <para>Every filter needs to learn at the least 100 spam and 100 ham to start working. For that, you must  mark each message manually by clicking the <emphasis>Not junk</emphasis> button in the toolbar to learn that it is ham. The <emphasis>Junk</emphasis> button learns a message as spam.</para>
-   <para>To change your junk mail filtering preferences, click Edit &gt; Preferences, then click Mail Preferences. For more information on this see, <link linkend="mail-prefs-junk">Junk Mail Preferences</link>.</para>
+   <para>Evolution can check for junk mail for you. Evolution uses SpamAssassin and/or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder.</para>
+   <para>The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it. When you first start using junk mail blocking, check the Junk folder to be sure that legitimate mail doesn't get flagged as junk mail. If good mail is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting Mark as Not Junk or press Shift+Ctrl+J. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on.</para>
+   <para>Every filter needs to learn at the least 100 spam and 100 ham to start working. For that, you must mark each message manually by clicking the <emphasis>Not junk</emphasis> button in the toolbar to learn that it is ham. The <emphasis>Junk</emphasis> button learns a message as spam.</para>
+   <para>To change your junk mail filtering preferences, click Edit &gt; Preferences, then click Mail Preferences.</para>
+   <para>For additional information on junk content, see <link linkend="mail-prefs-junk">Junk Mail Preferences</link>.</para>
    <para>For additional junk mail settings, see <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
    <note>
-    <para>SpamAssassin is an application that scan through the mail box to find junk mails. Evolution uses SpamAssassin as the default spam-filtering application. For more information, see<ulink url="http://spamassassin.apache.org/"> The Apache SpamAssassin Project</ulink>.</para>
+    <para>SpamAssassin is an application that scan through the mail box to find junk mail. Evolution uses SpamAssassin as the default spam-filtering application. For more information, see<ulink url="http://spamassassin.apache.org/"> The Apache SpamAssassin Project</ulink>.</para>
     <para>Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) by a statistical analysis of the message's header and content (body). It is able to learn from the user's classifications and corrections. For more information on Bogofilter, see <ulink url="http://bogofilter.sourceforge.net/">The Bogofilter site</ulink>.</para>
    </note>
   </section>
@@ -3149,14 +3170,14 @@
 
   <section id="usage-contact-cards">
    <title>Contacts and Cards</title>
-   <para>Contacts are the individuals you have chosen to add to your address book so you can keep track of information about them and send e-mail to them. In Evolution, an individual contact is called a card.For more information on organizing your contact list see <link linkend="usage-contact-organize">Organizing your Contacts</link>. To learn about configuring the contacts tool, refer <link linkend="config-prefs-contact">Contact Management</link>.</para>
+   <para>Contacts are the individuals you have chosen to add to your address book so you can keep track of information about them and send email to them. In Evolution, an individual contact is called a card. For more information on organizing your contacts see <link linkend="usage-contact-organize">Organizing your Contacts</link>. To learn about configuring the contacts tool, refer <link linkend="config-prefs-contact">Contact Management</link>.</para>
 
    <section id="bsqchx3">
     <title>The Contact Editor</title>
     <para>If you want to add or change cards, use the contact editor. You can edit email address, telephone numbers, mailer addresses and all other contact information you have entered for a particular contact.</para>
     <para>The contact editor window has three tabs:</para>
     <formalpara id="b13psru7">
-     <title>Contacts:</title>
+     <title>Contact:</title>
      <para>Contains basic contact information.</para>
     </formalpara>
     <formalpara id="b13pss9b">
@@ -3167,13 +3188,12 @@
      <title>Mailing Address:</title>
      <para>Contains the individual's mailing address.</para>
     </formalpara>
-    <para>You can also use Action Menu to find Forward Contact, which opens a new message with the card already attached, and Send Message to Contact, which opens a new message to the contact's e-mail address.</para>
-    <para>From the Contact Editor toolbar, you can save and close, print, close, or delete the contact.</para>
-    <para>You can add card from within an e-mail message or calendar appointment. In an open e-mail, right-click any e-mail address or message, and click Add to Address Book or select Add Sender to Address Book from the Message menu.</para>
+    <para>You can also the Forward Contact menu item in the Action menu, which opens a new message with the card already attached, and Send Message to Contact, which opens a new message to the contact's email address.</para>
+    <para>You can add a card from within an email message or calendar appointment. In an open email, right-click any email address or message, and click Add to Address Book or select Add Sender to Address Book from the Message menu.</para>
     <para>Most of the items in the contact editor simply display the information you enter, but some of them have additional features:</para>
     <formalpara id="b13psuii">
      <title>Full Name:</title>
-     <para>Specify the name of your contact here. You can type a name into the Full Name field, but you can also click the Full Name button to bring up a small dialog box with text boxes for first and last names, titles like <quote>Mr.</quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</quote> The Full Name field also interacts with the File Under box to help you organize your contacts and to handle multi-word surnames.To see how it works, type a name in the Full Name field. As an example, we'll use Miguel de Icaza. You'll notice that the File Under field also fills in, but in reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts editor would have correctly guessed that the entry should be filed under <quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</quote> has two words, and to sort it correctly you must enter de Icaza, Miguel in the File As entry.</para>
+     <para>Specify the name of your contact here. You can type a name into the Full Name field, but you can also click the Full Name button to bring up a small dialog box with text boxes for first and last names, titles like <quote>Mr.</quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</quote> The Full Name field also interacts with the File Under box to help you organize your contacts and to handle multi-word surnames. To see how it works, type a name in the Full Name field. As an example, we will use Miguel de Icaza. You will notice that the File Under field also fills in, but in reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts editor would have correctly guessed that the entry should be filed under <quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</quote> has two words, and to sort it correctly you must enter de Icaza, Miguel in the File As entry.</para>
     </formalpara>
     <formalpara id="b13psvf3">
      <title>Where:</title>
@@ -3194,10 +3214,7 @@
      <para>Follow the steps given below to create a new card.</para>
      <orderedlist>
       <listitem id="b13prudx">
-       <para>Click the down arrow key next to the New button in the toolbar</para>
-      </listitem>
-      <listitem id="b13prup2">
-       <para>Select Contacts from the drop-down list or press Shift+Ctrl+C to appear Contact Editor.</para>
+      <para>Click File &gt; New &gt; Contact.</para>
       </listitem>
       <listitem id="b13prwao">
        <para>Enter the contact information to the entry boxes provided.</para>
@@ -3209,33 +3226,34 @@
      <para>If you want to change a card that already exists,</para>
      <orderedlist>
       <listitem id="b13ps1yb">
-       <para>Press Contact tool from the Switcher to appear the Contact list.</para>
+       <para>Go to the Contacts window by selecting View &gt; Window &gt; Contacts from the menubar.</para>
       </listitem>
       <listitem id="b13ps28d">
        <para>Double click on the card you want to edit.</para>
       </listitem>
       <listitem id="b13ps3r7">
-       <para>Edit from the Contact Editor window.</para>
+       <para>Edit the information in the Contact Editor window.</para>
       </listitem>
       <listitem id="b13ps518">
        <para>Click OK.</para>
       </listitem>
      </orderedlist>
-     <para>You can also edit the contact information from the message list.</para>
+     <para>You can also edit the contact information from the preview pane.</para>
      <orderedlist>
       <listitem id="b13psb92">
-       <para>Right click on the address from Message Header</para>
+       <para>Right click on the address from Message Header.</para>
       </listitem>
       <listitem id="b13psizd">
-       <para>Select Add to Address Book to appear Contact Quick-Add window</para>
+       <para>Select Add to Address Book to bring up the Contact Quick-Add window.</para>
        <mediaobject id="b13psl8w"><imageobject><imagedata format="PNG" fileref="figures/quick_add_a.png"/></imageobject></mediaobject>
        
       </listitem>
       <listitem id="b13pslot">
-       <para>Press Edit Full tab at the bottom left to appear Contact Editor window</para>
+       <para>Press the Edit Full button at the bottom left to bring up the Contact Editor window.</para>
       </listitem>
       <listitem id="b13pslyy">
-       <para>Edit the required information from Contact Editor and press OK.</para>
+       <para>Edit the information in the Contact Editor window.</para>
+       <para>Click OK.</para>
       </listitem>
      </orderedlist>
     </section>
@@ -3250,7 +3268,7 @@
    </formalpara>
    <orderedlist>
     <listitem id="b131m9n2">
-     <para>Click <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
+     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
     </listitem>
     <listitem id="b131mb7o">
      <para>Specify the search criteria from any of the following:</para>
@@ -3282,10 +3300,10 @@
      <para>Select Add to add additional criteria.</para>
     </listitem>
     <listitem id="bsb05aw">
-     <para>Click Search.</para>
+     <para>Click OK.</para>
     </listitem>
    </orderedlist>
-   <para>To show all your contacts, Click Clear in the search bar or search with an empty query.</para>
+   <para>To clear your search you can click the Clear icon in the search string field, or choose Search &gt; Clear from the menubar, or enter a blank search. You can also press Shift+Ctrl+Q to clear the search.</para>
    <formalpara id="b131mh80">
     <title>Quick Search:</title>
     <para>Displays all the contacts that match the built-in criteria you have selected from the drop-down list at the top left side, just above the Display pane.</para>
@@ -3293,10 +3311,10 @@
    <para>To perform quick search, use the following procedure:</para>
    <orderedlist>
     <listitem id="b131mjuy">
-     <para>Click show to expand the drop-down list.</para>
+     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
     </listitem>
     <listitem id="b131mkao">
-     <para>Select the search criteria from any of the following:</para>
+     <para>Select the search criteria from the list:</para>
      <itemizedlist>
       <listitem>
        <para>Anniversary</para>
@@ -3356,7 +3374,7 @@
        <para>Suppliers</para>
       </listitem>
       <listitem>
-       <para>Time &amp;Expenses</para>
+       <para>Time &amp; Expenses</para>
       </listitem>
       <listitem>
        <para>VIP</para>
@@ -3365,25 +3383,25 @@
        <para>Waiting</para>
       </listitem>
       <listitem>
-       <para>Weather:Cloudy</para>
+       <para>Weather: Cloudy</para>
       </listitem>
       <listitem>
-       <para>Weather:Fog</para>
+       <para>Weather: Fog</para>
       </listitem>
       <listitem>
-       <para>Weather:Partly Cloudy</para>
+       <para>Weather: Partly Cloudy</para>
       </listitem>
       <listitem>
-       <para>Weather:Rain</para>
+       <para>Weather: Rain</para>
       </listitem>
       <listitem>
-       <para>Weather:Snow</para>
+       <para>Weather: Snow</para>
       </listitem>
       <listitem>
-       <para>Weather:Sunny</para>
+       <para>Weather: Sunny</para>
       </listitem>
       <listitem>
-       <para>Weather:Thunderstorms</para>
+       <para>Weather: Thunderstorms</para>
       </listitem>
      </itemizedlist>
     </listitem>
@@ -3395,7 +3413,7 @@
 
   <section id="usage-contact-organize">
    <title>Organizing your Contacts</title>
-   <para>Evolution allows you to organize your contact list. You can create several individual address books, or contact groups. Within a given address book, you can have several categories of contacts.</para>
+   <para>Evolution allows you to organize your contacts. You can create several individual address books, or contact lists. Within a given address book, you can have several categories of contacts.</para>
    <itemizedlist>
     <listitem>
      <para><link linkend="usage-contact-organize-group">Contacts Groups</link></para>
@@ -3413,10 +3431,10 @@
 
    <section id="usage-contact-organize-group">
     <title>Contacts Groups</title>
-    <para>Contacts Groups are nothing but Address Books.The simplest way to organize contacts is to create additional address books. You can create a new one by clicking File &gt; New &gt; Address Book. For contacts groups on your computer, you only need to provide a name. For contacts on the network, you need to provide more information about the contacts server you are trying to access.</para>
-    <para>To move a card from one group to another, just drag it from the main display of contacts. You cannot change the contents of most network contact groups.</para>
+    <para>Contacts Groups are nothing but Address Books. The simplest way to organize contacts is to create additional address books. You can create a new one by clicking File &gt; New &gt; Address Book. For contacts groups on your computer, you only need to provide a name. For contacts on the network, you need to provide more information about the contacts server you are trying to access.</para>
+    <para>To move a card from one group to another, just drag it from the main display of contacts and drop it to a different group. You cannot change the contents of most network contact groups.</para>
     <note>
-     <para>Contacts groups are not the same as contact lists. A contact group is like a folder or address book full of contacts. A contact list is a single contact that contains other contacts, and is most often used to e-mail several people at once.</para>
+     <para>Contacts groups are not the same as contact lists. A contact group is like a folder or address book full of contacts. A contact list is a single contact that contains other contacts, and is most often used to email several people at once.</para>
     </note>
    </section>
 
@@ -3435,8 +3453,8 @@
 
    <section id="usage-contact-organize-group-list">
     <title>Creating a List of Contacts</title>
-    <para>A contact list is a set of contacts with a single nickname that you create. When you send e-mail to the nickname, it is sent to every member of the list. This differs from a network mailing list in that it exists only on your computer as a convenience to you, rather than as an actual e-mail address managed by a mailing list application on a server.</para>
-    <para>For example, you could create one card for each family member, then add those cards to a contact list called <quote>Family.</quote> Then, instead of entering each person's e-mail address individually, you can send e-mail to <quote>Family</quote> and the message would go to all of them.</para>
+    <para>A contact list is a set of contacts with a single nickname that you create. When you send email to the nickname, it is sent to every member of the list. This differs from a network mailing list in that it exists only on your computer as a convenience to you, rather than as an actual email address managed by a mailing list application on a server.</para>
+    <para>For example, you could create one card for each family member, then add those cards to a contact list called <quote>Family.</quote> Then, instead of entering each person's email address individually, you can send email to <quote>Family</quote> and the message would go to all of them.</para>
     <para> To create a list of contacts:</para>
     <orderedlist>
      <listitem id="bshlf6r">
@@ -3448,26 +3466,26 @@
       <para>Specify a name for the list.</para>
      </listitem>
      <listitem id="bshlfcp">
-      <para>Specify the names or e-mail addresses of contacts.</para>
+      <para>Specify the names or email addresses of contacts.</para>
       <para>or</para>
       <para>Drag contacts from the main window into the list.</para>
      </listitem>
      <listitem id="bshlfem">
-      <para>Choose whether you want to hide the e-mail addresses when you send a message to the list.</para>
-      <para>Unless it is a very small list, it is recommended that you leave the addresses hidden. This is the same thing as using the <quote>Bcc:</quote> feature discussed in <link linkend="usage-mail-getnsend-send-to-types">Specifying Additional Recipients for E-Mail</link>.</para>
+      <para>Choose whether you want to hide the email addresses when you send a message to the list.</para>
+      <para>Unless it is a very small list, it is recommended that you leave the addresses hidden. This is the same thing as using the <quote>Bcc:</quote> feature discussed in <link linkend="usage-mail-getnsend-send-to-types">Specifying Additional Recipients for Email</link>.</para>
      </listitem>
      <listitem id="bshlfgv">
       <para>When you are finished, click OK.</para>
      </listitem>
     </orderedlist>
-    <para>The list appears as a contact card, which you can use as you would any other card, including mailing the list to another person and sending e-mail to the list.</para>
-    <para>To mail the list, open a new e-mail and type the name you chose for the list. Evolution addresses the message to the entire list when you send the message. You can also right-click the list's address card in the contacts tool and select Send Message to List.</para>
+    <para>The list appears as a contact card, which you can use as you would any other card, including mailing the list to another person and sending email to the list.</para>
+    <para>To mail the list, open a new email and type the name you chose for the list. Evolution addresses the message to the entire list when you send the message. You can also right-click the list's address card in the contacts tool and select Send Message to List.</para>
     <para>Evolution cannot store contact lists on Microsoft Exchange servers.</para>
    </section>
 
    <section id="usage-contact-organize-group-category">
     <title>Grouping with Categories</title>
-    <para>Another way to group cards is to mark them as belonging to different categories. You can mark a card as being in several categories or no category at all. For example, you put a friend's card in the <guilabel>Business</guilabel> category because he works with you, the <guilabel>Friends</guilabel> category because he's a friend, and the <guilabel>Frequent</guilabel> category because you call him often.</para>
+    <para>Another way to group cards is to mark them as belonging to different categories. You can mark a card as being in several categories or no category at all. For example, you put a friend's card in the <guilabel>Business</guilabel> category because he works with you and the <guilabel>Friends</guilabel> category because he's a friend.</para>
     <para>To mark a card as belonging to a category,</para>
     <orderedlist>
      <listitem id="b13ptaog">
@@ -3475,7 +3493,7 @@
      </listitem>
      <listitem id="b13ptb98">
       <para>Click the Categories button at the left.</para>
-      <para>You can view the Categories dialogue box as given below.</para>
+      <para>You can view the Categories dialog box as given below.</para>
       <para></para>
       <para></para>
       <para></para>
@@ -3490,21 +3508,21 @@
       <para>Select the category from the list. You can select as many or as few categories as you like.</para>
      </listitem>
     </orderedlist>
-    <para>If the master list of categories doesn't suit you, you can add your own categories. To add new category,</para>
+    <para>If the master list of categories doesn't suit you, you can add your own categories. To add a new category,</para>
     <orderedlist>
      <listitem id="b13ptcwe">
-      <para>Enter the new category in the entry box at the top</para>
+      <para>Enter the new category in the entry box at the top.</para>
      </listitem>
      <listitem id="b13ptef4">
       <para>Click OK.</para>
-      <para>You can view the category name appeared in the field next to Categories button in the Contact Editor</para>
+      <para>You can view the category name appeared in the field next to Categories button in the Contact Editor.</para>
      </listitem>
      <listitem id="b13ptgw7">
-      <para>Press OK at the right bottom of the Contact Editor window.</para>
+      <para>Click OK.</para>
      </listitem>
     </orderedlist>
     <tip>
-     <para>You can edit or set the color and icon for each categories available under categories list. To achieve that click Edit button at the bottom of the Categories window. Press delete button to delete the items from the list.</para>
+     <para>You can edit or set the color and icon for each categories available under categories list. To achieve that click Edit button at the bottom of the Categories window. Press the Delete button to delete the items from the list.</para>
     </tip>
    </section>
   </section>
@@ -3512,10 +3530,10 @@
   <section id="usage-contact-sharing">
    <title>LDAP: Shared Address Books on a Network</title>
    <para>The <link linkend="ldap">LDAP</link> protocol was created to let users share contact information over a network by sharing access to a central directory. LDAP allows a company to maintain a shared set of contact information. Many companies keep a common LDAP address book for all their employees or for client contacts.</para>
-   <para>To learn how to add a remote LDAP directory to your available contact folders, see <link linkend="config-prefs-contact">Contact Management</link>. Remote groups of contacts appear under the On LDAP Servers item in the switcher. They work like a local folder of contact cards, with the following exceptions: </para>
+   <para>To learn how to add a remote LDAP directory to your available address books, see <link linkend="config-prefs-contact">Contact Management</link>. Remote groups of contacts appear under the On LDAP Servers item in the switcher. They work like a local folder of contact cards, with the following exceptions:</para>
    <itemizedlist>
     <listitem>
-     <para>Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local contacts list.</para>
+     <para>Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local address books.</para>
      <para>You can also mark the network folder for offline usage. To mark the folder, right-click the folder, then click Properties. Select Copy Folder Content Locally for Offline Operation.</para>
     </listitem>
     <listitem>
@@ -3534,7 +3552,7 @@
 
   <section id="contact-automation-basic">
    <title>Send Me a Card: Adding New Cards Quickly</title>
-   <para>When you get information about a person in the mail or in a calendar entry, you can add it to an address card. To do so, right-click any e-mail address or e-mail message, and click Add to Address Book on the menu that appears. If the sender already exists, the Editor tab opens and you can edit the detail. Evolution can also add cards from a hand-held device during HotSync&z-3rdParty; operation. For more information, see <link linkend="config-sync">Synchronizing Your Handheld Device</link>.</para>
+   <para>When you get information about a person in the mail or in a calendar entry, you can add it to an address card. To do so, right-click any email address or email message, and click Add to Address Book on the menu that appears. If the sender already exists, the Editor tab opens and you can edit the detail. Evolution can also add cards from a hand-held device during HotSync&z-3rdParty; operation. For more information, see <link linkend="config-sync">Synchronizing Your Handheld Device</link>.</para>
   </section>
  </chapter>
 
@@ -3576,7 +3594,7 @@
 
   <section id="usage-calendar-view">
    <title>Ways of Looking at your Calendar</title>
-   <para>In Evolution, you can keep multiple calendars and overlay them one over the next. For example, you might have a schedule of events for work, one for home, and one for your favorite sports team. The switcher lists those calendars, and you can select or deselect the boxes next to them to show and hide the appointments in your calendar view. By hiding and showing different sets of appointments, you can be sure to avoid conflicts, while keeping a minimum of clutter in your view.</para>
+   <para>In Evolution, you can keep multiple calendars and overlay them one over the next. For example, you might have a schedule of events for work, one for home, and one for your favorite sports team. The side bar lists those calendars, and you can select or deselect the boxes next to them to show and hide the appointments in your calendar view. By hiding and showing different sets of appointments, you can be sure to avoid conflicts, while keeping a minimum of clutter in your view.</para>
    <para>Appointments for each calendar appear as a different color.</para>
    <para>The toolbar offers you five different buttons that can show you different views of your calendar.</para>
    <informaltable>
@@ -3637,9 +3655,9 @@
      </tbody>
     </tgroup>
    </informaltable>
-   <para>You can also select an arbitrary range of days in the small calendar just above the switcher at the left. To do this, select the days that you want to view in your calendar.</para>
+   <para>You can also select an arbitrary range of days in the small calendar in the side bar. To do this, select the days that you want to view in your calendar.</para>
    <mediaobject id="b14av0ey"><imageobject><imagedata format="PNG" fileref="figures/evo_cal_a.png"/></imageobject></mediaobject>
-   <para>The Prev and Next buttons move you forward and back in your calendar pages. If you are using a week or month view, you can move by week or month. To return to today's listing, click the Today button in the toolbar.</para>
+   <para>The Previous and Next buttons move you forward and back in your calendar pages. If you are using a week or month view, you can move by week or month. To return to today's listing, click the Today button in the toolbar.</para>
    <para>To visit calendar entries for a specific date, click Go To and select the date in the dialog box that appears.</para>
 
    <section id="b13xy2ak">
@@ -3647,13 +3665,13 @@
     <para>Evolution allows you to edit the label of your calendar, assign color, and copy content for offline use. To set your calendar properties</para>
     <orderedlist>
      <listitem id="b13xybev">
-      <para>Select the calendar from the folder view at the left.</para>
+      <para>Select the calendar from the side bar at the left.</para>
      </listitem>
      <listitem id="b13xyc0b">
-      <para>Right click.</para>
+      <para>Right click on the calendar.</para>
      </listitem>
      <listitem id="b13xyc3r">
-      <para>Select Properties to open Calendar Properties dialogue box.</para>
+      <para>Select Properties to open Calendar Properties dialog box.</para>
       <para></para>
       <para></para>
       <para></para>
@@ -3668,7 +3686,7 @@
       <para>Edit the label from Name field.</para>
      </listitem>
      <listitem id="b13xyirm">
-      <para>To assign a color for the calendar, click the Color tab.</para>
+      <para>To assign a color for the calendar, click the Color button.</para>
      </listitem>
      <listitem id="b13xyj63">
       <para>Select the color and click OK.</para>
@@ -3714,7 +3732,7 @@
       </itemizedlist>
      </listitem>
      <listitem id="b1a4ah6w">
-      <para>Set the time to automatically refresh the calendar. </para>
+      <para>Set the time to automatically refresh the calendar.</para>
      </listitem>
      <listitem id="b1a4ak4r">
       <para>Select Use SSL to enable SSL for communication between Evolution and the Google server.</para>
@@ -3727,7 +3745,7 @@
       <para>If you select this option, you cannot modify or create the calendar items.</para>
      </listitem>
      <listitem id="b1a4awms">
-      <para>Click OK to save your modifications.</para>
+      <para>Click OK.</para>
      </listitem>
     </orderedlist>
    </section>
@@ -3783,25 +3801,26 @@
       <listitem id="bshlods">
        <para>Click File &gt; New &gt; Appointment.</para>
        <para>or</para>
-       <para>Click Calendars on the Switcher, then click New &gt; Appointment.</para>
+       <para>Click Calendars on the Switcher, then click File &gt; New &gt; Appointment.</para>
        <para>or</para>
-       <para>Double-click in a blank space on the calendar view to open an Appointment dialogue box. The appointment is created for that particular time on the calendar view against which you have double clicked on.</para>
+       <para>Double-click in a blank space on the calendar view to open an Appointment dialog box. The particular time on the calendar view against which you have double clicked on will be suggested for the new appointment.</para>
        <para>or</para>
        <para>Select the required duration on the calender view and enter the summary.</para>
       </listitem>
       <listitem id="b10fnwj2">
-       <para>Select a calendar in the Calendar drop-down list. Type a brief summary of the appointment in the Summary field.</para>
+       <para>Select a calendar in the Calendar drop-down list.</para>
+       <para>Enter a brief summary in the Summary field.</para>
        <mediaobject id="b13uby19"><imageobject><imagedata format="PNG" fileref="figures/evo_calender_appointmnt.png"/></imageobject></mediaobject>
        
       </listitem>
       <listitem id="b10fnwru">
-       <para>Type a location for the appointment in the Location field.</para>
+       <para>(Optional) Type a location in the Location field.</para>
       </listitem>
       <listitem id="b13uc0pd">
-       <para>Select the date, time and set the duration</para>
+       <para>Select the date and time.</para>
       </listitem>
       <listitem id="b13uc1k9">
-       <para>Enter a brief summary of the appointment in the description field.</para>
+       <para>Enter a brief summary in the Summary field.</para>
       </listitem>
       <listitem id="b10fnwwl">
        <para>To select this appointment as an all day event, click Options &gt; All Day Event.</para>
@@ -3809,10 +3828,10 @@
        <para>Click the All Day Event button on the toolbar.</para>
       </listitem>
       <listitem id="b10fnxet">
-       <para>If the event is an all day event, specify a starting and ending date.</para>
+       <para>If the event is an all day event, specify a starting date and an ending date.</para>
       </listitem>
       <listitem id="b10fnxkk">
-       <para>If the event is not an all day event, specify a starting and ending time.</para>
+       <para>If the event is not an all day event, specify a starting time and an ending time.</para>
       </listitem>
       <listitem id="b10fnxtn">
        <para>Select For to specify the duration.</para>
@@ -3829,18 +3848,19 @@
        <para>To show the time as busy, click Options &gt; Show Time as Busy.</para>
       </listitem>
       <listitem id="b10fnz0t">
-       <para>(Optional) Type a category in the Categories field. To show or hide the Categories field, click View &gt; Categories.</para>
-       <para>For more information on categories, see <link linkend="bxmtbjb">Classifications</link>.</para>
+       <para>(Optional) Type a category in the Categories field.</para>
+       <para>To show or hide the Categories field, click View &gt; Categories.</para>
       </listitem>
       <listitem id="b10fo1zg">
-       <para>Type a description in the Description field.</para>
+       <para>(Optional) Enter a description in the Description field.</para>
       </listitem>
       <listitem id="b10fo251">
-       <para>To select an alarm for this appointment, click Alarm on the toolbar.</para>
-       <para>If you select an alarm, specify when and how you want the alarm to notify. For more information on reminders, see <link linkend="bshly4v">Reminders</link>.</para>
+       <para>To create an alarm for this appointment, click Alarms on the toolbar, or click Options &gt; Alarms.</para>
+       <para>Select Customize to add or remove customized alarms for the event.</para>
+       <para>For more information on reminders, see <link linkend="bshly4v">Reminders</link>.</para>
       </listitem>
       <listitem id="b10fo3gm">
-       <para>(Optional) To add an attachment to the appointment, drag and drop the attachment into the attachment bar.</para>
+       <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
        <para>or</para>
        <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
       </listitem>
@@ -3890,16 +3910,13 @@
      <para>To create a reminder:</para>
      <orderedlist>
       <listitem id="bxmtait">
-       <para>When creating an appointment, click Alarms on the toolbar, or click Options &gt; Alarms.</para>
-      </listitem>
-      <listitem id="bzz2wmd">
-       <para>Select the alarm for the event.</para>
+       <para>To create an alarm for this appointment, click Alarms on the toolbar, or click Options &gt; Alarms.</para>
       </listitem>
       <listitem id="bzz2xh4">
        <para>Select Customize to add or remove customized alarms for the event.</para>
       </listitem>
      </orderedlist>
-     <para>If you have stored reminders in a local calendar, they work from the moment you log in. However, for reminders stored on any remote server like GroupWise Exchange which requires authentication, you must run Evolution at least once after logging in. No matter where the reminders are stored, you can quit Evolution and still be reminded of an upcoming appointment.</para>
+     <para>If you have stored reminders in a local calendar, they work from the moment you log in. However, for reminders stored on any remote server like GroupWise or Exchange which requires authentication, you must run Evolution at least once after logging in. No matter where the reminders are stored, you can quit Evolution and still be reminded of an upcoming appointment.</para>
     </section>
 
     <section id="bxmtbjb">
@@ -3909,47 +3926,47 @@
      <para>You can categorize appointments in the same way you can categorize contacts.</para>
      <orderedlist>
       <listitem id="bzxwtyr">
-       <para>Type a category in the Categories field.</para>
+       <para>(Optional) Type a category in the Categories field.</para>
       </listitem>
       <listitem id="bsqcyli">
        <para>Select the check box next to each category that matches the appointment you are creating.</para>
       </listitem>
       <listitem id="bzy02er">
-       <para>To show or hide Categories field, click View &gt; Categories.</para>
+       <para>To show or hide the Categories field, click View &gt; Categories.</para>
       </listitem>
      </orderedlist>
      <tip>
       <para>You can add a new category to your category list by clicking Edit Master Category List, then click Click Here To Add A Category.</para>
      </tip>
      <para>After you have selected your categories, click OK to assign these categories to the appointment. The categories you selected are now listed in the text box to the right of the Categories button.</para>
-     <para>Appointments with categories appear with icons in the calendar display, and you can also search for appointments by category. To display only the appointments in a particular category, select Category Is in the search bar at the top of the calendar, and select a category.</para>
+     <para>Appointments with categories appear with icons in the calendar display, and you can also search for appointments by category. To display only the appointments in a particular category, select the corresponding category in the search bar at the top of the calendar.</para>
     </section>
 
     <section id="bxmtcp3">
      <title>Recurrence</title>
      <para>The Recurrence tool button lets you describe repetition in appointments ranging from once every day up to once every 100 years. You can then choose a time and date when the appointment stops recurring, and, under Exceptions, pick individual days when the appointment does not recur. Make your selections from left to right, and you form a sentence: <quote>Every two weeks on Monday and Friday until January 3, 2008</quote> or <quote>Every month on the first Friday for 12 occurrences.</quote></para>
-     <para>After you have finished settings, click the disk icon in the toolbar to save and close the appointment editor window. If you want, you can alter an appointment summary in the calendar view by clicking it and typing. You can change other settings by right-clicking the appointment then choosing Open, or double-clicking the appointment.</para>
+     <para>After you have finished settings, click the Save button in the toolbar to save and close the appointment editor window. If you want, you can alter an appointment summary in the calendar view by clicking it and typing. You can change other settings by right-clicking the appointment then choosing Open, or double-clicking the appointment.</para>
     </section>
    </section>
 
    <section id="usage-calendar-rsvp">
     <title>Sending a Meeting Invitation</title>
     <para>A meeting is an event you schedule for multiple people. Evolution can be used to schedule group meetings and help you manage responses to meeting requests.</para>
-    <para>When you create a meeting or group appointment, you can specify the attendees in several categories, such as <quote>chair</quote> or <quote>required.</quote> When you save the meeting listing, each attendee is sent an e-mail with the meeting information, which also gives them the option to respond.</para>
-    <para>If you don't need to collect attendance information when you're scheduling an event, and would rather just announce the event, right-click the meeting and select Forward as iCalendar. This opens a new e-mail message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it won't automatically send you e-mail about whether they plan to attend.</para>
+    <para>When you create a meeting or group appointment, you can specify the attendees in several categories, such as <quote>chair</quote> or <quote>required</quote>. When you save the meeting listing, each attendee is sent an email with the meeting information, which also gives them the option to respond.</para>
+    <para>If you don't need to collect attendance information when you're scheduling an event, and would rather just announce the event, right-click the meeting and select Forward as iCalendar. This opens a new email message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it won't automatically send you email about whether they plan to attend.</para>
     <para>To schedule a meeting:</para>
     <orderedlist>
      <listitem id="bsb0agm">
       <para>Click File &gt; New &gt; Meeting.</para>
      </listitem>
      <listitem id="bsb0ao0">
-      <para>If you have multiple e-mail accounts, select the one to use by selecting an item in the Organizer field.</para>
+      <para>If you have multiple email accounts, select the one to use by selecting an item in the Organizer field.</para>
      </listitem>
      <listitem id="b10fof8d">
       <para>Select a calendar in the Calendar drop-down list.</para>
      </listitem>
      <listitem id="b10fofba">
-      <para>Click Add to add the e-mail addresses of people you want to invite.</para>
+      <para>Click Add to add the email addresses of people you want to invite.</para>
      </listitem>
      <listitem id="b10fofdk">
       <para>To remove an attendee from the list, select an attendee and press Remove.</para>
@@ -3961,13 +3978,15 @@
       <para>Click View on the menu bar to show or hide the Type, Role, Status, and RSVP fields.</para>
      </listitem>
      <listitem id="b10fofv1">
-      <para>Type summary of the meeting in the Summary field.</para>
+      <para>Enter a brief summary in the Summary field.</para>
      </listitem>
      <listitem id="b10fofxb">
-      <para>Type a location for the meeting in the Location field.</para>
+      <para>(Optional) Type a location in the Location field.</para>
      </listitem>
      <listitem id="b10fofz9">
-      <para>To select this meeting as an all day event, click the All Day Event button on the toolbar.</para>
+       <para>To select this appointment as an all day event, click Options &gt; All Day Event.</para>
+       <para>or</para>
+       <para>Click the All Day Event button on the toolbar.</para>
      </listitem>
      <listitem id="b10fog24">
       <para>If the event is an all day event, specify a starting date and an ending date.</para>
@@ -3976,7 +3995,9 @@
       <para>If the event is not an all day event, specify a starting time and an ending time.</para>
      </listitem>
      <listitem id="bzxwvrs">
-      <para>Select For to specify the duration or select Until to specify the ending time of the event.</para>
+      <para>Select For to specify the duration.</para>
+      <para>or</para>
+      <para>Select Until to specify the ending time of the event.</para>
      </listitem>
      <listitem id="bzxys1w">
       <para>Type the time zone information in the Time Zone field.</para>
@@ -3985,11 +4006,12 @@
       <para>To hide or show the Time Zone field, click View &gt; Time Zone.</para>
      </listitem>
      <listitem id="b10foc50">
-      <para>(Optional) To set an alarm for this meeting, click Alarms on the toolbar, then specify when and how you want to the alarm to notify you.</para>
+      <para>To create an alarm for this appointment, click Alarms on the toolbar, or click Options &gt; Alarms.</para>
+      <para>Select Customize to add or remove customized alarms for the event.</para>
       <para>For more information on reminders, see <link linkend="bshly4v">Reminders</link>.</para>
      </listitem>
      <listitem id="b10fof8e">
-      <para>(Optional) To add an attachment to the appointment, drag and drop the attachment into the attachment bar.</para>
+      <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
       <para>or</para>
       <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
      </listitem>
@@ -4010,9 +4032,9 @@
       <para>Click Save to save the meeting.</para>
      </listitem>
     </orderedlist>
-    <para>An e-mail is sent out to all the recipients, inviting them to your event.</para>
+    <para>An email is sent out to all the recipients, inviting them to your event.</para>
     <note>
-     <para>A meeting can have only one organizer, and only the organizer can add participants. You can designate yourself the organizer of the meeting, but if you are not the original organizer, you can create confusion in the scheduling process. If you want to invite additional people to a meeting without changing the organizer, it is best to forward the first organizer's message to the additional participants.</para>
+     <para>In Evolution, a meeting can have only one organizer, and only the organizer can add participants to that meeting. Though it is possible to change the organizer of a meeting, this is not recommended as a means to invite additional participants to meetings. If you want to invite additional people to a meeting and are not that meeting's organizer, it is recommended that you forward the invitation message you received from the original meeting organiser to additional participants.</para>
     </note>
    </section>
 
@@ -4030,13 +4052,13 @@
       <para>Decline</para>
      </listitem>
     </itemizedlist>
-    <para>Click OK to send an e-mail to the organizer with your answer. The event is also added to your calendar if you accept.</para>
+    <para>Click OK to send an email to the organizer with your answer. The event is also added to your calendar if you accept.</para>
     <para>After you add the meeting to your calendar, you can make changes to the information, but if the original organizer sends out another update, your changes might be overwritten.</para>
    </section>
 
    <section id="receiving-rsvp-response">
     <title>Reading Responses to Meeting Requests</title>
-    <para>When you get a reply to a meeting invitation you sent, you can view it inline by clicking the attachment and selecting View Inline. At the bottom, you can click OK to update your attendee list.</para>
+    <para>When you get a reply to a meeting invitation you sent, you can view it inline by clicking the attachment and selecting View Inline.</para>
    </section>
 
    <section id="usage-calendar-freebusy">
@@ -4048,7 +4070,7 @@
       <para>Click File &gt; New &gt; Meeting.</para>
      </listitem>
      <listitem id="b10foig5">
-      <para>Click Add to add the e-mail addresses of people you want to invite.</para>
+      <para>Click Add to add the email addresses of people you want to invite.</para>
      </listitem>
      <listitem id="bsb0c7x">
       <para>Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy.</para>
@@ -4056,7 +4078,7 @@
       
      </listitem>
      <listitem id="b10fogwo">
-      <para>Adjust the meeting time, either by dragging the meeting borders or by using the Autopick buttons to choose a time automatically, then click Save and Close. Attendees on an Exchange server have the appointment updated automatically; others receive e-mail notification of any change in plans.</para>
+      <para>Adjust the meeting time, either by dragging the meeting borders or by using the Autopick buttons to choose a time automatically, then click Save and Close. Attendees on an Exchange server have the appointment updated automatically; others receive email notification of any change in plans.</para>
      </listitem>
     </orderedlist>
     <formalpara id="bsb0cyw">
@@ -4070,7 +4092,7 @@
 
     <section id="publishing-freebusy">
      <title>Publishing Calendar and Free/Busy Information Without a Groupware Server</title>
-     <para>You can publish Calendar and Free/Busy information to a WebDAV,  FTP server, or remote machine through secure shell or other Web server with HTTP PUT support. Check with your system administrator if you are not sure you have this functionality.</para>
+     <para>You can publish Calendar and Free/Busy information to a WebDAV, FTP server, or remote machine through secure shell or other Web server with HTTP PUT support. Check with your system administrator if you are not sure you have this functionality.</para>
      <para>To set up Calendar or Free/Busy publishing:</para>
      <orderedlist>
       <listitem id="bxpfdeu">
@@ -4097,7 +4119,7 @@
      </orderedlist>
      <para>To immediately publish calendar information, go to the Calendar tool and click Actions &gt; Publish Calendar Information.</para>
      <note>
-      <para>Evolution allows you to specify a template to use when posting to the Free/Busy server.</para>
+      <para>You can specify a template to use when posting to the Free/Busy server.</para>
      </note>
     </section>
 
@@ -4117,10 +4139,10 @@
    </formalpara>
    <orderedlist>
     <listitem id="b131n1cx">
-     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list</para>
+     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
     </listitem>
     <listitem id="b131n2au">
-     <para>Select the search type:</para>
+     <para>Specify the search criteria from any of the following:</para>
      <itemizedlist>
       <listitem>
        <para>Summary contains</para>
@@ -4143,7 +4165,7 @@
    </formalpara>
    <orderedlist>
     <listitem id="b17qblvd">
-     <para>Select the desired search type from the drop-down list.</para>
+     <para>Select the Search menu.</para>
     </listitem>
     <listitem id="b17qbhvy">
      <para>Select Advanced Search to open Advanced Search dialog box.</para>
@@ -4173,7 +4195,7 @@
      <para>Click the Show drop-down list.</para>
     </listitem>
     <listitem id="b131n7gu">
-     <para>Select the search criteria:</para>
+     <para>Select the search criteria from the list:</para>
      <itemizedlist>
       <listitem>
        <para>Any Category</para>
@@ -4209,7 +4231,7 @@
        <para>Goals/Objectives</para>
       </listitem>
       <listitem>
-       <para>Holidays</para>
+       <para>Holiday</para>
       </listitem>
       <listitem>
        <para>Holiday Cards</para>
@@ -4221,7 +4243,7 @@
        <para>International</para>
       </listitem>
       <listitem>
-       <para>Key Customers</para>
+       <para>Key Customer</para>
       </listitem>
       <listitem>
        <para>Miscellaneous</para>
@@ -4258,7 +4280,7 @@
 
   <section id="CHDFEJGG">
    <title>Printing Displayed Items</title>
-   <para>To print the displayed calendar items, click File &gt; Print or right click on the calendar item &gt; Print.</para>
+   <para>To print the displayed calendar items, click File &gt; Print.</para>
   </section>
 
   <section id="bshm4dy">
@@ -4274,7 +4296,7 @@
      <para>In the Calendar, right-click the meeting you want to delegate.</para>
     </listitem>
     <listitem id="bxqatxv">
-     <para>Click Delegate Meetings.</para>
+     <para>Click Delegate Meeting.</para>
     </listitem>
     <listitem id="bxqe3l9">
      <para>Select the contacts you want to delegate the meeting to.</para>
@@ -4283,19 +4305,20 @@
      <para>Click OK.</para>
     </listitem>
    </orderedlist>
-   <para>Each contact receives a copy of the meeting.</para>
+   <para>Each contact receives a copy of the meeting invitation.</para>
   </section>
 
   <section id="usage-calendar-multiple">
    <title>Multiple Calendars, Web Calendars, and CalDAV</title>
    <para>To create a new calendar, click File &gt; New &gt; Calendar. If the calendar is one you plan to store locally, you need only provide a name and color. If it is a remote calendar, specify the name, color, URL, and a refresh frequency. The refresh frequency determines how often Evolution checks to see if the calendar has changed. If you are working with someone who publishes an online calendar, you might want to check for updates every thirty minutes. On the other hand, if you have displayed a sports team schedule in your calendar, you might not need to refresh it more than once a week.</para>
    <para>The <ulink url="http://icalshare.com">icalshare.com Web site</ulink> has an extensive list of shared online calendars, including national and religious holidays, phases of the moon, sports, and local and regional events.</para>
-   <para>Evolution lets you view and manage calendars on remote CalDAV servers such as <trademark class="registered">Hula</trademark>. For more information about Hula, see the <ulink url="http://www.hula-project.org">Hula Project Web site</ulink>. The procedure to create a CalDAV calendar source is similar to that of a remote Web calendar source. You can view and create calendar events on CalDav accounts just like other calendars on Evolution.</para>
+   <para>Evolution lets you view and manage calendars on remote CalDAV servers. The procedure to create a CalDAV calendar source is similar to that of a remote Web calendar source. You can view and create calendar events on CalDav accounts just like other calendars on Evolution.</para>
   </section>
 
   <section id="usage-calendar-todo">
    <title>The Task List</title>
-   <para>The Task List, located in the lower-right corner of the calendar, lets you keep a list of tasks separate from your calendar appointments. You can use the list in a larger window by clicking the Tasks button in the switcher or in the folder tree.</para>
+   <para>The Task List, located in the upper-right corner of the calendar, lets you keep a list of tasks separate from your calendar appointments.</para>
+   <para>You can use the list in a larger window by clicking the Tasks button in the side bar.</para>
    <para>Task Lists are more easily organized in the dedicated Tasks tool. Each task list is assigned a color, and you can use the Tasks tool switcher to hide and show task lists just like calendars. In the calendar display task pad, tasks from all visible task lists appear, color coded by list.</para>
    <itemizedlist>
     <listitem>
@@ -4325,26 +4348,26 @@
       <para>Click OK.</para>
      </listitem>
     </orderedlist>
-    <para>After you have added a task to your to-do list, its summary appears in the Summary section of the task list. To view or edit a detailed description of an item, double-click it, or right-click it and select Open. You can delete items by selecting them, then clicking Delete.The list of tasks is sorted in a similar way to the list of e-mail messages in Evolution Mail. Click once on a message header to change the direction and type of sorting, or right-click to add or remove columns from the display.</para>
+    <para>After you have added a task to your to-do list, its summary appears in the Summary section of the task list. To view or edit a detailed description of an item, double-click it, or right-click it and select Open. You can delete items by selecting them, then clicking Delete. The list of tasks is sorted in a similar way to the list of email messages in Evolution Mail. Click once on a message header to change the direction and type of sorting, or right-click to add or remove columns from the display.</para>
    </section>
 
    <section id="task-folders">
     <title>Creating a New Task</title>
     <orderedlist>
      <listitem id="b10155hr">
-      <para>Click New &gt; Task.</para>
+      <para>Click File &gt; New &gt; Task.</para>
      </listitem>
      <listitem id="b10155hs">
       <para>Select a group for the task.</para>
      </listitem>
      <listitem id="b10155ht">
-      <para>Type a brief summary for the task in the Summary field.</para>
+      <para>Enter a brief summary in the Summary field.</para>
      </listitem>
      <listitem id="b10155hu">
-      <para>(Optional) Specify a starting date and ending date for the task</para>
+      <para>(Optional) Specify a starting date and ending date for the task.</para>
      </listitem>
      <listitem id="b10155hv">
-      <para>(Optional) Specify a starting time and ending time for the task</para>
+      <para>(Optional) Specify a starting time and ending time for the task.</para>
      </listitem>
      <listitem id="b10fqh6l">
       <para>Type the time zone information in the Time Zone field.</para>
@@ -4357,18 +4380,18 @@
       <para>To show or hide the Categories field, click View &gt; Categories.</para>
      </listitem>
      <listitem id="b10155hy">
-      <para>Type a description for the task.</para>
+      <para>(Optional) Enter a description in the Description field.</para>
      </listitem>
      <listitem id="b10155hz">
-      <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential) for the task.</para>
+      <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential).</para>
      </listitem>
      <listitem id="b10155i0">
       <para>(Optional) To specify a status for the task, click Options &gt; Status Details.</para>
      </listitem>
      <listitem id="b10fqh6m">
-      <para>(Optional) To add an attachment to the task, drag and drop the attachment into the attachment bar.</para>
+      <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
       <para>or</para>
-      <para>Click the Attach button on the toolbar, then browse to the attachment.</para>
+      <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
      </listitem>
     </orderedlist>
    </section>
@@ -4376,23 +4399,23 @@
    <section id="b1012vcx">
     <title>Assigned Tasks</title>
     <para>Evolution can be used to assign a task to multiple people.</para>
-    <para>When you assign a task, you can specify the attendees in several categories, such as <quote>chair</quote> or <quote>required.</quote> When you save the task, each attendee is sent an e-mail with the task information, which also gives them the option to respond.</para>
+    <para>When you assign a task, you can specify the attendees in several categories, such as <quote>chair</quote> or <quote>required.</quote> When you save the task, each attendee is sent an email with the task information, which also gives them the option to respond.</para>
     <para>To assign a new task:</para>
     <orderedlist>
      <listitem id="b1012vcy">
       <para>Click File &gt; New &gt; Assigned Task.</para>
      </listitem>
      <listitem id="b1012vcz">
-      <para>If you have multiple e-mail accounts, select the one to use by selecting an item in the Organizer field.</para>
+      <para>If you have multiple email accounts, select the one to use by selecting an item in the Organizer field.</para>
      </listitem>
      <listitem id="b1012vd0">
       <para>Select a group for the task.</para>
      </listitem>
      <listitem id="b1012vd1">
-      <para>Click Add, or press Insert key, or right click and then press Add to add the e-mail addresses of people you want to assign the task.To remove an attendee from the list, select an attendee, then press Remove.To edit a field, select the field, then click Edit.Click View on the menu bar to show or hide the Type, Role, Status, and RSVP fields.</para>
+      <para>Click Add, or press Insert key, or right click and then press Add to add the email addresses of people you want to assign the task. To remove an attendee from the list, select an attendee, then press Remove. To edit a field, select the field, then click Edit. Click View on the menu bar to show or hide the Type, Role, Status, and RSVP fields.</para>
      </listitem>
      <listitem id="b1012vd2">
-      <para>Type a brief summary of the task in the Summary field.</para>
+      <para>Enter a brief summary in the Summary field.</para>
      </listitem>
      <listitem id="b1012vd3">
       <para>(Optional) Specify a starting date and time, and a due date and time for the task.</para>
@@ -4405,18 +4428,18 @@
      </listitem>
      <listitem id="b1012vd6">
       <para>(Optional) Type a category in the Categories field.</para>
-      <para>To show or hide Categories field, click View &gt; Categories.</para>
+      <para>To show or hide the Categories field, click View &gt; Categories.</para>
      </listitem>
      <listitem id="b1012vd7">
-      <para>Type a description for the task.</para>
+      <para>(Optional) Enter a description in the Description field.</para>
      </listitem>
      <listitem id="b10fqh6o">
-      <para>(Optional) To add an attachment to the assigned task, drag and drop the attachment into the attachment bar. </para>
+      <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
       <para>or</para>
-      <para>Click the Attach button on the toolbar, then browse to the attachment.</para>
+      <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
      </listitem>
      <listitem id="b10fqh6p">
-      <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential) for the task.</para>
+      <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential).</para>
      </listitem>
      <listitem id="b1012vda">
       <para>(Optional) To specify a status for the task, click Options &gt; Status Details.</para>
@@ -4432,10 +4455,10 @@
     </formalpara>
     <orderedlist>
      <listitem id="b17qcy7p">
-      <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list</para>
+      <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
      </listitem>
      <listitem id="b17qcyfg">
-      <para>Select the search type:</para>
+      <para>Specify the search criteria from any of the following:</para>
       <itemizedlist>
        <listitem>
         <para>Summary contains</para>
@@ -4454,10 +4477,11 @@
     </orderedlist>
     <formalpara id="b17qczaw">
      <title>Advanced Search:</title>
-     <para>You can perform an advanced search based on any of the search type.</para>
+     <para>You can perform an advanced search based on any of the search types.</para>
     </formalpara>
     <orderedlist>
      <listitem id="b17qczhr">
+      <para>Select the Search menu.</para>
       <para>Select Advanced Search to open Advanced Search dialog box.</para>
       <para>Search name field displays the search type you have selected.</para>
       <mediaobject id="b17qcztn"><imageobject><imagedata format="PNG" fileref="figures/evo_cal_advsearch.png"/></imageobject></mediaobject>
@@ -4501,7 +4525,7 @@
     </formalpara>
     <formalpara id="b17qei0d">
      <title>Tasks With Attachment:</title>
-     <para>It shows all the tasks with attachments.</para>
+     <para>Displays all the tasks with attachments.</para>
     </formalpara>
     <formalpara id="b17qejz7">
      <title>&lt;List of Categories&gt;:</title>
@@ -4513,7 +4537,7 @@
       <para>Click the Show drop-down list from the Search bar.</para>
      </listitem>
      <listitem id="b17qd0wm">
-      <para>Select the search criteria:</para>
+      <para>Select the search criteria from the list:</para>
       <itemizedlist>
        <listitem>
         <para>Any Category</para>
@@ -4616,41 +4640,41 @@
      <para>Click File &gt; New &gt; Memo.</para>
     </listitem>
     <listitem id="b1012vdf">
-     <para>Select a group in which you would create a memo entry.</para>
+     <para>Select the Group in which you would like to create the entry.</para>
     </listitem>
     <listitem id="b1012vdg">
      <para>(Optional) Type a category in the Categories field.</para>
      <para>To show or hide Categories field, click View &gt; Categories.</para>
     </listitem>
     <listitem id="b1012vdh">
-     <para>Type text for the memo in the Summary field.</para>
+     <para>Enter a brief summary in the Summary field.</para>
     </listitem>
     <listitem id="b15ilfa0">
      <para>In the Start Date field, type the date this reminder note should appear in the recipients' Calendars.</para>
     </listitem>
     <listitem id="b15ilpb6">
-     <para>Type text for the memo in the Memo Content field.</para>
+     <para>(Optional) Enter a description in the Description field.</para>
     </listitem>
     <listitem id="b10fqh6q">
-     <para>(Optional) To add an attachment to the memo, drag and drop the attachment into the attachment bar.</para>
+     <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
      <para>or</para>
-     <para>Click the Attach button on the toolbar, then browse to the attachment.</para>
+     <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
     </listitem>
     <listitem id="b10fqh6r">
-     <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential) for the memo.</para>
+     <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential).</para>
     </listitem>
    </orderedlist>
 
    <section id="b1012vdk">
     <title>The Memo List</title>
-    <para>As with calendars and tasks, you can create multiple memo lists. Each memo list is assigned a color, and you can use the Memos switcher to hide and show memos.</para>
-    <para>To create a new memo list: </para>
+    <para>As with calendars and tasks, you can create multiple memo lists. Each memo list is assigned a color, and you can use the side bar to hide and show memo lists.</para>
+    <para>To create a new memo list:</para>
     <orderedlist>
      <listitem id="b1012vdl">
       <para>Click File &gt; New &gt; Memo List.</para>
      </listitem>
      <listitem id="b1012vdm">
-      <para>Type the group, name and color for the memo list.</para>
+      <para>Enter the type, name and color for the memo list.</para>
      </listitem>
      <listitem id="b1012vdo">
       <para>Click OK.</para>
@@ -4667,10 +4691,10 @@
     </formalpara>
     <orderedlist>
      <listitem id="b17qers6">
-      <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list</para>
+      <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
      </listitem>
      <listitem id="b17qerzd">
-      <para>Select the search type:</para>
+      <para>Specify the search criteria from any of the following:</para>
       <itemizedlist>
        <listitem>
         <para>Summary contains</para>
@@ -4702,10 +4726,10 @@
       
      </listitem>
      <listitem id="b17qetof">
-      <para>Click Add to add rules. </para>
+      <para>Click Add to add rules.</para>
      </listitem>
      <listitem id="b17qewzp">
-      <para>Select the criteria, then type a search entry in the given field.</para>
+      <para>Select the criteria, and then type a search entry in the given field.</para>
      </listitem>
      <listitem id="b17qexap">
       <para>Click OK.</para>
@@ -4715,7 +4739,7 @@
      </listitem>
     </orderedlist>
     <formalpara id="b17qeyur">
-     <title>Quick Search: </title>
+     <title>Quick Search:</title>
      <para>Displays all the Memo items that match the criteria that you have selected from the Show drop-down list in the Search bar.</para>
     </formalpara>
     <orderedlist>
@@ -4723,7 +4747,7 @@
       <para>Click the Show drop-down list.</para>
      </listitem>
      <listitem id="b17qezl9">
-      <para>Select the search criteria:</para>
+      <para>Select the search criteria from the list:</para>
       <itemizedlist>
        <listitem>
         <para>Any Category</para>
@@ -4821,7 +4845,7 @@
 
   <section id="bxqaqja">
    <title>Marcus Bains Line</title>
-   <para>The Marcus Bains Line is a marker to show the current date and time. This feature is now available in the Evolution calendar.</para>
+   <para>The Marcus Bains Line is a marker to show the current date and time. This feature is available in the Evolution calendar.</para>
   </section>
  </chapter>
 
@@ -4882,19 +4906,19 @@
       <listitem>
        <formalpara id="b10fqio8">
         <title>Viewing Mail in Exchange Folders:</title>
-        <para>Mail stored on the Exchange server is visible in the Mail component in Evolution. </para>
+        <para>Mail stored on the Exchange server is visible in the Mail component in Evolution.</para>
        </formalpara>
       </listitem>
       <listitem>
        <formalpara id="b10fqiuh">
-        <title>Sending E-mail via Exchange Protocols:</title>
-        <para>If you use the Microsoft Exchange mail transport protocol to send e-mail, make sure that the address you have entered as your e-mail address is exactly the one that the Exchange server has on file. This might be <quote>yourname@exchange-server.example.com</quote> rather than <quote>yourname@example.com.</quote></para>
+        <title>Sending Email via Exchange Protocols:</title>
+        <para>If you use the Microsoft Exchange mail transport protocol to send email, make sure that the address you have entered as your email address is exactly the one that the Exchange server has on file. This might be <quote>yourname@exchange-server.example.com</quote> rather than <quote>yourname@example.com.</quote></para>
        </formalpara>
       </listitem>
       <listitem>
        <formalpara id="b13pa41j">
         <title>Out of Office Message:</title>
-        <para>You can set <quote>out of Office</quote> message that will automatically be sent to people who send mails to you while you are away from office.</para>
+        <para>You can set <quote>out of Office</quote> message that will automatically be sent to people who send mail to you while you are away from office.</para>
        </formalpara>
       </listitem>
       <listitem>
@@ -4928,13 +4952,13 @@
       <listitem>
        <formalpara id="b10fqjzj">
         <title>Address Completion:</title>
-        <para>Supported for your Exchange Contacts folder. </para>
+        <para>Supported for your Exchange Contacts folder.</para>
        </formalpara>
       </listitem>
       <listitem>
        <formalpara id="b10fqk4l">
         <title>Adding vCards to the Address Book:</title>
-        <para>Allows you to save the vCards you receive in attachment to your Exchange address book.New Address Book entries can also be created on Exchange from received e-mail messages with a single click.</para>
+        <para>Allows you to save the vCards you receive in attachment to your Exchange address book.New Address Book entries can also be created on Exchange from received email messages with a single click.</para>
        </formalpara>
       </listitem>
      </itemizedlist>
@@ -5001,7 +5025,7 @@
      <title>Creating a New Exchange Account</title>
      <orderedlist>
       <listitem id="bshnbof">
-       <para>Click Edit &gt; Preferences or press Shift+Ctrl+S</para>
+       <para>Select Edit &gt; Preferences.</para>
       </listitem>
       <listitem id="bshnbsi">
        <para>Click Add.</para>
@@ -5010,30 +5034,12 @@
       </listitem>
       <listitem id="bshnbxz">
        <para>Create the account following the procedure in <link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link>. Remember to select Microsoft Exchange as server type in the Receiving Mail section.</para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
        <mediaobject id="bs4aw7k"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-mails.png"/></imageobject></mediaobject>
        
       </listitem>
      </orderedlist>
      <note>
-      <para>You may configure only Only one Microsoft Exchange account can be configured in Evolution.</para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
-      <para></para>
+      <para>Only one Microsoft Exchange account can be configured in Evolution.</para>
      </note>
      <mediaobject id="bs4aw7l"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-options.png"/></imageobject></mediaobject>
      
@@ -5044,42 +5050,19 @@
      <para>Use the following procedure to configure your existing account for Evolution Exchange:</para>
      <orderedlist>
       <listitem id="bsqdqje">
-       <para>Click Edit &gt; Preferences or press Shift+Ctrl+S, then click Mail Accounts.</para>
+       <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
       </listitem>
       <listitem id="bsqdqvl">
        <para>Select the account you want to convert, then click Edit to appear the Account Editor.</para>
        <para>You can view Identity tab enabled.</para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
        <mediaobject id="b13p90wc"><imageobject><imagedata format="PNG" fileref="figures/exchg-identity.png"/></imageobject></mediaobject>
        
       </listitem>
       <listitem id="bshngg7">
-       <para>Change your e-mail address as needed.</para>
+       <para>Change your email address as needed.</para>
       </listitem>
       <listitem id="bshngsm">
        <para>Click the Receiving Mail tab, then select Microsoft Exchange as your server type.</para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
        <mediaobject id="b13pb2z0"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-mail.png"/></imageobject></mediaobject>
        
       </listitem>
@@ -5087,21 +5070,13 @@
        <para>Type your user name, and the Outlook Web Access (OWA) URL. Click Authenticate, then enter the password at the prompt. The Exchange server authenticates your account.</para>
       </listitem>
       <listitem id="bxpfgk7">
-       <para>Select your authentication method.</para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
+       <para>Select your authentication type in the Authentication list.</para>
        <mediaobject id="b13pb4ri"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-option.png"/></imageobject></mediaobject>
        
       </listitem>
       <listitem id="bshnhvg">
-       <para>Click the Receiving Options tab, then specify how often to check for new mail, your Global Catalog server name and whether to apply filters to messages in your Inbox, check for junk, set a password expiry period, and any other settings you want to include.</para>
+       <para>Click the Receiving Options tab.</para>
+       <para>Specify how often to check for new mail, your Global Catalog server name and whether to apply filters to messages in your Inbox, check for junk, set a password expiry period, and any other settings you want to include.</para>
       </listitem>
       <listitem id="bshnjw0">
        <para>Use the Defaults tab to define folders, send cc: or bcc: messages to certain IDs, and set options for message receipts.</para>
@@ -5121,7 +5096,7 @@
   <section id="access">
    <title>Accessing the Exchange Server</title>
    <para>When you have installed Evolution Exchange, you can access public folders and perform certain Exchange actions like delegation and password management, and subscribing to other user's calendars, tasks, and contact folders. You can also carry out any folder-related operations like adding, deleting, and renaming folders, and selecting folder permissions on calendars, tasks, and contact folders. Use the regular Mail tool for mail, the Contacts tool for contacts, and the Calendar tool for setting schedules.</para>
-   <para>If you are using both an Exchange account and a local mail account, you should be aware that whenever you save an e-mail address or appointment from an e-mail message, it is saved in your Exchange contacts list or calendar, rather than in your local account. The same is true for synchronization with Palm OS devices; tasks, and appointments.Addresses from your Palm OS device are synchronized in the Exchange folders rather than in local folders.</para>
+   <para>If you are using both an Exchange account and a local mail account, you should be aware that whenever you save an email address or appointment from an email message, it is saved in your Exchange contacts list or calendar, rather than in your local account. The same is true for synchronization with Palm OS devices; tasks, and appointments.Addresses from your Palm OS device are synchronized in the Exchange folders rather than in local folders.</para>
    <para>To avoid unnecessary strain on the server, the Global Address List (GAL) appears empty until you search for something in it.</para>
    <para></para>
   </section>
@@ -5190,10 +5165,10 @@
        </important>
        <orderedlist>
         <listitem id="b17qwr4g">
-         <para>Click User to open Show Contacts dialogue box.</para>
+         <para>Click User to open Show Contacts dialog box.</para>
         </listitem>
         <listitem id="b17qwruz">
-         <para>Select the contact from the desired Address book and click Add, then close the dialogue box.</para>
+         <para>Select the contact from the desired Address book and click Add, then close the dialog box.</para>
          <warning>
           <para>You are not permitted to send a message on behalf of more than one person at a time.</para>
          </warning>
@@ -5208,7 +5183,7 @@
        <para>Select the Request a read receipt for this message to get a read receipt for the message you have sent.</para>
       </listitem>
       <listitem id="b15flpzo">
-       <para>Click OK to confirm your selection.</para>
+       <para>Click OK.</para>
       </listitem>
      </orderedlist>
     </section>
@@ -5224,10 +5199,11 @@
        <para>Open a new Meeting composer window.</para>
       </listitem>
       <listitem id="b17ren0l">
-       <para>Add the recipients. </para>
+       <para>Add the recipients.</para>
       </listitem>
       <listitem id="b17renoo">
-       <para>Fill in the information, then click Send.</para>
+       <para>Fill in the information.</para>
+       <para>Click Send.</para>
        <para>When the recipient receives the calendar item, a message indicates that the item was created by someone on behalf of the Delegator.</para>
       </listitem>
      </orderedlist>
@@ -5243,7 +5219,10 @@
      <para>To add someone to your list of delegates:</para>
      <orderedlist>
       <listitem id="bxpfj0n">
-       <para>Click Edit &gt; Preferences or press Shift+Ctrl+S, then click the Exchange Settings tab.</para>
+       <para>Select Edit &gt; Preferences.</para>
+      </listitem>
+      <listitem id="bxpfj0o">
+       <para>Click the Exchange Settings tab.</para>
       </listitem>
       <listitem id="b17qx94g">
        <para>Click Delegation Assistant to open the Delegates dialog box.</para>
@@ -5295,7 +5274,7 @@
        
       </listitem>
       <listitem id="bshokwk">
-       <para>Specify the e-mail address of the user who has delegated to you, or click User to select the user from your address book.</para>
+       <para>Specify the email address of the user who has delegated to you, or click User to select the user from your address book.</para>
       </listitem>
       <listitem id="bshol98">
        <para>Select the folder you want to open.</para>
@@ -5336,15 +5315,15 @@
 
    <section id="b13pnzby">
     <title>Reminders</title>
-    <para>Reminders for meetings in your Exchange calendar do not work until you have run Evolution at least once after logging in. This is different from locally stored reminders, which work from the moment you log in, regardless of whether you have run Evolution in the session.so that you can fix a convenient time for a meeting.To enable Reminder setting in your Exchange account, select <guilabel>Remember the password</guilabel> checkbox. To find more information about Reminders see<link linkend="bshly4v">Reminders</link></para>
+    <para>Reminders for meetings in your Exchange calendar do not work until you have run Evolution at least once after logging in. This is different from locally stored reminders, which work from the moment you log in, regardless of whether you have run Evolution in the session so that you can fix a convenient time for a meeting. To enable Reminder setting in your Exchange account, select <guilabel>Remember the password</guilabel> checkbox. To find more information about Reminders see<link linkend="bshly4v">Reminders</link>.</para>
    </section>
 
    <section id="exchange-out-of-office">
     <title>Setting an Out of Office Message</title>
-    <para>An Out of Office message is an automatic reply that you can send as a reply to messages, explaining why you aren't immediately responding to their messages. For example, if you go on vacation for a week and won't access your e-mail, you can set an automatic reply so that people know that you aren't ignoring them.</para>
+    <para>An Out of Office message is an automatic reply that you can send as a reply to messages, explaining why you are not immediately responding to their messages. For example, if you go on vacation for a week and will not access your email, you can set an automatic reply so that people know that you are not ignoring them.</para>
     <orderedlist>
      <listitem id="bsbgb7t">
-      <para>Click Edit &gt; Preferences &gt; Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bxn8hun">
       <para>Select the Exchange account, then click Edit.</para>
@@ -5497,10 +5476,10 @@
        <para>Address Completion is supported for your GroupWise address books, including the System address book, the Frequent Contacts address book, and your personal address book.</para>
       </listitem>
       <listitem>
-       <para>If you receive a card attachment and click Save in Address Book, it is saved to your Personal address book. New Address Book entries can also be added to your personal address book from received E-mail messages.</para>
+       <para>If you receive a card attachment and click Save in Address Book, it is saved to your Personal address book. New Address Book entries can also be added to your personal address book from received Email messages.</para>
       </listitem>
       <listitem>
-       <para>To create your GroupWise Frequent contacts and Personal address books, you need to access your GroupWise account once through GroupWise Java client because Evolution currently does not support creating them.The GroupWise system address book is marked for offline use by default.This boosts performance.</para>
+       <para>To create your GroupWise Frequent contacts and Personal address books, you need to access your GroupWise account once through GroupWise Java client because Evolution currently does not support creating them. The GroupWise system address book is marked for offline use by default.This boosts performance.</para>
       </listitem>
      </itemizedlist>
     </listitem>
@@ -5627,7 +5606,7 @@
     <title>Creating a New GroupWise Account</title>
     <orderedlist>
      <listitem id="bv7wb3t">
-      <para>Click Edit &gt; Preferences, then click Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bv7wbac">
       <para>Click Add.</para>
@@ -5640,21 +5619,21 @@
 
    <section id="buw5x0k">
     <title>Changing an Existing Account to Work with GroupWise</title>
-    <para>If you have an existing e-mail account, and want to convert it to use with GroupWise:</para>
+    <para>If you have an existing email account, and want to convert it to use with GroupWise:</para>
     <orderedlist>
      <listitem id="buw5x0l">
-      <para>Click Edit &gt; Preferences, then click Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="buw5x0m">
       <para>Select the account you want to convert, then click Edit.</para>
      </listitem>
      <listitem id="buw5x0n">
-      <para>Click the Identity tab. </para>
+      <para>Click the Identity tab.</para>
       <mediaobject id="bv7wbfs"><imageobject><imagedata format="PNG" fileref="figures/evo_identityedit_a.png"/></imageobject></mediaobject>
       
      </listitem>
      <listitem id="bxpfqzp">
-      <para>Change your e-mail address as needed.</para>
+      <para>Change your email address as needed.</para>
      </listitem>
      <listitem id="buw5x0o">
       <para>Click the Receiving Email tab, then select Novell GroupWise as your server type.</para>
@@ -5668,7 +5647,8 @@
       </note>
      </listitem>
      <listitem id="bsthkyr">
-      <para>Click the Receiving Options tab, then select if you want Evolution to automatically check for new mail.</para>
+      <para>Click the Receiving Options tab.</para>
+      <para>Select if you want Evolution to automatically check for new mail.</para>
       <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
       <mediaobject id="bv7wc82"><imageobject><imagedata format="PNG" fileref="figures/evo_gwreceiveoptedit_a.png"/></imageobject></mediaobject>
       
@@ -5677,7 +5657,7 @@
       <para>Select if you want to check for new messages in all folders.</para>
      </listitem>
      <listitem id="bv7wbr9">
-      <para>Select if you want to apply filters to new messages in the Inbox on the server.</para>
+      <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
       <para>For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
      </listitem>
      <listitem id="bv7wbto">
@@ -5702,7 +5682,8 @@
       <para>(Optional) Click the Proxy tab, then click Add to add any Proxy users to your account.</para>
      </listitem>
      <listitem id="buw5x0s">
-      <para>Click OK, then click Close.</para>
+      <para>Click OK.</para>
+      <para>Click Close.</para>
      </listitem>
     </orderedlist>
    </section>
@@ -5720,7 +5701,7 @@
    <para>To send a Reminder Note,</para>
    <orderedlist>
     <listitem id="b15ijcgi">
-     <para>Click New &gt; Shared Memo to open the new window.</para>
+     <para>Click File &gt; New &gt; Shared Memo.</para>
     </listitem>
     <listitem id="b15ijcow">
      <para>Select the Organizer's account name from the drop-down list given next to the Organizer field.</para>
@@ -5729,10 +5710,10 @@
      <para>In the To field, type a username, then press Enter. Repeat for additional users.</para>
     </listitem>
     <listitem id="b15ijfl9">
-     <para>Select the Group in which you would create the entry.</para>
+     <para>Select the Group in which you would like to create the entry.</para>
     </listitem>
     <listitem id="b15ijg02">
-     <para>Enter a brief description about the Reminder Note in the Summary field.</para>
+     <para>Enter a brief summary in the Summary field.</para>
     </listitem>
     <listitem id="b15ijgcw">
      <para>In the Start Date field, type the date this reminder note should appear in the recipients' Calendars.</para>
@@ -5741,7 +5722,7 @@
      <para>Specify the category that the Reminder note falls under.</para>
     </listitem>
     <listitem id="b15ijkkf">
-     <para>Enter the description for the Reminder Note.</para>
+     <para>(Optional) Enter a description in the Description field.</para>
     </listitem>
     <listitem id="b15ijkqc">
      <para>Click Save.</para>
@@ -5764,7 +5745,7 @@
      <para>Click Actions &gt; Schedule Meeting.</para>
     </listitem>
     <listitem id="bv7wato">
-     <para>Add attendees, either by entering their e-mail addresses into the list, or by clicking the Invite Others button.</para>
+     <para>Add attendees, either by entering their email addresses into the list, or by clicking the Invite Others button.</para>
     </listitem>
     <listitem id="bv7wb0h">
      <para>Click Options, then click Update Free/Busy to check participant schedules and, if possible, update the meeting in all participants' calendars.</para>
@@ -5793,15 +5774,15 @@
     </listitem>
    </itemizedlist>
    <important>
-    <para>You can manage your sent items for GroupWise e-mail only if the recipient is located on the same GroupWise system as you.</para>
+    <para>You can manage your sent items for GroupWise email only if the recipient is located on the same GroupWise system as you.</para>
    </important>
 
    <section id="Aaez1x0">
     <title>Confirming Delivery of Items You have Sent</title>
-    <para>Evolution provides several ways for you to confirm that your item was delivered. You can easily track message status of any message you have sent. For example, you can see when an e-mail was delivered and when the recipient opened or deleted the e-mail.</para>
+    <para>Evolution provides several ways for you to confirm that your item was delivered. You can easily track message status of any message you have sent. For example, you can see when an email was delivered and when the recipient opened or deleted the email.</para>
     <formalpara id="b17sa0q2">
      <title>Track an Item You Sent:</title>
-     <para> You can check the status in the Message Status window of an e-mail you have sent.</para>
+     <para> You can check the status in the Message Status window of an email you have sent.</para>
     </formalpara>
     <formalpara id="b17sa0y1">
      <title>Receive Notification When the Item is Opened or Deleted:</title>
@@ -5809,14 +5790,15 @@
     </formalpara>
     <formalpara id="b17sa1iu">
      <title>Request a Reply:</title>
-     <para>You can inform the recipient that you need a reply to an e-mail. Evolution adds a sentence to the item stating that a reply is requested and changes the icon in the recipient's Mailbox to a double arrow. For information, see <link linkend="Ak05sv1">Requesting a Reply for Items You Send</link>.</para>
+     <para>You can inform the recipient that you need a reply to an email. Evolution adds a sentence to the item stating that a reply is requested and changes the icon in the recipient's Mailbox to a double arrow. For information, see <link linkend="Ak05sv1">Requesting a Reply for Items You Send</link>.</para>
     </formalpara>
 
     <section id="b17qstbk">
      <title>Enabling Status Tracking</title>
      <orderedlist>
       <listitem id="b17qt8ih">
-       <para>In the Compose Message window, click Insert &gt; Send Options &gt; Status Tracking</para>
+       <para>In the Compose Message window, click Insert &gt; Send Options.</para>
+       <para>Select Status Tracking.</para>
        <mediaobject id="b17qsuu3"><imageobject><imagedata format="PNG" fileref="figures/evo_gwstatustrack.png"/></imageobject></mediaobject>
        
       </listitem>
@@ -5844,7 +5826,7 @@
      <title>Checking the Status of an Item You Have Sent</title>
      <orderedlist>
       <listitem id="Aaezj33">
-       <para>Right-click an e-mail in your Sent folder, then click Track Message Status.</para>
+       <para>Right-click an email in your Sent folder, then click Track Message Status.</para>
        <para>With Message Tracking, you know when the item reaches the recipients or is read by them. You also know exactly who received your message, who read your message, and who deleted it and when.</para>
       </listitem>
      </orderedlist>
@@ -5852,7 +5834,7 @@
    </section>
 
    <section id="bv7v0t1">
-    <title>Changing the Priority of an E-Mail</title>
+    <title>Changing the Priority of an Email</title>
     <orderedlist>
      <listitem id="bv7vmrv">
       <para>In the Compose Message window, click Insert &gt; Send Options.</para>
@@ -5908,7 +5890,7 @@
       <para>Click the Sent Items folder in the Folder List.</para>
      </listitem>
     </orderedlist>
-    <para>All sent items reside in this folder unless you select a different folder for sent e-mail in the account editor default settings. For more information, refer to <link linkend="b17s9qmz">Changing Default Folder for Sent and Draft Items</link> under <link linkend="b13uhy6r">Default Settings</link>.</para>
+    <para>All sent items reside in this folder unless you select a different folder for sent email in the account editor default settings. For more information, refer to <link linkend="b17s9qmz">Changing Default Folder for Sent and Draft Items</link> under <link linkend="b13uhy6r">Default Settings</link>.</para>
    </section>
    <section id="bxjm31g">
     <title>Delegating an Item</title>
@@ -6058,7 +6040,7 @@
     <title>Adding and Removing Proxy Names and Rights in Your Proxy List</title>
     <orderedlist>
      <listitem id="Aai4s3e">
-      <para>Click Edit &gt; Preferences, then click Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bxmtp5i">
       <para>Select the GroupWise account to edit, then click Edit.</para>
@@ -6078,7 +6060,8 @@
       <para>Repeat <link linkend="Aai4sat">Step 4</link> and <link linkend="Aai4sll">Step 5</link> to assign rights to each user in the Proxy List.</para>
      </listitem>
      <listitem id="Aai4sse">
-      <para>Click OK, then click Close.</para>
+      <para>Click OK.</para>
+      <para>Click Close.</para>
      </listitem>
     </orderedlist>
     <para>To delete a user from the Proxy List, select the user, then click Remove User.</para>
@@ -6125,7 +6108,7 @@
 
   <section id="bxqwde6">
    <title>Junk Mail Handling</title>
-   <para>Junk mail handling for GroupWise accounts is a little different then other junk mail handling. When you mark an item as junk mail in GroupWise, the item is added to your junk list in the GroupWise system. Because these settings are on the GroupWise system, your junk list follows you from computer to computer.</para>
+   <para>Junk mail handling for GroupWise accounts is a little different than other junk mail handling. When you mark an item as junk mail in GroupWise, the item is added to your junk list in the GroupWise system. Because these settings are on the GroupWise system, your junk list follows you from computer to computer.</para>
    <itemizedlist>
     <listitem>
      <para><link linkend="bxqwfae">Marking a Message As Junk Mail</link></para>
@@ -6137,10 +6120,10 @@
      <para><link linkend="bxqwfgd">Enabling or Disabling Your Junk Mail List</link></para>
     </listitem>
     <listitem>
-     <para><link linkend="bxqwjg6">Adding an E-Mail Address to Your Junk List</link></para>
+     <para><link linkend="bxqwjg6">Adding an Email Address to Your Junk List</link></para>
     </listitem>
     <listitem>
-     <para><link linkend="bxqwk0f">Removing an E-Mail Address from Your Junk List</link></para>
+     <para><link linkend="bxqwk0f">Removing an Email Address from Your Junk List</link></para>
     </listitem>
    </itemizedlist>
 
@@ -6184,13 +6167,13 @@
    </section>
 
    <section id="bxqwjg6">
-    <title>Adding an E-Mail Address to Your Junk List</title>
+    <title>Adding an Email Address to Your Junk List</title>
     <orderedlist>
      <listitem id="bxqwjmf">
       <para>Right-click a message, then click Junk Mail Settings.</para>
      </listitem>
      <listitem id="bxqwjq0">
-      <para>Type the e-mail address to block in the Email field.</para>
+      <para>Type the email address to block in the Email field.</para>
      </listitem>
      <listitem id="bxqwju6">
       <para>Click Add, then click OK.</para>
@@ -6199,13 +6182,13 @@
    </section>
 
    <section id="bxqwk0f">
-    <title>Removing an E-Mail Address from Your Junk List</title>
+    <title>Removing an Email Address from Your Junk List</title>
     <orderedlist>
      <listitem id="bxqwkeq">
       <para>Right-click a message, then click Junk Mail Settings.</para>
      </listitem>
      <listitem id="bxqwker">
-      <para>Select the e-mail address to remove, then click Remove.</para>
+      <para>Select the email address to remove, then click Remove.</para>
      </listitem>
      <listitem id="bxqwkes">
       <para>Click OK.</para>
@@ -6215,23 +6198,6 @@
   </section>
  </chapter>
 
- <chapter id="b1012tkg">
-  <title>Connecting to Hula</title>
-  <para><trademark>Evolution</trademark> supports mail connectivity to <trademark class="registered">Hula</trademark> servers through IMAP and calendaring support through CalDAV.</para>
-  <para>To add your Hula account to Evolution, you must create a new Hula account by performing the following steps:</para>
-  <orderedlist>
-   <listitem id="b10at9kq">
-    <para>Click Edit, click Preferences, then click Mail Accounts.</para>
-   </listitem>
-   <listitem id="b10at9yx">
-    <para>In the Preferences window, click Add.</para>
-   </listitem>
-   <listitem id="b10ata4v">
-    <para>Follow the procedure explained in <link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link>.</para>
-   </listitem>
-  </orderedlist>
- </chapter>
-
  <chapter id="config-prefs">
   <title>Advanced Configuration</title>
   <para>Perhaps your mail server has changed names. Or you have grown tired of a certain layout for your appointments. Whatever the reason, you can change your <trademark>Evolution</trademark> settings.</para>
@@ -6261,16 +6227,16 @@
     <para><link linkend="b1a4ol61">Debug Logs</link></para>
    </listitem>
   </itemizedlist>
-  <para>You reach the Evolution settings window by clicking Edit &gt; Preferences. In the left part of the settings window is a column, similar to the Evolution switcher, that lets you choose which portion of  Evolution to customize. The right part of the window is where you make your actual changes.</para>
+  <para>You reach the Evolution settings window by clicking Edit &gt; Preferences. In the left part of the settings window is a column, similar to the Evolution switcher, that lets you choose which portion of Evolution to customize. The right part of the window is where you make your actual changes.</para>
   <mediaobject id="config-prefs-mail-fig"><imageobject><imagedata format="PNG" fileref="figures/mailer_preferences.png"/></imageobject></mediaobject>
   <para>There are six items you can customize.</para>
   <formalpara id="b17sa7c0">
    <title>Mail Accounts:</title>
-   <para>Add or change information about your e-mail accounts, such as the servers you connect to, the way you download mail, and your password authentication mode. This is the most complex item in the list, and is covered in <link linkend="config-prefs-mail-identity">Working with Mail Accounts</link>.</para>
+   <para>Add or change information about your email accounts, such as the servers you connect to, the way you download mail, and your password authentication mode. This is the most complex item in the list, and is covered in <link linkend="config-prefs-mail-identity">Working with Mail Accounts</link>.</para>
   </formalpara>
   <formalpara id="b17sa7hj">
    <title>Autocompletion:</title>
-   <para>Set the contact groups to be used when completing e-mail addresses in the message composer. For more information, see <link linkend="bshoq5l">Autocompletion</link>.</para>
+   <para>Set the address books to be used when completing email addresses in the message composer. For more information, see <link linkend="bshoq5l">Autocompletion</link>.</para>
   </formalpara>
   <formalpara id="b17sa7qv">
    <title>Mail Preferences:</title>
@@ -6278,7 +6244,7 @@
   </formalpara>
   <formalpara id="b17sa85j">
    <title>Composer Preferences:</title>
-   <para>These are settings for the way that you use the mail composer, such as shortcuts, signatures, and spelling. This includes the ability to substitute graphical emoticons for  <quote>emoticons</quote> such as : ) that many people use in e-mail. This tool is covered in <link linkend="config-prefs-mail-composer">Composer Preferences</link>.</para>
+   <para>These are settings for the way that you use the mail composer, such as signatures, and spelling. This includes the ability to substitute graphical emoticons for <quote>emoticons</quote> such as : ) that many people use in email. This tool is covered in <link linkend="config-prefs-mail-composer">Composer Preferences</link>.</para>
   </formalpara>
   <formalpara id="b17sa8cq">
    <title>Calendar and Tasks:</title>
@@ -6292,17 +6258,17 @@
 
   <section id="config-prefs-mail-identity">
    <title>Working with Mail Accounts</title>
-   <para>Evolution allows you to maintain multiple accounts, or identities. When you are writing an e-mail message, you can choose which account to use by selecting from the drop-down list next to the From field in the message composer.</para>
-   <para>Click Send/Receive to select all mail sources that are not disabled. If you don't want to check mail for a given account, select the account in the Mail Accounts tab and click the Disable button.. </para>
+   <para>Evolution allows you to maintain multiple accounts, or identities. When you are writing an email message, you can choose which account to use by selecting from the drop-down list next to the From field in the message composer.</para>
+   <para>Click Send/Receive to update all mail sources that are not disabled. If you don't want to check mail for a given account, select the account in Edit &gt; Preferences &gt; Mail Accounts page and click the Disable button.</para>
    <para>To add a new account, click Add to open the Evolution configuration assistant. To alter an existing account, select it in the Preferences window, then click Edit to open the account editor dialog box.</para>
    <para>The account editor dialog box has seven sections:</para>
    <formalpara id="bsbhdwn">
     <title>Identity:</title>
-    <para>Specify the name and e-mail address for this account. You can also choose a default signature to insert into messages sent from this account.</para>
+    <para>Specify the name and email address for this account. You can also choose a default signature to insert into messages sent from this account.</para>
    </formalpara>
    <formalpara id="bsbhe10">
     <title>Receiving Email:</title>
-    <para>Select the way you receive e-mail. You can download e-mail from a <link linkend="pop">POP server</link>, read and keep it on the server (Microsoft Exchange, <trademark class="registered">Novell</trademark> <trademark class="registered">GroupWise</trademark>, or IMAP<link linkend="imap">IMAP</link>), or read it from files that already exist on your desktop computer. Your server requires you to use a Secure Socket Layer (SSL) connection. You can select from the given three options: No encryption, TLS encryption or SSL encryption.</para>
+    <para>Select the way you receive email. You can download email from a <link linkend="pop">POP server</link>, read and keep it on the server (Microsoft Exchange, <trademark class="registered">Novell</trademark> <trademark class="registered">GroupWise</trademark>, or IMAP<link linkend="imap">IMAP</link>), or read it from files that already exist on your desktop computer. If your server requires you to use a secure connection, you can select from the given three options: No encryption, TLS encryption or SSL encryption.</para>
    </formalpara>
    <para>Your system administrator might ask you to connect to a specific port on a mail server. To specify which port you use, just type a colon and the port number after the server name. For example, to connect to port 143 on the server smtp.example.com, specify smtp.example.com:143 as the server name.</para>
    <para>For additional information, see <link linkend="second-step">Receiving Mail</link>.</para>
@@ -6313,12 +6279,12 @@
    <para>For additional information, see <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
    <formalpara id="bsbhltb">
     <title>Sending Mail:</title>
-    <para>Use this section to choose and configure a method for sending mail. You can choose <link linkend="smtp">SMTP</link>, Microsoft Exchange (if you have installed the Evolution Connector for Microsoft Exchange), or <link linkend="sendmail">Sendmail</link>.</para>
+    <para>Use this section to choose and configure a method for sending mail. You can choose <link linkend="smtp">SMTP</link>, Microsoft Exchange (if you have installed the Evolution Connector for Microsoft Exchange), <link linkend="sendmail">Sendmail</link> or many other options.</para>
    </formalpara>
    <para>For additional information, see <link linkend="third-step">Sending Mail</link>.</para>
    <formalpara id="bsbhn0t">
     <title>Defaults:</title>
-    <para>Use this section to set where this account stores the messages that it has sent, and the messages that you save as drafts. If you want to revert to the default settings, click Restore Defaults.</para>
+    <para>Use this section to set where this account stores the messages that it has sent, and the messages that you save as drafts. If you want to revert to the default settings, click Restore.</para>
    </formalpara>
    <para>If you want to send someone a copy of every message from this account, select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) To:, and specify one or more addresses.</para>
    <para>You can specify the way you want to receive message receipts. You can set Send message receipts to Never, Always or Ask for each message. For more information refer <link linkend="b13uhy6r">Default Settings</link>.</para>
@@ -6335,15 +6301,15 @@
 
   <section id="bshoq5l">
    <title>Autocompletion</title>
-   <para>The Autocompletion tool lets you choose address books to auto-complete names for you. This functionality requires accessibility to each of the address books you want to use. To enable autocompletion, select each of the address books that you want to use auto completion in the Autocompletion page.</para>
+   <para>The Autocompletion tool lets you choose address books to auto-complete names for you in the mail composer. This functionality requires accessibility to each of the address books you want to use. To enable autocompletion, select each of the address books that you want to use auto completion in the Autocompletion page.</para>
   </section>
 
   <section id="b15fx7uz">
    <title>IMAP Mail Headers</title>
-   <para>Evolution allow you to choose the headers that you want to download so that you can reduce the  download time and at the same time having control as to filter or move your mails around the way you like it. Evolution help you customize your IMAP Mail header preferences and thus save the download time. The IMAP Mail headers are as follows:</para>
+   <para>Evolution allows you to choose the headers that you want to download so that you can reduce the download time and filter or move your mail around the way you like it. Evolution help you customize your IMAP Mail header preferences and thus save the download time. The IMAP Mail header options are as follows:</para>
    <formalpara id="b15fzvdp">
     <title>All Headers:</title>
-    <para>This include all the available IMAP Mail headers. By choosing this option, Evolution will download all the Headers for all the messages.</para>
+    <para>This includes all the available IMAP Mail headers. By choosing this option, Evolution will download all the headers for all the messages.</para>
    </formalpara>
    <formalpara id="b15fzvjw">
     <title>Basic Headers:</title>
@@ -6351,9 +6317,9 @@
    </formalpara>
    <formalpara id="b15fzvq4">
     <title>Mailing List Headers:</title>
-    <para>Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailing list ID, owner of the mailing list, and so on with which you can create mailing list filters.</para>
+    <para>Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters.</para>
    </formalpara>
-   <para>This is the default Header preferences that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the "Basic Headers Only"option.</para>
+   <para>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the "Basic Headers Only" option.</para>
    <formalpara id="b15g0l0t">
     <title>Custom Headers:</title>
     <para>These are the extra headers in addition to the above standard headers. You can add custom headers in addition to the standard headers. If you want to have filters based on some specific custom headers and you do not want to compromise on the network speed by downloading-all-mail-headers, Evolution provides a handy way of achieving this by the Custom Headers Option. Here, you can selectively Add/Remove headers based on your needs.</para>
@@ -6361,7 +6327,7 @@
    <note>
     <para>This option may not be needed if you have chosen to download ALL Headers.</para>
    </note>
-   <para>To set the IMAP Mail headers: </para>
+   <para>To set the IMAP Mail headers:</para>
    <orderedlist>
     <listitem id="b15fy0yh">
      <para>Select Edit &gt; Preferences.</para>
@@ -6384,7 +6350,7 @@
      <para>Click Basic Headers to download basic headers.</para>
     </listitem>
     <listitem id="b15g0kdi">
-     <para>Click Basic and Mailing Headers to download both. </para>
+     <para>Click Basic and Mailing Headers to download both.</para>
     </listitem>
     <listitem id="b15g160e">
      <para>Click Add to add any predefined custom headers.</para>
@@ -6421,23 +6387,23 @@
      <para><link linkend="bxjncro">Calendar and Tasks Preferences</link></para>
     </listitem>
    </itemizedlist>
-   <para>For information on individual e-mail account settings, see <link linkend="config-prefs-mail-identity">Working with Mail Accounts</link>.</para>
+   <para>For information on individual email account settings, see <link linkend="config-prefs-mail-identity">Working with Mail Accounts</link>.</para>
 
    <section id="config-prefs-mail-general">
     <title>General Mail Settings</title>
     <para>The General page has the following options:</para>
     <formalpara id="bsbhnw0">
      <title>Message Fonts:</title>
-     <para>Normally, Evolution uses the same fonts as other GNOME applications. To choose different fonts, deselect Use the same fonts as other applications and select one font for standard typefaces and a second for monospace, terminal, or display.</para>
+     <para>Normally, Evolution uses the same fonts as other GNOME applications. To choose different fonts, deselect Use the same fonts as other applications and select one font for standard typefaces and a second for monospace.</para>
     </formalpara>
     <formalpara id="bsbho3f">
      <title>Message Display:</title>
-     <para>Choose how long you want to wait before marking a message read, how to highlight quotations, and the default encoding. Enable <guilabel>Fall back to threading message by subject</guilabel> to group the messages as message threads. You can also set the limit to the number of addresses displayed in the message header by enabling <guilabel>Shrink To/CC/BCC header to</guilabel> option.You can also set the limit for rendering text content in the message you recive.By default, when you receive a message with text content more than 4096 Kilo Bytes, Evolution will not render the message in the preview pane. You can view unformatted text either inline or using an external application. You can also enable Magic spacebar and search folders. </para>
+     <para>Choose how long you want to wait before marking a message read, how to highlight quotations, and the default encoding. Enable <guilabel>Fall back to threading message by subject</guilabel> to group the messages as message threads. You can also set the limit to the number of addresses displayed in the message header by enabling <guilabel>Shrink To/CC/BCC header to</guilabel> option.You can also set the limit for rendering text content in the message you receive. By default, when you receive a message with text content more than 4096 Kilo Bytes, Evolution will not render the message in the preview pane. You can view unformatted text either inline or using an external application. You can also enable Magic spacebar and search folders.</para>
     </formalpara>
-    <para>To group the messages as threads select View &gt; Group By threads or press Ctrl +T.</para>
+    <para>To group the messages as threads select View &gt; Group By threads or press Ctrl+T.</para>
     <formalpara id="bsbhq3y">
      <title>Deleting Mail:</title>
-     <para>Choose whether to delete messages automatically when quitting Evolution and how frequently, and whether you want to explicitly confirm the final deletion of messages.Select Confirm when expunging a folder to confirm the final deletion. You can have four different options to set the frequency for deletion: Everytime, Once per day, Once per week, and Once per month.</para>
+     <para>Choose whether to delete messages automatically when quitting Evolution and how frequently, and whether you want to explicitly confirm the final deletion of messages. Select Confirm when expunging a folder to confirm the final deletion. You can have four different options to set the frequency for deletion: Everytime, Once per day, Once per week, and Once per month.</para>
     </formalpara>
     <formalpara id="bsbhq7t">
      <title>New Mail Notifications:</title>
@@ -6450,7 +6416,7 @@
     <para>The HTML Mail page has the following options:</para>
     <formalpara id="bsbhqot">
      <title>Show Image Animations:</title>
-     <para>Turns animation on or off.</para>
+     <para>Turns image animation (e.g. GIF files) on or off.</para>
     </formalpara>
     <formalpara id="bsbhquu">
      <title>Prompt When Sending HTML Messages to Contacts That Don't Want Them:</title>
@@ -6458,9 +6424,9 @@
     </formalpara>
     <formalpara id="bsbhr9p">
      <title>Loading Images:</title>
-     <para>You can embed a image in an e-mail and have it load only when the message arrives. However, spammers can use image loading patterns to confirm <quote>live</quote> addresses and invade your privacy. You can elect to never load images automatically, to load images only if the sender is in your contacts, or always load images.</para>
+     <para>You can embed a image in an email and have it load only when the message arrives. However, spammers can use image loading patterns to confirm <quote>valid</quote> addresses and invade your privacy. You can elect to never load images automatically, to load images only if the sender is in your contacts, or always load images.</para>
     </formalpara>
-    <para>If you have chosen not to load images automatically, you can choose to see the images in one message at a time by selecting View &gt; Load Images or press Ctrl +I.</para>
+    <para>If you have chosen not to load images automatically, you can choose to see the images in one message at a time by selecting View &gt; Load Images or press Ctrl+I.</para>
    </section>
 
    <section id="mail-prefs-colors">
@@ -6485,7 +6451,7 @@
       <para>Edit name and color, then click OK.</para>
      </listitem>
     </orderedlist>
-    <para>To assign a label to a specific e-mail message:</para>
+    <para>To assign a label to a specific email message:</para>
     <orderedlist>
      <listitem id="b1a58ynk">
       <para>Right-click the message from the message preview.</para>
@@ -6511,7 +6477,7 @@
 
    <section id="mail-prefs-junk">
     <title>Junk Mail Preferences</title>
-    <para>You can check your incoming messages for junk content by using Bogofilter and  SpamAssassin* tools, which have trainable Bayesian filters. You need to enable the Junk plugins to start filtering junk mail.</para>
+    <para>You can check your incoming messages for junk content by using Bogofilter and SpamAssassin&z-3rdParty; tools, which have trainable Bayesian filters. You need to enable the Junk plugins to start filtering junk mail.</para>
     <para>To enable Junk plugins:</para>
     <orderedlist>
      <listitem id="b17rdxkm">
@@ -6523,14 +6489,14 @@
     </orderedlist>
     <formalpara id="b17rdsy5">
      <title>General:</title>
-     <para>You can check incoming e-mail for junk contents and also decide how often you want to delete junk mail. You also have the option to choose either SpamAssassin or Bogofilter, or you can select both.</para>
+     <para>You can check incoming email for junk contents and also decide how often you want to delete junk mail. You also have the option to choose either SpamAssassin or Bogofilter, or you can select both.</para>
     </formalpara>
     <formalpara id="bsaz9zd">
      <title>Checking Incoming Mail for Junk:</title>
      <para>This option turns automatic junk mail filtering on or off.</para>
     </formalpara>
     <formalpara id="b17xmakf">
-     <title>Delete junk mails on exit:</title>
+     <title>Delete junk mail on exit:</title>
      <para>This option deletes junk messages when you exit. You can also specify when to delete the junk messages (every time, once per day, once per week, once per month).</para>
     </formalpara>
     <formalpara id="b17rfn2y">
@@ -6540,21 +6506,21 @@
     <mediaobject id="b17rds6i"><imageobject><imagedata format="PNG" fileref="figures/evo_junk_a.png"/></imageobject></mediaobject>
     <formalpara id="b17rfjfx">
      <title>SpamAssassin Options:</title>
-     <para>Remote Test performs junk mail filtering on remote servers. It also includes online tests, like checking for blacklisted message senders and ISPs. </para>
+     <para>Remote Test performs junk mail filtering on remote servers. It also includes online tests, like checking for blacklisted message senders and ISPs.</para>
     </formalpara>
     <para>This option uses tests that require a network connection, such as checking to see if a message is in a list of known junk messages, or if the sender or gateway are blacklisted by anti-spam organizations. Online tests can make filtering slower, because remote tests add to the amount of time it takes to check for junk mail, but they increase accuracy. When you select this option, you do not need to do any additional setup.</para>
     <formalpara id="b17rfjnv">
      <title>Bogofilter Options:</title>
-     <para>Select Convert mail text to Unicode to enable Unicode* filtering. For more information on Bogofilter, see the <ulink url="http://bogofilter.sourceforge.net/">Bogofilter site</ulink>.</para>
+     <para>Select Convert mail text to Unicode to enable Unicode&z-3rdParty; filtering. For more information on Bogofilter, see the <ulink url="http://bogofilter.sourceforge.net/">Bogofilter site</ulink>.</para>
     </formalpara>
     <note>
-     <para>Check new messages for junk contents option under Edit &gt; Preferences &gt; Mail Accounts &gt; Edit &gt; Receiving option is enabled only for IMAP. Check incoming mail for junk option under Edit &gt; Prefernces &gt; Mail Preferences &gt; Junk &gt; General refers only to POP and Local Delivery.</para>
+     <para>Check new messages for junk contents option under Edit &gt; Preferences &gt; Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. Check incoming mail for junk option under Edit &gt; Preferences &gt; Mail Preferences &gt; Junk &gt; General refers only to POP and Local Delivery.</para>
     </note>
    </section>
 
    <section id="bxjnb81">
     <title>Automatic Contacts Preferences</title>
-    <para>There are two items in this section: Automatic Contacts automatically adds people that you respond to into your address book. You can select the default address book for automatic contacts from the list. </para>
+    <para>There are two items in this section: Automatic Contacts automatically adds people that you respond to into your address book. You can select the default address book for automatic contacts from the list.</para>
     <para>Instant Messaging Contacts periodically synchronizes contact information and images with your instant messaging program. Currently this only works with Pidgin. Your address book must not be a read-only one for both these features to function properly.</para>
    </section>
 
@@ -6566,7 +6532,7 @@
 
   <section id="config-prefs-mail-composer">
    <title>Composer Preferences</title>
-   <para>There are three tabs for message composer settings where you can set the composer preferences. The General tab covers shortcuts and assorted behavior, the Signature tab sets your signature, and the Spell Checking tab controls spell checking.</para>
+   <para>There are three tabs for message composer settings where you can set the composer preferences. The General tab covers assorted behavior, the Signature tab sets your signature, and the Spell Checking tab controls spell checking.</para>
    <itemizedlist>
     <listitem>
      <para><link linkend="bshpixy">General</link></para>
@@ -6581,7 +6547,7 @@
 
    <section id="bshpixy">
     <title>General</title>
-    <para>In the General tab, you can set the following options:</para>
+    <para>The General page has the following options:</para>
     <formalpara id="bsbhs8n">
      <title>Default Behavior:</title>
      <para>Choose how to normally forward and reply to messages, what character set they will use, whether they are in HTML, and whether that HTML can contain graphic emoticons.</para>
@@ -6613,18 +6579,19 @@
 
    <section id="bshpjpl">
     <title>Signature</title>
-    <para>The signature editor allows you to create several different signatures in plain text or in HTML, and to specify which of them will be added to e-mail you create in the message composer. If you prefer to use an alternate signature or none at all, you can select it from the mail composer itself.</para>
+    <para>The signature editor allows you to create several different signatures in plain text or in HTML, and to specify which of them will be added to email you create in the message composer. If you prefer to use an alternate signature or none at all, you can select it from the mail composer itself.</para>
    </section>
 
    <section id="bshpjuj">
     <title>Spell Checking</title>
-    <para>To choose a spell-checking language, select it here. You must install the gnome-spell package, for spell-checking to be available in Evolution. Additional dictionaries are also available through <trademark class="registered">Red Carpet</trademark> and are detected automatically if you have installed them. You must also install the aspell package. If this is the case, please contact your packager. To have the composer automatically check your spelling while you type, select Check Spelling While I Type. You can set the color for misspelled words.</para>
+    <para>To choose a spell-checking language, select it here. You must install gnome-spell, aspell, and an aspell language package
+(like for example aspell-en for english language) for spell-checking to be available in Evolution. Additional dictionaries are available through your package manager and are detected automatically if you have installed them. To have the composer automatically check your spelling while you type, select Check Spelling While I Type. You can set the color for misspelled words.</para>
    </section>
   </section>
 
   <section id="config-prefs-cal">
    <title>Calendar and Tasks Settings</title>
-   <para>The calendar configuration tool has four pages:</para>
+   <para>The calendar configuration tool has several pages:</para>
    <itemizedlist>
     <listitem>
      <para><link linkend="bshpskx">General</link></para>
@@ -6649,7 +6616,7 @@
     </formalpara>
     <formalpara id="bsbhup9">
      <title>Time Format:</title>
-     <para>Choose between twelve-hour (AM/PM) and twenty-four-hour time formats. </para>
+     <para>Choose between twelve-hour (AM/PM) and twenty-four-hour time formats.</para>
     </formalpara>
     <formalpara id="bsbhuut">
      <title>Week Starts:</title>
@@ -6657,7 +6624,7 @@
     </formalpara>
     <formalpara id="bsbhuzl">
      <title>Day Begins:</title>
-     <para>For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can select your preferred hours to make sure that all your events are displayed properly. </para>
+     <para>For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can select your preferred hours.</para>
     </formalpara>
     <formalpara id="bsbhv3n">
      <title>Day Ends:</title>
@@ -6712,7 +6679,7 @@
 
    <section id="b13yjhw2">
     <title>Free/Busy</title>
-    <para>Allows you to specify a template to use while posting your Free/Buy information to a server.</para>
+    <para>You can specify a template to use when posting to the Free/Busy server.</para>
    </section>
 
    <section id="bxjng8p">
@@ -6729,7 +6696,7 @@
    <para>Evolution allows you to add certificates for yourself as well as for contacts. This allows you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption.</para>
    <formalpara id="bshov9m">
     <title>Your Certificates:</title>
-    <para>Click the Your Certificates tab to display a list of certificates that you own. You can import, view, back up and delete your certificates from this page.</para>
+    <para>Click the Your Certificates tab to display a list of certificates that you own. You can import, view and delete your certificates from this page.</para>
    </formalpara>
    <formalpara id="bshovvp">
     <title>Contact Certificates:</title>
@@ -6797,24 +6764,24 @@
       </formalpara>
      </listitem>
      <listitem id="bxmw8kf">
-      <para>If you selected On This Computer, specify the name of the computer, and choose whether you want to the new address book as your default folder.</para>
+      <para>If you selected On This Computer, specify the name of the address book, and choose whether you want to the new address book as your default folder.</para>
       <para>or</para>
-      <para> If you are creating an <link linkend="ldap">LDAP</link> server, enter the server information as requested by the assistant:</para>
+      <para> If you are creating an address book on an <link linkend="ldap">LDAP</link> server, enter the server information as requested by the assistant:</para>
       <formalpara id="bxmwai1">
        <title>Server Name:</title>
        <para>The Internet address of the contact server you are using.</para>
       </formalpara>
       <formalpara id="bxmwai2">
        <title>Login Method:</title>
-       <para>Specify whether your login is anonymous, uses an e-mail address, or uses a distinguished name. If the login is not anonymous, specify the e-mail address or distinguished name (DN) required by the server.</para>
+       <para>Specify whether your login is anonymous, uses an email address, or uses a distinguished name. If the login is not anonymous, specify the email address or distinguished name (DN) required by the server.</para>
       </formalpara>
       <formalpara id="bxmwai3">
        <title>Port:</title>
-       <para>The Internet port Evolution connects to in order to access the LDAP database. This is normally 389. </para>
+       <para>The Internet port Evolution connects to in order to access the LDAP database. This is normally 389.</para>
       </formalpara>
       <formalpara id="bxmwai4">
        <title>Use SSL/TLS:</title>
-       <para>SSL and TLS are security mechanisms. If you select Always, Evolution does not connect unless secure connections are available. The default value is Whenever Possible, which uses secure connections if they are available, but does not cause failure if they are not. </para>
+       <para>SSL and TLS are security mechanisms. If you select No Encryption, Evolution will send your password unencrypted. By using SSL or TLS, a secure connection will be used and your password will be sent encrypted.</para>
       </formalpara>
       <formalpara id="bxmwai5">
        <title>Details: Search Base:</title>
@@ -6860,7 +6827,7 @@
        <title>Search Filter:</title>
        <para>The search filter can be set here for all the LDAP queries. For example:</para>
       </formalpara>
-      <para>ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists only the user objects.Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): Retrieves the User and Contact List objects.(&amp;(mail=*)(ObjectClass=*)): Lists the objects associated with the e-mail addresses.</para>
+      <para>ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): Retrieves the User and Contact List objects.(&amp;(mail=*)(ObjectClass=*)): Lists the objects associated with the email addresses.</para>
       <note>
        <para>If you change any LDAP address book configurations, Evolution and the Evolution Data Server need to be restarted in order to see the changes.</para>
       </note>
@@ -6883,7 +6850,7 @@
      <mediaobject id="b1a4or91"><imageobject><imagedata format="PNG" fileref="figures/evo_debuglogs_a.png"/></imageobject></mediaobject>
     </listitem>
     <listitem id="b1a4orv0">
-     <para>Specify the display duration for the error messages. </para>
+     <para>Specify the display duration for the error messages.</para>
      <para>The messages remain in the statusbar for this specified time.</para>
     </listitem>
    </orderedlist>
@@ -6910,7 +6877,7 @@
 
   <section id="bshq58g">
    <title>Enabling Synchronization</title>
-   <para>If you haven't used a handheld device with your computer before, you need to run the GNOME Control Center by clicking System &gt; Settings, and make sure that Pilot Link is properly configured. Make sure that you have read and write permissions on the device, which is normally n /dev/pilot. If that does not work, check in /dev/ttyS0 if you have a serial connection, or in /dev/ttyUSB1 for a USB connection. You can do this by becoming root and adding your username to the group that owns this device node. For a USB device on sync, two device nodes are created, ttyUSB0 and ttyUSB1. The second node is the one to be used in configuring the device.</para>
+   <para>If you haven't used a handheld device with your computer before, you need to run the GNOME Control Center by clicking System &gt; Settings, and make sure that Pilot Link is properly configured. Make sure that you have read and write permissions on the device, which is normally in /dev/pilot. If that does not work, check in /dev/ttyS0 if you have a serial connection, or in /dev/ttyUSB1 for a USB connection. You can do this by becoming root and adding your username to the group that owns this device node. For a USB device on sync, two device nodes are created, ttyUSB0 and ttyUSB1. The second node is the one to be used in configuring the device.</para>
   </section>
 
   <section id="bshq7hl">
@@ -6939,7 +6906,7 @@
   <section id="bshq2qn">
    <title>Synchronizing Information</title>
    <para>Use the following procedure to synchronize the data on your Palm OS device with the data you store in Evolution.</para>
-   <para>If you want to back up your information before synchronizing, make a copy of the <command>evolution</command> directory inside your home directory.</para>
+   <para>If you want to back up your information before synchronizing, make a copy of the <command>.evolution</command> directory inside your home directory.</para>
    <orderedlist>
     <listitem id="bshq1vg">
      <para>Put your handheld device in its cradle and press the HotSync button.</para>
@@ -6971,7 +6938,7 @@
     </listitem>
    </orderedlist>
    <para>Mozilla creates a set of files in the directory<command> Windows\Application_Data\Mozilla\Profiles\(UserName)\(Random Letters)\Mail\Local Folders\OutlookMail\</command>. The data files are those that have no file extension.</para>
-   <para>If you are using Windows XP or Windows 2000, your Windows hard drive is probably in the NTFS format, which some Linux systems cannot read without additional software. You might find it simpler to copy the mail folders to a different drive or to burn a CD.</para>
+   <para>If you are using Windows Vista&z-3rdParty;, Windows XP&z-3rdParty; or Windows 2000&z-3rdParty;, your Windows hard drive is probably in the NTFS format, which some Linux systems cannot read without additional software. You might find it simpler to copy the mail folders to a different drive or to burn a CD.</para>
    <para>When you have your mail in a format Evolution can understand, reboot to Linux. Then continue with the following procedure. To create new folders for your files:</para>
    <orderedlist>
     <listitem id="bshqeej">
@@ -6984,7 +6951,7 @@
      <para>Start Evolution.</para>
     </listitem>
     <listitem id="bshqejx">
-     <para>Select File &gt; New Folder to create the folders you want.</para>
+     <para>Select File &gt; New &gt; Mail Folder to create the folders you want.</para>
     </listitem>
    </orderedlist>
    <para>To import the data files:</para>
@@ -6993,10 +6960,10 @@
      <para>In Evolution, open the File Import assistant by clicking File &gt; Import.</para>
     </listitem>
     <listitem id="bshqera">
-     <para>Click Next, then select Import A Single File.</para>
+     <para>Click Next, then select Import a single file.</para>
     </listitem>
     <listitem id="bshqesz">
-     <para>Leave the file type as Automatic, then click Browse to select the data file.</para>
+     <para>Click on the filechooser to select the data file.</para>
      <para>Remember, the data files are the files that have no file extension.</para>
     </listitem>
     <listitem id="bshqeuv">
@@ -7034,24 +7001,24 @@
    <title>Opening or Creating Items</title>
    <mediaobject id="b17sanky"><imageobject><imagedata format="PNG" fileref="figures/quick_reference.png"/></imageobject></mediaobject>
    <formalpara id="b17sa9kd">
-    <title>New Item: </title>
+    <title>New Item:</title>
     <para>Press Ctrl+N to open a new item for whatever part of Evolution you're working in. In mail, this means you create a new message. If you're looking at your address book, Ctrl+N creates a new contact card, and in the calendar, a new appointment.</para>
    </formalpara>
    <formalpara id="b17sa9q1">
-    <title>Creating a New E-mail Message:</title>
-    <para>Use File &gt; New &gt; Mail Message or Shift+Ctrl+M. </para>
+    <title>Creating a New Email Message:</title>
+    <para>Click File &gt; New &gt; Mail Message or Shift+Ctrl+M.</para>
    </formalpara>
    <formalpara id="b17saa12">
     <title>Creating a New Appointment:</title>
-    <para>Use File &gt; New Appointment or Shift+Ctrl+A.</para>
+    <para>Click File &gt; New &gt; Appointment or Shift+Ctrl+A.</para>
    </formalpara>
    <formalpara id="b17saa8l">
     <title>Entering a New Contact:</title>
-    <para>Double-click in any blank space in the contact manager to create a new address card. You can also use File &gt; New Contact or Shift+Ctrl+C.</para>
+    <para>Double-click in any blank space in the contact manager to create a new address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C.</para>
    </formalpara>
    <formalpara id="b17saahc">
     <title>Creating a New Task:</title>
-    <para>File &gt; New Task or Shift+Ctrl+T.</para>
+    <para>Click File &gt; New &gt; Task or Shift+Ctrl+T.</para>
    </formalpara>
   </section>
 
@@ -7088,7 +7055,7 @@
    </formalpara>
    <formalpara id="b17sazyg">
     <title>Adding a Sender to the Address Book:</title>
-    <para>Right-click a message and select Add Sender to Address Book. You can also right-click on any e-mail address to add it to your address book.</para>
+    <para>Right-click on any email address to add it to your address book.</para>
    </formalpara>
   </section>
 
@@ -7096,12 +7063,12 @@
    <title>Calendar</title>
    <formalpara id="b17sb0hv">
     <title>Creating a New Appointment:</title>
-    <para>Use File &gt; New Appointment or Shift+Ctrl+A.</para>
+    <para>Click File &gt; New &gt; Appointment or Shift+Ctrl+A.</para>
    </formalpara>
    <para>You can also click in any blank spot in the calendar and start typing to create a new appointment entry.</para>
    <formalpara id="b17sb0tt">
     <title>Creating a New Task:</title>
-    <para>Use File &gt; New Task or Shift+Ctrl+T.</para>
+    <para>Click File &gt; New &gt; Task or Shift+Ctrl+T.</para>
    </formalpara>
   </section>
 
@@ -7112,15 +7079,15 @@
     <para>Double-click the contact's address card to change details.</para>
    </formalpara>
    <formalpara id="b17sb24c">
-    <title>Deleting a Contact: </title>
-    <para>Right-click a contact, then click Delete; or select a contact, then click Delete on the toolbar. </para>
+    <title>Deleting a Contact:</title>
+    <para>Right-click a contact, then click Delete; or select a contact, then click Delete on the toolbar.</para>
    </formalpara>
    <formalpara id="b17sb29u">
-    <title>Sending E-mails to a Contact:</title>
+    <title>Sending Emails to a Contact:</title>
     <para>Right-click a contact, then click Send Message to Contact.</para>
    </formalpara>
    <formalpara id="b17sb2ia">
-    <title>Creating a New Contact: </title>
+    <title>Creating a New Contact:</title>
     <para>Double-click in any blank space in the contact manager to create a new address card, or right-click anywhere in the address book and select New Contact. You can also click File &gt; New Contact or press Shift+Ctrl+C.</para>
    </formalpara>
   </section>
@@ -7134,9 +7101,9 @@
 
  <appendix id="authors">
   <title>Authors</title>
-  <para>Evolution was written by the <trademark>Evolution</trademark> team and numerous other dedicated GNOME programmers. You can see their names by clicking Help &gt; About from any Evolution window.</para>
+  <para>Evolution was written by the <trademark>Evolution</trademark> team and numerous other dedicated GNOME programmers. You can see their names by clicking Help &gt; About from the main Evolution window.</para>
   <para>The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar applications, and to KHTMLW. The developers of Evolution acknowledge the efforts and contributions of all who worked on those projects.</para>
-  <para>For more information please visit the Evolution <ulink url="http://www.novell.com/products/desktop/features/evolution.html">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url="http://bugzilla.gnome.com">bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at the same location. You can also use the GNOME bug report tool, bug-buddy, to submit your defect reports.</para>
+  <para>For more information please visit the Evolution <ulink url="http://www.gnome.org/projects/evolution">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url="http://bugzilla.gnome.org">bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at the same location. You can also use the GNOME bug report tool, bug-buddy, to submit your defect reports.</para>
   <para>This manual was written by:</para>
   <itemizedlist>
    <listitem>
@@ -7173,7 +7140,7 @@
     <para>With the help of the application programmers and the GNOME Documentation Project.</para>
    </listitem>
   </itemizedlist>
-  <para>Please file comments and suggestions for this manual as bugs in the GNOME bug tracking system. If you contributed to this project but do not see your name here, please contact Radhika PC (pradhika@novell.com) or Sreenivasa Ragavan (sragavan@novell.com) and either of them will list you.</para>
+  <para>Please file comments and suggestions for this manual as bugs in the GNOME bug tracking system. If you contributed to this project but do not see your name here, please contact Radhika PC (pradhika@novell.com) or Srinivasa Ragavan (sragavan@novell.com) and either of them will list you.</para>
   <para>Partial list of Documentation Translators (application translated to numerous additional languages):</para>
   <itemizedlist>
    <listitem>
@@ -7203,13 +7170,13 @@
   <glossentry id="attachment">
    <glossterm>attachment</glossterm>
    <glossdef>
-    <para>Any file sent with an e-mail. Attachments can be embedded in a message or appended to it.</para>
+    <para>Any file sent with an email. Attachments can be embedded in a message or appended to it.</para>
    </glossdef>
   </glossentry>
   <glossentry id="automatic-indexing">
    <glossterm>automatic indexing</glossterm>
    <glossdef>
-    <para>A pre-downloading procedure that allows Evolution to quickly refer to data. It enables faster searches and decreases memory usage for data displays.</para>
+    <para>A feature which allows Evolution to quickly find and sort data.</para>
    </glossdef>
   </glossentry>
   <glossentry id="bsi89la">
@@ -7263,19 +7230,19 @@
   <glossentry id="forward">
    <glossterm>forward</glossterm>
    <glossdef>
-    <para>Forwards a copy of the message and any additional comments to a different e-mail address.</para>
+    <para>Forwards a copy of the message and any additional comments to a different email address.</para>
    </glossdef>
   </glossentry>
   <glossentry id="groupware">
    <glossterm>groupware</glossterm>
    <glossdef>
-    <para>A term describing an application that helps groups of people work together. Typically, a groupware application has several productivity features built into one program, including e-mail, calendar, and address book tools.</para>
+    <para>A term describing an application that helps groups of people work together. Typically, a groupware application has several productivity features built into one program, including email, calendar, and address book tools.</para>
    </glossdef>
   </glossentry>
   <glossentry id="html">
    <glossterm>HTML</glossterm>
    <glossdef>
-    <para>Hypertext Markup Language (HTML) is a language for describing page layout in electronic documents such as Web pages, help files, and e-mail messages. HTML can be used in e-mail and news posts to insert images and apply text treatments.</para>
+    <para>Hypertext Markup Language (HTML) is a language for describing page layout in electronic documents such as Web pages, help files, and email messages. HTML can be used in email and news posts to insert images and apply text treatments.</para>
    </glossdef>
   </glossentry>
   <glossentry id="ical">
@@ -7287,7 +7254,7 @@
   <glossentry id="imap">
    <glossterm>IMAP</glossterm>
    <glossdef>
-    <para>Internet Mail Access Protocol. It allows access to e-mail that is typically stored remotely on a server rather than on a local hard disk. Often contrasted with POP.</para>
+    <para>Internet Mail Access Protocol. It allows access to email that is typically stored remotely on a server rather than on a local hard disk. Often contrasted with POP.</para>
    </glossdef>
   </glossentry>
   <glossentry id="inline">
@@ -7305,19 +7272,19 @@
   <glossentry id="mail-client">
    <glossterm>mail client</glossterm>
    <glossdef>
-    <para>The application with which a person reads and sends e-mail. Its counterparts are the various types of mail servers, which handle user authentication and direct messages from the sender to the recipient.</para>
+    <para>The application with which a person reads and sends email. Its counterparts are the various types of mail servers, which handle user authentication and direct messages from the sender to the recipient.</para>
    </glossdef>
   </glossentry>
   <glossentry id="pop">
    <glossterm>POP</glossterm>
    <glossdef>
-    <para>Post Office Protocol. A mechanism for e-mail transport. In contrast to IMAP, it is used only to get mail from a server and store it locally on your hard disk.</para>
+    <para>Post Office Protocol. A mechanism for email transport. In contrast to IMAP, it is used only to get mail from a server and store it locally on your hard disk.</para>
    </glossdef>
   </glossentry>
   <glossentry id="protocol">
    <glossterm>protocol</glossterm>
    <glossdef>
-    <para>An agreed-upon method of communication, especially one for sending particular types of information between computer systems. Examples include POP (Post Office Protocol), for e-mail, and HTTP (HypterText Transfer Protocol) for Web pages.</para>
+    <para>An agreed-upon method of communication, especially one for sending particular types of information between computer systems. Examples include POP (Post Office Protocol), for email, and HTTP (HyperText Transfer Protocol) for Web pages.</para>
    </glossdef>
   </glossentry>
   <glossentry id="public-key-encryption">
@@ -7347,7 +7314,7 @@
   <glossentry id="vfolder">
    <glossterm>search folder</glossterm>
    <glossdef>
-    <para>An e-mail organization tool. Search folders allow you to create a folder that contains the results of a complex search. Search folder contents are updated dynamically.</para>
+    <para>An email organization tool. Search folders allow you to create a folder that contains the results of a complex search. Search folder contents are updated dynamically.</para>
    </glossdef>
   </glossentry>
   <glossentry id="search-scope">
@@ -7371,7 +7338,7 @@
   <glossentry id="signature">
    <glossterm>signature</glossterm>
    <glossdef>
-    <para>Text placed at the end of every e-mail sent, similar to a hand-written signature at the bottom of a written letter. A signature can be anything from a favorite quotation to a link to a Web page; courtesy dictates that it be fewer than four lines long.</para>
+    <para>Text placed at the end of every email sent, similar to a hand-written signature at the bottom of a written letter. A signature can be anything from a favorite quotation to a link to a Web page; courtesy dictates that it be fewer than four lines long.</para>
    </glossdef>
   </glossentry>
   <glossentry id="smtp">
@@ -7395,7 +7362,7 @@
   <glossentry id="vcard">
    <glossterm>vCard</glossterm>
    <glossdef>
-    <para>A file format for the exchange of contact information. When you get an address card attached to an e-mail, it is probably in vCard format.</para>
+    <para>A file format for the exchange of contact information. When you get an address card attached to an email, it is probably in vCard format.</para>
    </glossdef>
   </glossentry>
  </glossary>
diff --git a/help/C/figures/attach_reminder_a.png.png b/help/C/figures/attach_reminder_a.png
index b04316b84e..b04316b84e 100644
--- a/help/C/figures/attach_reminder_a.png.png
+++ b/help/C/figures/attach_reminder_a.png
diff --git a/help/ChangeLog b/help/ChangeLog
index b09a81fda1..97ddac70b6 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,208 @@
+2008-08-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-08-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fixes bug #544252
+
+	* quickref/C/quickref.tex: Use names consistent to the GUI for 
+	different components. 
+
+2008-08-03  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Make Claude happy (bug #544886 comment 4).
+
+2008-08-03  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Typo fixes and fix for bug #544886 on
+	behalf of Allan Day.
+
+2008-08-03  Andre Klapper  <a9016009@gmx.de>
+
+	* de/de.po: Update German translation.
+
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545558
+
+	* C/evolution.xml:
+	Hula support is disabled by default now, so remove any
+	mention of it from the User Guide.
+
+2008-07-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	** This was preventing dblatex from working correctly.
+	   I use dblatex to generate a PDF for the website.
+
+	* xx/figures/attach_reminder_a.png:
+	Rename attach_reminder_a.png.png to attach_reminder_a.png.
+
+	* Makefile.am:
+	* xx/evolution.xml:
+	Update accordingly.
+
+2008-07-28  Claude Paroz  <claude@2xlibre.net>
+
+	* fr/fr.po: Updated French translation.
+
+2007-07-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #544958
+
+	* C/evolution.xml:
+	Use email, not e-mail (per documentation guidelines).
+
+2008-07-27  Claude Paroz  <claude@2xlibre.net>
+
+	* C/evolution.xml: Typos/Syntax improvements.
+	Fixes #544994.
+
+2008-07-27  Claude Paroz  <claude@2xlibre.net>
+
+	* fr/fr.po: Updated French translation.
+	* figures/evo_label_a.png: New screenshot.
+
+2008-07-25  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-07-24  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-07-23  Andre Klapper  <a9016009@gmx.de>
+
+	* de/de.po: Update German translation.
+
+2008-07-23  Andre Klapper  <a9016009@gmx.de>
+
+	* de/de.po: Update German translation.
+
+2008-07-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-07-21  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: s/a company environment/an organizational environment
+
+2008-07-21  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fix most of bug 543883. Patch by Allan Day.
+
+2008-07-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-07-21  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fix build break.
+
+2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Synchronized more strings, changed "mails" to "mail".
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Synchronized more strings.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Synchronized more strings.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Synchronized more strings, fixed some typos.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Synchronized more strings.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Synchronized more strings.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Synchronized more strings, fixed a typo.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Synchronized more strings, fixed a typo.
+
+2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed bug #477082.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 201 to 317 of bug #438479.
+
+2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 181 to 200 of bug #438479.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 161 to 180 of bug #438479.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 141 to 160 of bug #438479.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 121 to 140 of bug #438479.
+	Use &z-3rdParty; instead of *.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 81 to 120 of bug #438479.
+	Synced dialogue vs dialog. Fixed two duplicated IDs.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 61 to 80 of bug #438479.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 41 to 60 of bug #438479.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Fixed comments 21 to 40 of bug #438479.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Replace all "e-mail list" by "message list".
+	Fixed comments 1 to 20 of bug #438479.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Remove more wrong whitespaces.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* C/evolution.xml: Removed braindead whitespaces, fix duplicated
+	whitespaces, fix spellings.
+
 2008-07-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es/es.po: Updated Spanish translation 
diff --git a/help/Makefile.am b/help/Makefile.am
index c16e167445..86c763dcb8 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -9,7 +9,7 @@ DOC_INCLUDES =
 DOC_FIGURES =  \
 	figures/account_editor_a.png 		\
 	figures/addrs_book_a.png		\
-	figures/attach_reminder_a.png.png	\
+	figures/attach_reminder_a.png		\
 	figures/calendar.png 			\
 	figures/categories_a.png 		\
 	figures/collap_head_a.png 		\
diff --git a/help/cs/figures/attach_reminder_a.png.png b/help/cs/figures/attach_reminder_a.png
index 56e7c3cd75..56e7c3cd75 100644
--- a/help/cs/figures/attach_reminder_a.png.png
+++ b/help/cs/figures/attach_reminder_a.png
diff --git a/help/de/de.po b/help/de/de.po
index 1646ff1d96..11e3a19efe 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: manual_evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-15 22:12+0000\n"
-"PO-Revision-Date: 2008-01-05 21:45+0100\n"
+"POT-Creation-Date: 2008-07-31 17:22+0000\n"
+"PO-Revision-Date: 2008-08-03 23:48+0200\n"
 "Last-Translator: Andre Klapper <ak-47@gmx.net>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,13 +15,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:252(None)
-msgid "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+#: C/evolution.xml:230(None)
+msgid ""
+"@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:282(None)
+#: C/evolution.xml:260(None)
 msgid ""
 "@@image: 'figures/evo_receive_setup_a.png'; "
 "md5=5add6d290b2df212516dda2463930759"
@@ -29,19 +30,21 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:443(None)
-msgid "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
+#: C/evolution.xml:418(None)
+msgid ""
+"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:453(None)
-msgid "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+#: C/evolution.xml:428(None)
+msgid ""
+"@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:494(None)
+#: C/evolution.xml:469(None)
 msgid ""
 "@@image: 'figures/evo_imapreceive_a.png'; "
 "md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
@@ -49,25 +52,28 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:537(None)
-msgid "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+#: C/evolution.xml:512(None)
+msgid ""
+"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:558(None)
-msgid "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
+#: C/evolution.xml:534(None)
+msgid ""
+"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:605(None)
-msgid "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
+#: C/evolution.xml:584(None)
+msgid ""
+"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:625(None)
+#: C/evolution.xml:605(None)
 msgid ""
 "@@image: 'figures/evo_maildirreceive_a.png'; "
 "md5=bdd9dfc00800338dc906e2fd12b07f62"
@@ -75,7 +81,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:646(None) C/evolution.xml:668(None)
+#: C/evolution.xml:627(None) C/evolution.xml:650(None)
 msgid ""
 "@@image: 'figures/evo_mboxreceive_a.png'; "
 "md5=a04753f7615eab6ac349f50caa39a7a8"
@@ -83,19 +89,21 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:696(None)
-msgid "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
+#: C/evolution.xml:678(None)
+msgid ""
+"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:743(None)
-msgid "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
+#: C/evolution.xml:725(None)
+msgid ""
+"@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:770(None)
+#: C/evolution.xml:753(None)
 msgid ""
 "@@image: 'figures/evo_mail_callout_a.png'; "
 "md5=4fa6dda9663d554197736dd2feb79575"
@@ -103,13 +111,13 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:945(None)
+#: C/evolution.xml:928(None)
 msgid "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:963(None)
+#: C/evolution.xml:946(None)
 msgid ""
 "@@image: 'figures/evo_cal_callout_a.png'; "
 "md5=6de000ad9c7b3fe42ed1996cad46432f"
@@ -117,7 +125,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:983(None)
+#: C/evolution.xml:966(None)
 msgid ""
 "@@image: 'figures/contacts_mainwindow_a.png'; "
 "md5=41335f17f056cb0b06e3df4900d08865"
@@ -125,13 +133,13 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:998(None)
+#: C/evolution.xml:980(None)
 msgid "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1001(None)
+#: C/evolution.xml:983(None)
 msgid ""
 "@@image: 'figures/evo_backup_warning.png'; "
 "md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
@@ -139,7 +147,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1009(None)
+#: C/evolution.xml:991(None)
 msgid ""
 "@@image: 'figures/evo_backup_prgsbar.png'; "
 "md5=046642d35e096154508269063d672b07"
@@ -147,62 +155,66 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1028(None)
+#: C/evolution.xml:1009(None)
 msgid "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1189(None)
+#: C/evolution.xml:1019(None)
+#, fuzzy
 msgid ""
-"@@image: 'figures/evo_mail_notifier.png'; "
-"md5=22ed4998283ebbc7da43881c42cb5bb8"
+"@@image: 'figures/evo_crash_recovery.png'; "
+"md5=6bfa921910f94e5845f893a6308169a6"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1191(None)
-msgid "@@image: 'figures/evo_newmail.png'; md5=16ab09468afc659751ebe117369a3912"
+#: C/evolution.xml:1183(None)
+#, fuzzy
+msgid "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1208(None)
+#: C/evolution.xml:1200(None)
 msgid "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1223(None)
+#: C/evolution.xml:1215(None)
 msgid "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1393(None)
+#: C/evolution.xml:1390(None)
 msgid "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1481(None)
+#: C/evolution.xml:1478(None)
 msgid "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1535(None)
+#: C/evolution.xml:1532(None)
+#, fuzzy
 msgid ""
-"@@image: 'figures/attach_reminder_a.png.png'; "
+"@@image: 'figures/attach_reminder_a.png'; "
 "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1548(None)
+#: C/evolution.xml:1545(None)
+#, fuzzy
 msgid ""
 "@@image: 'figures/evo_attachreminder_plugin.png'; "
-"md5=700a3e0f40b8c00ef39b17d5bda1dd36"
+"md5=25f7db7cd7d310110847354c62702ecf"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -216,12 +228,13 @@ msgstr "a"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1913(None)
-msgid "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+msgid ""
+"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2337(None)
+#: C/evolution.xml:2354(None)
 msgid ""
 "@@image: 'figures/evo_import_asst_a.png'; "
 "md5=e86638d0b3a01478fd4f12e33781a8a0"
@@ -229,13 +242,13 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2363(None)
+#: C/evolution.xml:2381(None)
 msgid "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2514(None)
+#: C/evolution.xml:2532(None)
 msgid ""
 "@@image: 'figures/evo_flag_follow_up_a.png'; "
 "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
@@ -243,7 +256,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2531(None)
+#: C/evolution.xml:2549(None)
 msgid ""
 "@@image: 'figures/evo_select_folder.png'; "
 "md5=7b99ef6be9990bc1c1d869512ae2f617"
@@ -251,7 +264,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2534(None)
+#: C/evolution.xml:2552(None)
 msgid ""
 "@@image: 'figures/evo_message_filters_a.png'; "
 "md5=3b7067638063c6aad2c316db838d2273"
@@ -259,37 +272,41 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2697(None)
-msgid "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+#: C/evolution.xml:2715(None)
+msgid ""
+"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2727(None)
-msgid "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+#: C/evolution.xml:2745(None)
+msgid ""
+"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2733(None)
-msgid "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+#: C/evolution.xml:2751(None)
+msgid ""
+"@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2760(None)
-msgid "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+#: C/evolution.xml:2778(None)
+msgid ""
+"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3008(None)
+#: C/evolution.xml:3026(None)
 msgid "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3099(None)
+#: C/evolution.xml:3117(None)
 msgid ""
 "@@image: 'figures/evo_select_add_folder.png'; "
 "md5=01d57d01ff1650d91c1d73de1f4301ab"
@@ -297,7 +314,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3192(None)
+#: C/evolution.xml:3210(None)
 msgid ""
 "@@image: 'figures/evo_contacteditor_a.png'; "
 "md5=4f188bd5d34a9fea7d91fdf5fb943f28"
@@ -305,31 +322,40 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3233(None)
+#: C/evolution.xml:3248(None)
 msgid "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3488(None)
+#: C/evolution.xml:3504(None)
 msgid "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3643(None)
+#: C/evolution.xml:3659(None)
 msgid "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3666(None)
-msgid "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+#: C/evolution.xml:3682(None)
+msgid ""
+"@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+msgstr "a"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/evolution.xml:3714(None)
+#, fuzzy
+msgid ""
+"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3748(None)
+#: C/evolution.xml:3813(None)
 msgid ""
 "@@image: 'figures/evo_calender_appointmnt.png'; "
 "md5=730ed74addbca4b0638f03cbcde99e71"
@@ -337,21 +363,21 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3815(None)
+#: C/evolution.xml:3881(None)
 msgid "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4009(None) C/evolution.xml:5332(None)
-#: C/evolution.xml:5716(None)
+#: C/evolution.xml:4077(None) C/evolution.xml:5352(None)
+#: C/evolution.xml:5738(None)
 msgid "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4105(None) C/evolution.xml:4419(None)
-#: C/evolution.xml:4657(None)
+#: C/evolution.xml:4173(None) C/evolution.xml:4487(None)
+#: C/evolution.xml:4725(None)
 msgid ""
 "@@image: 'figures/evo_cal_advsearch.png'; "
 "md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
@@ -359,25 +385,27 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4568(None)
+#: C/evolution.xml:4636(None)
 msgid "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4965(None)
-msgid "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+#: C/evolution.xml:5032(None)
+msgid ""
+"@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4975(None)
-msgid "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+#: C/evolution.xml:5037(None)
+msgid ""
+"@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4995(None)
+#: C/evolution.xml:5044(None)
 msgid ""
 "@@image: 'figures/exchng-rec-options.png'; "
 "md5=c3c759f902c2584ee218dc40d6e46806"
@@ -385,19 +413,21 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5018(None)
-msgid "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+#: C/evolution.xml:5058(None)
+msgid ""
+"@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5040(None)
-msgid "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+#: C/evolution.xml:5066(None)
+msgid ""
+"@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5057(None)
+#: C/evolution.xml:5074(None)
 msgid ""
 "@@image: 'figures/exchng-rec-option.png'; "
 "md5=6c0f84b7541a044e900d9d7c5fc4a49b"
@@ -405,13 +435,14 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5089(None) C/evolution.xml:5324(None)
-msgid "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+#: C/evolution.xml:5107(None) C/evolution.xml:5344(None)
+msgid ""
+"@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5131(None)
+#: C/evolution.xml:5149(None)
 msgid ""
 "@@image: 'figures/evo_send_option_a.png'; "
 "md5=c1cca904625d1a7de13c851cd15235f6"
@@ -419,13 +450,13 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5209(None)
+#: C/evolution.xml:5229(None)
 msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5218(None)
+#: C/evolution.xml:5238(None)
 msgid ""
 "@@image: 'figures/evo_delegate_permission_a.png'; "
 "md5=05df38ad69b20f9bd7c1e14044ca10fd"
@@ -433,7 +464,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5253(None)
+#: C/evolution.xml:5273(None)
 msgid ""
 "@@image: 'figures/sub-others-folder.png'; "
 "md5=5e385ee9524f93b65b307f83e1888138"
@@ -441,13 +472,13 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5283(None)
+#: C/evolution.xml:5303(None)
 msgid "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5612(None)
+#: C/evolution.xml:5632(None)
 msgid ""
 "@@image: 'figures/evo_identityedit_a.png'; "
 "md5=78418c3f6214b7494c323df12bc6921f"
@@ -455,7 +486,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5620(None)
+#: C/evolution.xml:5640(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveedit_a.png'; "
 "md5=3f5fc5b802eba3ef1a68e6ff675577b0"
@@ -463,7 +494,7 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5632(None)
+#: C/evolution.xml:5653(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
 "md5=1c9e818bb39bb288511cf1cebdd83569"
@@ -471,19 +502,21 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5677(None)
-msgid "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
+#: C/evolution.xml:5699(None)
+msgid ""
+"@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5709(None)
-msgid "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
+#: C/evolution.xml:5731(None)
+msgid ""
+"@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5781(None)
+#: C/evolution.xml:5802(None)
 msgid ""
 "@@image: 'figures/evo_gwstatustrack.png'; "
 "md5=d4eb84e2d55870af1408c430ce8c0e66"
@@ -491,119 +524,152 @@ msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5839(None)
-msgid "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+#: C/evolution.xml:5857(None)
+msgid ""
+"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5904(None)
-msgid "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+#: C/evolution.xml:5915(None)
+msgid ""
+"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6049(None)
-msgid "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
+#: C/evolution.xml:6056(None)
+msgid ""
+"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6071(None)
+#: C/evolution.xml:6079(None)
 msgid "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6080(None)
+#: C/evolution.xml:6088(None)
 msgid "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6237(None)
+#: C/evolution.xml:6231(None)
+#, fuzzy
 msgid ""
 "@@image: 'figures/mailer_preferences.png'; "
-"md5=f3e02233bea27f66ad3c117341677e86"
+"md5=4141df4bf4b2dc4e82a0bad514714194"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6346(None)
-msgid "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+#: C/evolution.xml:6340(None)
+msgid ""
+"@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6483(None)
+#: C/evolution.xml:6435(None)
+#, fuzzy
+msgid "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+msgstr "a"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/evolution.xml:6461(None)
+#, fuzzy
+msgid "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+msgstr "a"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/evolution.xml:6506(None)
 msgid "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
 msgstr "a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6960(None)
-msgid "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+#: C/evolution.xml:6850(None)
+#, fuzzy
+msgid ""
+"@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
 msgstr "a"
 
-#: C/evolution.xml:29(title) C/evolution.xml:7351(para)
-msgid "Evolution 2.12 User Guide"
-msgstr "Evolution 2.12 Benutzerhandbuch"
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/evolution.xml:7002(None)
+msgid ""
+"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+msgstr "a"
+
+#: C/evolution.xml:15(title) C/evolution.xml:7392(para)
+msgid "Evolution 2.22 User Guide"
+msgstr "Evolution 2.22 Benutzerhandbuch"
 
-#: C/evolution.xml:34(firstname) C/evolution.xml:36(corpauthor)
-#: C/evolution.xml:52(para) C/evolution.xml:60(para) C/evolution.xml:68(para)
-#: C/evolution.xml:76(para)
+#: C/evolution.xml:20(firstname) C/evolution.xml:22(corpauthor)
+#: C/evolution.xml:38(para) C/evolution.xml:46(para) C/evolution.xml:54(para)
+#: C/evolution.xml:62(para)
 msgid "Novell, Inc"
 msgstr "Novell, Inc"
 
-#: C/evolution.xml:40(title)
+#: C/evolution.xml:26(title)
 msgid "User's Guide to the Evolution Groupware Suite and Email Client"
-msgstr "Benutzerhandbuch für »Evolution«, ein E-Mail-Programm und Groupware-Client"
+msgstr ""
+"Benutzerhandbuch für »Evolution«, ein E-Mail-Programm und Groupware-Client"
 
-#: C/evolution.xml:43(date)
-msgid "2002-2007"
-msgstr "2002-2007"
+#: C/evolution.xml:29(date)
+msgid "2002-2008"
+msgstr "2002-2008"
+
+#: C/evolution.xml:34(revnumber) C/evolution.xml:77(productnumber)
+msgid "2.22"
+msgstr "2.22"
 
-#: C/evolution.xml:48(revnumber) C/evolution.xml:91(productnumber)
+#: C/evolution.xml:35(date)
+msgid "March 2008"
+msgstr "März 2008"
+
+#: C/evolution.xml:37(para) C/evolution.xml:45(para) C/evolution.xml:61(para)
+msgid "Radhika PC"
+msgstr "Radhika PC"
+
+#: C/evolution.xml:42(revnumber)
 msgid "2.12"
 msgstr "2.12"
 
-#: C/evolution.xml:49(date) C/evolution.xml:92(invpartnumber)
+#: C/evolution.xml:43(date)
 msgid "September 2007"
 msgstr "September 2007"
 
-#: C/evolution.xml:51(para) C/evolution.xml:59(para) C/evolution.xml:75(para)
-msgid "Radhika PC"
-msgstr "Radhika PC"
-
-#: C/evolution.xml:56(revnumber) C/evolution.xml:64(revnumber)
+#: C/evolution.xml:50(revnumber)
 msgid "2.10"
 msgstr "2.10"
 
-#: C/evolution.xml:57(date)
-msgid "March 14, 2007"
-msgstr "14. März 2007"
-
-#: C/evolution.xml:65(date)
+#: C/evolution.xml:51(date)
 msgid "November 20, 2006"
 msgstr "20. November 2006"
 
-#: C/evolution.xml:67(para)
+#: C/evolution.xml:53(para)
 msgid "Francisco Serrador"
 msgstr "Francisco Serrador"
 
-#: C/evolution.xml:72(revnumber)
+#: C/evolution.xml:58(revnumber)
 msgid "2.8"
 msgstr "2.8"
 
-#: C/evolution.xml:73(date)
+#: C/evolution.xml:59(date)
 msgid "October 5, 2006"
 msgstr "5. Oktober 2006"
 
-#: C/evolution.xml:81(releaseinfo)
-msgid "This manual describes version 2.12 of Evolution"
-msgstr "Dieses Handbuch beschreibt Version 2.12 von »Evolution«"
+#: C/evolution.xml:67(releaseinfo)
+msgid "This manual describes version 2.22 of Evolution"
+msgstr "Dieses Handbuch beschreibt Version 2.22 von »Evolution«"
 
-#: C/evolution.xml:85(para)
+#: C/evolution.xml:71(para)
 msgid ""
 "A user's guide to Evolution which explains how to use its mail, calendar, "
 "addressbook, and task list features."
@@ -611,219 +677,184 @@ msgstr ""
 "Ein Benutzerhandbuch für »Evolution«, welches die Nutzung der E-Mail-, "
 "Kalender-, Adressbuch- und Aufgabenfunktionen erklärt."
 
-#: C/evolution.xml:90(productname)
-msgid "Evolution™"
-msgstr "Evolution™"
+#: C/evolution.xml:76(productname) C/evolution.xml:5536(para)
+#: C/evolution.xml:7201(glossterm)
+msgid "Evolution"
+msgstr "Evolution"
+
+#: C/evolution.xml:78(invpartnumber)
+msgid "February 2008"
+msgstr "Februar 2008"
 
-#: C/evolution.xml:93(title)
+#: C/evolution.xml:79(title)
 msgid "User guide"
 msgstr "Benutzerhandbuch"
 
-#: C/evolution.xml:98(title)
+#: C/evolution.xml:84(title)
 msgid "About This Guide"
 msgstr "Über dieses Benutzerhandbuch"
 
-#: C/evolution.xml:99(para)
+#: C/evolution.xml:85(para)
 msgid ""
-"This guide describes how to use and manage Evolution™ 2.12 client software. "
-"This guide is intended for users and is divided into the following sections:"
+"This guide describes how to use and manage <trademark>Evolution</trademark> "
+"2.22 client software. This guide is intended for users and is divided into "
+"the following sections:"
 msgstr ""
-"Dieses Benutzerhandbuch beschreibt die Nutzung der Software Evolution™ "
-"2.12 und ist in die folgenden Kapitel unterteilt:"
+"Dieses Benutzerhandbuch beschreibt die Nutzung der Software Evolution™ 2.22 "
+"und ist in die folgenden Kapitel unterteilt:"
 
-#: C/evolution.xml:102(link) C/evolution.xml:169(title)
+#: C/evolution.xml:88(link) C/evolution.xml:149(title)
 msgid "Getting Started"
 msgstr "Erste Schritte"
 
-#: C/evolution.xml:105(link) C/evolution.xml:1125(title)
-msgid "Sending and Receiving E-Mail"
+#: C/evolution.xml:91(link) C/evolution.xml:1113(title)
+msgid "Sending and Receiving Email"
 msgstr "Verschicken und Abrufen von E-Mails"
 
-#: C/evolution.xml:108(link) C/evolution.xml:2240(title)
-msgid "Organizing Your E-Mail"
+#: C/evolution.xml:94(link) C/evolution.xml:2257(title)
+msgid "Organizing Your Email"
 msgstr "E-Mails organisieren"
 
-#: C/evolution.xml:111(link) C/evolution.xml:3132(title)
+#: C/evolution.xml:97(link) C/evolution.xml:3151(title)
 msgid "Evolution Contacts: the Address Book"
 msgstr "Das Adressbuch"
 
-#: C/evolution.xml:114(link) C/evolution.xml:3544(title)
+#: C/evolution.xml:100(link) C/evolution.xml:3560(title)
 msgid "Evolution Calendar"
 msgstr "Der Kalender"
 
-#: C/evolution.xml:117(link) C/evolution.xml:4786(title)
+#: C/evolution.xml:103(link) C/evolution.xml:4853(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Mit Exchange-Servern verbinden"
 
-#: C/evolution.xml:120(link) C/evolution.xml:5388(title)
+#: C/evolution.xml:106(link) C/evolution.xml:5408(title)
 msgid "Connecting to GroupWise"
 msgstr "Mit GroupWise verbinden"
 
-#: C/evolution.xml:123(link) C/evolution.xml:6194(title)
-msgid "Connecting to Hula"
-msgstr "Mit Hula verbinden"
-
-#: C/evolution.xml:126(link) C/evolution.xml:6211(title)
+#: C/evolution.xml:109(link) C/evolution.xml:6202(title)
 msgid "Advanced Configuration"
 msgstr "Weiterführende Einstellungen"
 
-#: C/evolution.xml:129(link) C/evolution.xml:6822(title)
+#: C/evolution.xml:112(link) C/evolution.xml:6864(title)
 msgid "Synchronizing Your Handheld Device"
 msgstr "Mit tragbaren Geräten synchronisieren"
 
-#: C/evolution.xml:132(link) C/evolution.xml:6879(title)
+#: C/evolution.xml:115(link) C/evolution.xml:6921(title)
 msgid "Migration from Outlook to Evolution"
 msgstr "Migration von Outlook zu Evolution"
 
-#: C/evolution.xml:135(link) C/evolution.xml:6941(title)
+#: C/evolution.xml:118(link) C/evolution.xml:6983(title)
 msgid "Quick Reference"
 msgstr "Kurzreferenz"
 
-#: C/evolution.xml:138(link) C/evolution.xml:7055(title)
+#: C/evolution.xml:121(link) C/evolution.xml:7097(title)
 msgid "Known Bugs and Limitations"
 msgstr "Bekannte Fehler und Limitierungen"
 
-#: C/evolution.xml:141(link) C/evolution.xml:7062(title)
+#: C/evolution.xml:124(link) C/evolution.xml:7103(title)
 msgid "Authors"
 msgstr "Autoren"
 
-#: C/evolution.xml:144(link) C/evolution.xml:7121(title)
+#: C/evolution.xml:127(link) C/evolution.xml:7162(title)
 msgid "Glossary"
 msgstr "Glossar"
 
-#: C/evolution.xml:148(title)
+#: C/evolution.xml:131(title)
 msgid "Additional Documentation:"
 msgstr "Weiterführende Dokumentation:"
 
-#: C/evolution.xml:149(para)
+#: C/evolution.xml:132(para)
 msgid "You can find additional help in three places:"
 msgstr "Sie können weiterführende Hilfe an drei Stellen finden:"
 
-#: C/evolution.xml:153(para)
+#: C/evolution.xml:136(para)
 msgid ""
-"For information about command line options, open a terminal window and type "
+"Evolution has a number of command line options that you can use. For "
+"information about command line options, open a terminal window and type "
 "<command>evolution --help</command>."
 msgstr ""
 "Für Informationen über die Befehlszeilen-Optionen, öffnen Sie ein Terminal-"
 "Fenster und geben Sie <command>evolution --help</command> ein."
 
-#: C/evolution.xml:156(para)
-msgid ""
-"For support, late-breaking news, and errata, visit the Novell® support "
-"center at <ulink url=\"http://support.novell.com\">support.novell.com</"
-"ulink>."
-msgstr ""
-"Für Hilfe, Neuigkeiten und Fehlerverbesserungen besuchen Sie bitte das "
-"Novell®-Hilfezentrum unter der Adresse <ulink url=\"http://support."
-"novell.com\">support.novell.com</ulink>."
-
-#: C/evolution.xml:159(para)
+#: C/evolution.xml:139(para)
 msgid "In the Evolution interface, click Help &gt; Contents."
 msgstr "Klicken Sie auf Hilfe &gt; Inhalt in Evolution."
 
-#: C/evolution.xml:163(title)
+#: C/evolution.xml:143(title)
 msgid "Documentation Conventions:"
 msgstr "Konventionen in dieser Dokumentation:"
 
-#: C/evolution.xml:164(para)
+#: C/evolution.xml:144(para)
 msgid ""
 "In Novell documentation, a greater-than symbol (&gt;) is used to separate "
 "actions within a step and items in a cross-reference path. A trademark "
-"symbol (®, TM, etc.) denotes a Novell trademark. An asterisk (*) denotes a "
-"third-party trademark."
+"symbol (<trademark class=\"registered\"/>, <trademark/>, etc.) denotes a "
+"Novell trademark. An asterisk (*) denotes a third-party trademark."
 msgstr ""
 "Innerhalb dieser Dokumentation wird ein größer-als-Symbol (&gt;) benutzt, um "
 "mehrere Aktionen eines Schrittes oder Elemente in einer Querreferenz "
 "darzustellen. Ein Trademark-Symbol (®, TM, etc.) bezeichnet ein Novell-"
 "Trademark. Ein Sternchen (*) bezeichnet ein Trademark einer Drittpartei."
 
-#: C/evolution.xml:170(para)
+#: C/evolution.xml:150(para)
 msgid ""
-"Evolution™ makes the tasks of storing, organizing, and retrieving your "
-"personal information easy, so you can work and communicate more effectively "
-"with others. It is a highly evolved <link linkend=\"groupware\">groupware</"
-"link> program, an integral part of the Internet-connected desktop."
+"<trademark>Evolution</trademark> is a <link linkend=\"groupware\">groupware</"
+"link> application that helps you work in a group by handling email, address, "
+"memos, tasks, and one or more calendars. This makes the tasks of storing, "
+"organizing, and retrieving your personal information easy, so you can work "
+"and communicate more effectively with others."
 msgstr ""
-"Evolution™ macht das Speichern, Empfangen und Organisieren Ihrer "
-"persönlichen Informationen einfach. Es handelt sich um weitentwickeltes "
-"<link linkend=\"groupware\">Groupware</link>-Programm."
+"<trademark>Evolution</trademark> ist eine <link linkend=\"groupware"
+"\">Groupware</link>-Anwendung die Ihnen dabei hilft, E-Mails, Adressen, "
+"Notizen, Aufgaben und Kalender zu handhaben."
 
-#: C/evolution.xml:171(para)
-msgid ""
-"Evolution can help you work in a group by handling e-mail, address, and "
-"other contact information, and one or more calendars. It can do that on one "
-"or several computers, connected directly or over a network, for one person "
-"or for large groups."
-msgstr ""
-"Evolution hilft Ihnen bei der Gruppenarbeit, indem es E-Mails, Adressen und "
-"Kontaktinformationen sowie ein oder mehrere Kalender handhabt. Evolution "
-"kann dies auf einem oder mehreren Computern erledigen, direkt oder über ein "
-"Netzwerk verbunden, für eine Person oder größere Gruppen."
-
-#: C/evolution.xml:172(para)
-msgid ""
-"With Evolution, you can accomplish your most common daily tasks quickly. For "
-"example, it takes only one or two clicks to enter appointment or contact "
-"information sent to you by e-mail, or to send e-mail to a contact or "
-"appointment. People who get lots of e-mail will appreciate advanced features "
-"like <link linkend=\"vfolder\">search folders</link>, which let you save "
-"searches as though they were ordinary e-mail folders."
-msgstr ""
-"Mit Evolution können Sie ihre wichtigsten täglichen Aufgaben schnell "
-"erledigen. Zum Beispiel benötigen Sie nur ein oder zwei Klicks, um Termin- "
-"oder Kontaktinformationen einzutragen, die Sie per E-Mail erhalten haben, "
-"oder um eine E-Mail an einen Kontakt zu schicken. Falls Sie viele E-Mails "
-"erhalten, werden Sie weiterführende Funktionen wie die <link linkend="
-"\"vfolder\">Suchordner</link> zu würdigen wissen, welche das Speichern von "
-"Suchen ermöglicht, als ob diese normale E-Mail-Ordner wären."
-
-#: C/evolution.xml:175(link) C/evolution.xml:183(title)
+#: C/evolution.xml:153(link) C/evolution.xml:161(title)
 msgid "Starting Evolution for the First Time"
 msgstr "Evolution zum ersten Mal starten"
 
-#: C/evolution.xml:178(link) C/evolution.xml:768(title)
+#: C/evolution.xml:156(link) C/evolution.xml:751(title)
 msgid "Using Evolution: An Overview"
 msgstr "Evolution benutzen: Ein Überblick"
 
-#: C/evolution.xml:186(para)
+#: C/evolution.xml:164(para)
 msgid "Start the Evolution client."
 msgstr "Starten Sie das Programm »Evolution«."
 
-#: C/evolution.xml:194(para)
+#: C/evolution.xml:172(para)
 msgid "GNOME:"
 msgstr "GNOME:"
 
-#: C/evolution.xml:197(para)
+#: C/evolution.xml:175(para)
 msgid "Click Applications &gt; Office &gt; Evolution."
 msgstr "Klicken Sie auf Anwendungen &gt; Büro &gt; Evolution."
 
-#: C/evolution.xml:202(para)
+#: C/evolution.xml:180(para)
 msgid "KDE:"
 msgstr "KDE:"
 
-#: C/evolution.xml:205(para)
+#: C/evolution.xml:183(para)
 msgid "Click the K menu &gt; Office &gt; More Programs &gt; Evolution."
 msgstr ""
 "Klicken Sie auf das K-Menü und dort auf Büro &gt; Weitere Programme &gt; "
 "Evolution."
 
-#: C/evolution.xml:210(para)
+#: C/evolution.xml:188(para)
 msgid "Command Line:"
 msgstr "Befehlszeile:"
 
-#: C/evolution.xml:213(para)
+#: C/evolution.xml:191(para)
 msgid "Enter <command>evolution</command>."
 msgstr "Geben Sie den Befehl <command>evolution</command> ein."
 
-#: C/evolution.xml:223(title)
+#: C/evolution.xml:201(title)
 msgid "Using the First-Run Assistant"
 msgstr "Den Erste-Schritte-Assistenten benutzen"
 
-#: C/evolution.xml:224(para)
+#: C/evolution.xml:202(para)
 msgid ""
 "The first time you run Evolution, it creates a directory <emphasis>."
 "evolution</emphasis> in your home directory, where it stores all of its "
-"local data. Then, it opens a First-Run Assistant to help you set up e-mail "
+"local data. Then, it opens a First-Run Assistant to help you set up email "
 "accounts and import data from other applications."
 msgstr ""
 "Wenn Sie das erste Mal Evolution starten, wird ein Verzeichnis mit den Namen "
@@ -832,11 +863,11 @@ msgstr ""
 "der Ihnen dabei hilft Ihre E-Mail-Konten einzutragen und gegebenenfalls "
 "Daten aus anderen Programmen zu importieren."
 
-#: C/evolution.xml:225(para)
+#: C/evolution.xml:203(para)
 msgid "Using the first-run assistant takes two to five minutes."
 msgstr "Die Nutzung des Erste-Schritte-Assistenten dauert zwei bis fünf Minuten."
 
-#: C/evolution.xml:226(para)
+#: C/evolution.xml:204(para)
 msgid ""
 "Later on, if you want to change this account, or if you want to create a new "
 "one, click Edit &gt; Preferences, then click Mail Accounts. Select the "
@@ -851,7 +882,7 @@ msgstr ""
 "indem Sie auf Hinzufügen klicken. Siehe <link linkend=\"config-prefs-mail"
 "\">E-Mail-Einstellungen</link> für weitere Details."
 
-#: C/evolution.xml:227(para)
+#: C/evolution.xml:205(para)
 msgid ""
 "The First-Run Assistant helps you provide the information Evolution needs to "
 "get started."
@@ -859,35 +890,35 @@ msgstr ""
 "Der Erste-Schritte-Assistent hilft Ihnen, die zur Nutzung von Evolution "
 "benötigten Informationen einzugeben."
 
-#: C/evolution.xml:230(link) C/evolution.xml:250(title)
+#: C/evolution.xml:208(link) C/evolution.xml:228(title)
 msgid "Defining Your Identity"
 msgstr "Definieren Ihrer Identität"
 
-#: C/evolution.xml:233(link) C/evolution.xml:280(title)
+#: C/evolution.xml:211(link) C/evolution.xml:258(title)
 msgid "Receiving Mail"
 msgstr "Abrufen von E-Mails"
 
-#: C/evolution.xml:236(link) C/evolution.xml:378(title)
+#: C/evolution.xml:214(link) C/evolution.xml:353(title)
 msgid "Receiving Mail Options"
 msgstr "E-Mail-Empfangsoptionen"
 
-#: C/evolution.xml:239(link) C/evolution.xml:677(title)
+#: C/evolution.xml:217(link) C/evolution.xml:659(title)
 msgid "Sending Mail"
 msgstr "E-Mails verschicken"
 
-#: C/evolution.xml:242(link) C/evolution.xml:731(title)
+#: C/evolution.xml:220(link) C/evolution.xml:713(title)
 msgid "Account Management"
 msgstr "Kontoverwaltung"
 
-#: C/evolution.xml:245(link) C/evolution.xml:737(title)
+#: C/evolution.xml:223(link) C/evolution.xml:719(title)
 msgid "Time Zone"
 msgstr "Zeitzone"
 
-#: C/evolution.xml:251(para)
+#: C/evolution.xml:229(para)
 msgid "The Identity window is the first step in the assistant."
 msgstr "Das Identitätsfenster ist der erste Schritt im Assistenten."
 
-#: C/evolution.xml:253(para)
+#: C/evolution.xml:231(para)
 msgid ""
 "Here, you enter some basic personal information. You can define multiple "
 "identities later by clicking Edit &gt; Preferences, then clicking Mail "
@@ -897,7 +928,7 @@ msgstr ""
 "weitere Identitäten eingeben, indem Sie auf Bearbeiten &gt; Einstellungen "
 "klicken und dann auf E-Mail-Konten."
 
-#: C/evolution.xml:254(para)
+#: C/evolution.xml:232(para)
 msgid ""
 "When the First-Run Assistant starts, the Welcome page is displayed. Click "
 "Forward to proceed to the Identity window."
@@ -905,56 +936,58 @@ msgstr ""
 "Wenn der Erste-Schritte-Assistent gestartet wird, wird die Willkommensseite "
 "angezeigt. Klicken Sie auf Vor, um zum Identitätsfenster zu gelangen."
 
-#: C/evolution.xml:257(para)
+#: C/evolution.xml:235(para)
 msgid "Type your full name in the Full Name field."
 msgstr "Geben Sie Ihren vollen Namen in das Feld »Voller Name« ein."
 
-#: C/evolution.xml:260(para)
-msgid "Type your e-mail address in the E-Mail Address field."
+#: C/evolution.xml:238(para)
+msgid "Type your email address in the Email Address field."
 msgstr "Geben Sie Ihre E-Mail-Adresse in das Feld »E-Mail-Adresse« ein."
 
-#: C/evolution.xml:263(para)
+#: C/evolution.xml:241(para)
 msgid "(Optional) Select if this account is your default account."
 msgstr "(Optional) Wählen Sie, ob es sich um Ihr Vorgabekonto handelt."
 
-#: C/evolution.xml:266(para)
+#: C/evolution.xml:244(para)
 msgid "(Optional) Type a reply to address in the Reply-To field."
 msgstr "(Optional) Geben Sie ein Antwortadresse in das »Antwort an«-Feld ein."
 
-#: C/evolution.xml:267(para)
-msgid "Use this field if you want replies to messages sent to a different address."
+#: C/evolution.xml:245(para)
+msgid ""
+"Use this field if you want replies to messages sent to a different address."
 msgstr ""
 "Benutzen Sie dieses Feld, falls Sie wünschen, dass Antworten auf Ihre "
 "verschickten E-Mails an eine andere Adresse geschickt werden."
 
-#: C/evolution.xml:270(para)
+#: C/evolution.xml:248(para)
 msgid "(Optional) Type your organization name in the Organization field."
 msgstr "(Optional) Geben Sie Ihre Organisation in das »Organisation«-Feld ein."
 
-#: C/evolution.xml:271(para)
+#: C/evolution.xml:249(para)
 msgid ""
 "This is the company where you work, or the organization you represent when "
-"you send e-mail."
+"you send email."
 msgstr ""
 "Hierbei handelt es sich um die Firma für welche Sie arbeiten, oder die "
 "Organisation die sie repräsentieren wenn Sie E-Mails verschicken."
 
-#: C/evolution.xml:274(para) C/evolution.xml:364(para)
-#: C/evolution.xml:442(para) C/evolution.xml:485(para)
-#: C/evolution.xml:529(para) C/evolution.xml:550(para)
-#: C/evolution.xml:573(para) C/evolution.xml:587(para)
-#: C/evolution.xml:604(para) C/evolution.xml:624(para)
-#: C/evolution.xml:645(para) C/evolution.xml:667(para)
-#: C/evolution.xml:723(para) C/evolution.xml:2307(para)
-#: C/evolution.xml:2329(para)
+#: C/evolution.xml:252(para) C/evolution.xml:339(para)
+#: C/evolution.xml:417(para) C/evolution.xml:460(para)
+#: C/evolution.xml:504(para) C/evolution.xml:526(para)
+#: C/evolution.xml:550(para) C/evolution.xml:565(para)
+#: C/evolution.xml:583(para) C/evolution.xml:604(para)
+#: C/evolution.xml:626(para) C/evolution.xml:649(para)
+#: C/evolution.xml:705(para) C/evolution.xml:2324(para)
+#: C/evolution.xml:2346(para)
 msgid "Click Forward."
 msgstr "Klicken Sie auf Vor."
 
-#: C/evolution.xml:281(para)
-msgid "The Receiving E-mail option lets you determine where you get your e-mail."
-msgstr "Die Seite »Abrufen von E-Mails« legt fest, woher Sie Ihre E-Mails erhalten."
+#: C/evolution.xml:259(para)
+msgid "The Receiving Email option lets you determine where you get your email."
+msgstr ""
+"Die Seite »Abrufen von E-Mails« legt fest, woher Sie Ihre E-Mails erhalten."
 
-#: C/evolution.xml:283(para)
+#: C/evolution.xml:261(para)
 msgid ""
 "You need to specify the type of server you want to receive mail with. If you "
 "are unsure about the type of server to choose, ask your system administrator "
@@ -964,39 +997,40 @@ msgstr ""
 "erhalten. Falls Sie sich unsicher sind um welchen Server-Typen es sich "
 "handelt, so fragen Sie Ihren Systemadministrator oder Ihren E-Mail-Anbieter."
 
-#: C/evolution.xml:286(para)
+#: C/evolution.xml:264(para)
 msgid "Select a server type in the Server Type list."
 msgstr "Wählen Sie einen Server-Typen aus der »Server-Typ«-Liste."
 
-#: C/evolution.xml:287(para)
+#: C/evolution.xml:265(para)
 msgid "The following is a list of server types that are available:"
 msgstr "Folgende Server-Typen sind verfügbar:"
 
-#: C/evolution.xml:289(title)
+#: C/evolution.xml:267(title)
 msgid "Novell GroupWise:"
 msgstr "Novell GroupWise:"
 
-#: C/evolution.xml:290(para)
+#: C/evolution.xml:268(para)
 msgid ""
-"Select this option if you connect to Novell GroupWise®. Novell GroupWise "
-"keeps e-mail, calendar, and contact information on the server. For "
-"configuration instructions, see <link linkend=\"bstfw13\">Remote "
-"Configuration Options</link>."
+"Select this option if you connect to Novell <trademark class=\"registered"
+"\">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and "
+"contact information on the server. For configuration instructions, see <link "
+"linkend=\"bstfw13\">Remote Configuration Options</link>."
 msgstr ""
-"Wählen Sie diese Option, falls Sie sich mit Novell GroupWise® verbinden "
+"Wählen Sie diese Option, falls Sie sich mit Novell <trademark "
+"class=\"registered\">GroupWise</trademark> verbinden "
 "wollen. Novell GroupWise behält E-Mails, Kalender- und Kontaktinformationen "
 "auf dem Server. Für Anleitungen zur Konfiguration siehe <link linkend="
 "\"bstfw13\">Fernzugriff-Einstellungsoptionen</link>."
 
-#: C/evolution.xml:293(title)
+#: C/evolution.xml:271(title)
 msgid "Microsoft Exchange:"
 msgstr "Microsoft Exchange:"
 
-#: C/evolution.xml:294(para)
+#: C/evolution.xml:272(para)
 msgid ""
 "Available only if you have installed the Connector for Microsoft* Exchange. "
 "It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which "
-"stores e-mail, calendar, and contact information on the server. For "
+"stores email, calendar, and contact information on the server. For "
 "configuration instructions, see <link linkend=\"bstfw13\">Remote "
 "Configuration Options</link>."
 msgstr ""
@@ -1007,13 +1041,14 @@ msgstr ""
 "Konfiguration siehe <link linkend=\"bstfw13\">Fernzugriff-"
 "Einstellungsoptionen</link>."
 
-#: C/evolution.xml:297(title)
+#: C/evolution.xml:275(title)
 msgid "IMAP:"
 msgstr "IMAP:"
 
-#: C/evolution.xml:298(para)
+#: C/evolution.xml:276(para)
+#, fuzzy
 msgid ""
-"Keeps the e-mail on your server so you can access your e-mail from multiple "
+"Keeps the email on your server so you can access your email from multiple "
 "systems. For configuration instructions, see <link linkend=\"bstfw13"
 "\">Remote Configuration Options</link>."
 msgstr ""
@@ -1021,42 +1056,26 @@ msgstr ""
 "verschiedenen Computern zugreifen können. Für Anleitungen zur Konfiguration "
 "siehe <link linkend=\"bstfw13\">Fernzugriff-Einstellungsoptionen</link>."
 
-#: C/evolution.xml:301(title)
+#: C/evolution.xml:279(title)
 msgid "POP:"
 msgstr "POP:"
 
-#: C/evolution.xml:302(para)
+#: C/evolution.xml:280(para)
 msgid ""
-"Downloads your e-mail to your hard disk for permanent storage, freeing up "
-"space on the e-mail server. For configuration instructions, see <link "
-"linkend=\"bstfw13\">Remote Configuration Options</link>."
+"Downloads your email to your hard disk for permanent storage, freeing up "
+"space on the email server. For configuration instructions, see <link linkend="
+"\"bstfw13\">Remote Configuration Options</link>."
 msgstr ""
 "Lädt Ihre E-Mails auf Ihre Festplatte zur permanenten Speicherung herunter, "
 "so dass Platz auf dem E-Mail-Server geschaffen wird. Für Anleitungen zur "
 "Konfiguration siehe <link linkend=\"bstfw13\">Fernzugriff-"
 "Einstellungsoptionen</link>."
 
-#: C/evolution.xml:305(title)
-msgid "Hula:"
-msgstr "Hula:"
-
-#: C/evolution.xml:306(para)
-msgid ""
-"Select this option if you want Hula account. Evolution provide you "
-"connectivity to Hula® servers through IMAP and calendaring support through "
-"CalDAV. For more information refer <link linkend=\"b1012tkg\">Connecting to "
-"Hula</link>"
-msgstr ""
-"Wählen Sie diese Option, falls Sie sich mit einem Hula-Server verbinden "
-"wollen. Evolution bietet Zugriff auf Hula&reg;-Server per IMAP und Kalender-"
-"Zugriff per CalDAV. Für weitere Informationen siehe <link linkend=\"b1012tkg"
-"\">Mit Hula verbinden</link>."
-
-#: C/evolution.xml:309(title)
+#: C/evolution.xml:283(title)
 msgid "USENET News:"
 msgstr "USENET-News:"
 
-#: C/evolution.xml:310(para)
+#: C/evolution.xml:284(para)
 msgid ""
 "Connects to the news server and downloads a list of available news digests. "
 "For configuration instructions, see <link linkend=\"bstfw13\">Remote "
@@ -1066,16 +1085,16 @@ msgstr ""
 "Nachrichten aus Newsgroups herunter. Für Anleitungen zur Konfiguration siehe "
 "<link linkend=\"bstfw13\">Fernzugriff-Einstellungsoptionen</link>."
 
-#: C/evolution.xml:313(title)
+#: C/evolution.xml:287(title)
 msgid "Local Delivery:"
 msgstr "Lokale Auslieferung:"
 
-#: C/evolution.xml:314(para)
+#: C/evolution.xml:288(para)
 msgid ""
-"Choose this option if you want to move e-mail from the spool (the location "
+"Choose this option if you want to move email from the spool (the location "
 "where mail waits for delivery) and store it in your home directory. You need "
 "to provide the path to the mail spool you want to use. If you want to leave "
-"e-mail in your system's spool files, choose the Standard Unix Mbox Spool "
+"email in your system's spool files, choose the Standard Unix Mbox Spool "
 "option instead. For configuration instructions, see <link linkend=\"bstgbqn"
 "\">Local Configuration Options</link>."
 msgstr ""
@@ -1088,13 +1107,13 @@ msgstr ""
 "Einstellungen siehe <link linkend=\"bstgbqn\">Lokale "
 "Konfigurationseinstellungen</link>."
 
-#: C/evolution.xml:317(title)
+#: C/evolution.xml:291(title)
 msgid "MH Format Mail Directories:"
 msgstr "E-Mail-Verzeichnisse im MH-Format"
 
-#: C/evolution.xml:318(para)
+#: C/evolution.xml:292(para)
 msgid ""
-"If you download your e-mail using mh or another MH-style program, you should "
+"If you download your email using mh or another MH-style program, you should "
 "use this option. You need to provide the path to the mail directory you want "
 "to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local "
 "Configuration Options</link>."
@@ -1105,16 +1124,16 @@ msgstr ""
 "den Einstellungen siehe <link linkend=\"bstgbqn\">Lokale "
 "Konfigurationseinstellungen</link>."
 
-#: C/evolution.xml:321(title)
+#: C/evolution.xml:295(title)
 msgid "Maildir Format Mail Directories:"
 msgstr "E-Mail-Verzeichnisse im Maildir-Format"
 
-#: C/evolution.xml:322(para)
+#: C/evolution.xml:296(para)
 msgid ""
-"If you download your e-mail using Qmail or another maildir-style program, "
-"you should use this option. You need to provide the path to the mail "
-"directory you want to use. For configuration instructions, see <link linkend="
-"\"bstgbqn\">Local Configuration Options</link>."
+"If you download your email using Qmail or another maildir-style program, you "
+"should use this option. You need to provide the path to the mail directory "
+"you want to use. For configuration instructions, see <link linkend=\"bstgbqn"
+"\">Local Configuration Options</link>."
 msgstr ""
 "Wählen Sie diese Option falls Sie E-Mails per Qmail oder durch ein anderes "
 "Maildir-benutzendes Programm herunterladen wollen. Hierfür müssen Sie den "
@@ -1122,56 +1141,58 @@ msgstr ""
 "Anleitung zu den Einstellungen siehe <link linkend=\"bstgbqn\">Lokale "
 "Konfigurationseinstellungen</link>."
 
-#: C/evolution.xml:325(title)
+#: C/evolution.xml:299(title)
 msgid "Standard Unix mbox spool file:"
 msgstr "Standard-Unix-mbox-Spool-Datei:"
 
-#: C/evolution.xml:326(para)
+#: C/evolution.xml:300(para)
 msgid ""
-"If you want to read and store e-mail in the mail spool file on your local "
+"If you want to read and store email in the mail spool file on your local "
 "system, choose this option. You need to provide the path to the mail spool "
 "file you want to use. For configuration instructions, see <link linkend="
 "\"bstgbqn\">Local Configuration Options</link>."
 msgstr ""
-"Wählen Sie diese Option falls Sie E-Mails in der E-Mail-Spool-Datei ihres lokalen "
-"Systems lesen und speichern möchten. Hierfür müssen Sie den Pfad zur Spool-Datei "
-"angeben, der benutzt werden soll. Für eine Anleitung zu den Einstellungen "
-"siehe <link linkend=\"bstgbqn\">Lokale Konfigurationseinstellungen</link>."
+"Wählen Sie diese Option falls Sie E-Mails in der E-Mail-Spool-Datei ihres "
+"lokalen Systems lesen und speichern möchten. Hierfür müssen Sie den Pfad zur "
+"Spool-Datei angeben, der benutzt werden soll. Für eine Anleitung zu den "
+"Einstellungen siehe <link linkend=\"bstgbqn\">Lokale "
+"Konfigurationseinstellungen</link>."
 
-#: C/evolution.xml:329(title)
+#: C/evolution.xml:303(title)
 msgid "Standard Unix mbox spool directory:"
 msgstr "Standard-Unix-mbox-Verzeichnis:"
 
-#: C/evolution.xml:330(para)
+#: C/evolution.xml:304(para)
 msgid ""
-"If you want to read and store e-mail in the mail spool directory on your "
+"If you want to read and store email in the mail spool directory on your "
 "local system, choose this option. You need to provide the path to the mail "
 "spool directory you want to use. For configuration instructions, see <link "
 "linkend=\"bstgbqn\">Local Configuration Options</link>."
 msgstr ""
-"Wählen Sie diese Option falls Sie E-Mails im E-Mail-Spool-Verzeichnis ihres lokalen "
-"Systems lesen und speichern möchten. Hierfür müssen Sie den Pfad zum Spool-Verzeichnis "
-"angeben, der benutzt werden soll. Für eine Anleitung zu den Einstellungen "
-"siehe <link linkend=\"bstgbqn\">Lokale Konfigurationseinstellungen</link>."
+"Wählen Sie diese Option falls Sie E-Mails im E-Mail-Spool-Verzeichnis ihres "
+"lokalen Systems lesen und speichern möchten. Hierfür müssen Sie den Pfad zum "
+"Spool-Verzeichnis angeben, der benutzt werden soll. Für eine Anleitung zu "
+"den Einstellungen siehe <link linkend=\"bstgbqn\">Lokale "
+"Konfigurationseinstellungen</link>."
 
-#: C/evolution.xml:333(title) C/evolution.xml:5224(title)
+#: C/evolution.xml:307(title) C/evolution.xml:5244(title)
 msgid "None:"
 msgstr "Keine:"
 
-#: C/evolution.xml:334(para)
+#: C/evolution.xml:308(para)
 msgid ""
-"Select this if you do not plan to check e-mail with this account. If you "
+"Select this if you do not plan to check email with this account. If you "
 "select this, there are no configuration options."
 msgstr ""
 "Wählen Sie diese Option, falls Sie keine E-Mails mit diesem Konto abrufen "
 "möchten. Falls Sie diese Option wählen gibt es keine weiteren "
 "Konfigurationsoptionen."
 
-#: C/evolution.xml:340(title)
+#: C/evolution.xml:314(title)
 msgid "Remote Configuration Options"
 msgstr "Fernzugriff-Einstellungsoptionen"
 
-#: C/evolution.xml:341(para)
+#: C/evolution.xml:315(para)
 msgid ""
 "If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, "
 "you need to specify additional information."
@@ -1179,59 +1200,71 @@ msgstr ""
 "Falls Sie Novell GroupWise, IMAP, POP, oder USENET-News als Ihren Server "
 "ausgewählt haben, so müssen Sie weitere Informationen eingeben."
 
-#: C/evolution.xml:344(para)
-msgid "Type the server name of your e-mail server in the Server field."
+#: C/evolution.xml:318(para) C/evolution.xml:681(para)
+msgid "Type the server name of your email server in the Server field."
 msgstr "Geben Sie den Namen des E-Mail-Servers in das »Server«-Feld ein."
 
-#: C/evolution.xml:345(para)
-msgid "If you don't know the Server, contact your administrator."
+#: C/evolution.xml:319(para) C/evolution.xml:682(para)
+msgid ""
+"If you are unsure what your Server address is, contact your system "
+"administrator."
 msgstr ""
 "Falls Sie den Namen des Servers nicht kennen, so fragen Sie Ihren "
 "Administrator."
 
-#: C/evolution.xml:348(para)
-msgid "Type your username for the account in the Username field."
-msgstr "Geben Sie Ihren Benutzernamen im »Benutzername«-Feld ein."
+#: C/evolution.xml:322(para) C/evolution.xml:694(para)
+msgid "Type your username in the Username field."
+msgstr "Tragen Sie Ihren Benutzernamen in das »Benutzername«-Feld ein."
 
-#: C/evolution.xml:351(para)
-msgid "Select to use a secure (SSL) connection."
-msgstr "Wählen Sie aus, ob Sie eine sichere Verbindung benutzen möchten."
+#: C/evolution.xml:325(para) C/evolution.xml:702(para)
+msgid "Select if you want to use a secure connection (SSL or TLS)."
+msgstr ""
+"Wählen Sie aus, ob Sie eine sichere Verbindung (SSL oder TLS) benutzen "
+"möchten."
+
+#: C/evolution.xml:326(para)
+msgid "You should enable this option if your server supports it."
+msgstr ""
+"Sie sollten diese Funktion aktivieren, falls sie von Ihrem Server "
+"unterstützt wird."
 
-#: C/evolution.xml:352(para)
+#: C/evolution.xml:327(para) C/evolution.xml:333(para)
 msgid ""
-"If your server supports secure connections, you should enable this security "
-"option. If you are unsure if your server supports a secure connection, "
-"contact your system administrator."
+"Free webmail providers usually supply information about which of these "
+"options can be used. If you are in an organizational environment, you may "
+"want to contact your system administrator for more information."
 msgstr ""
-"Falls der von Ihnen genutzte Server sichere Verbindungen wie SSL oder TLS "
-"unterstützt, so sollten Sie diese Sicherheitsoption nutzen. Falls Sie nicht "
-"wissen, ob der Server sichere Verbindungen unterstützt, so fragen Sie Ihren "
-"System-Administrator."
+"Kostenlose Webmail-Provider veröffentlichen normalerweise Informationen "
+"darüber, welche Optionen Sie zum Verbinden nutzen können. Falls Sie in einer "
+"Firma oder einer Organisation arbeiten, so fragen Sie bitte Ihren System-"
+"Administrator für weitere Informationen."
 
-#: C/evolution.xml:355(para) C/evolution.xml:707(para)
+#: C/evolution.xml:330(para) C/evolution.xml:689(para)
+#: C/evolution.xml:5073(para)
 msgid "Select your authentication type in the Authentication list."
 msgstr "Wählen Sie die Legitimationsart in der Liste der verfügbaren Typen."
 
-#: C/evolution.xml:356(para) C/evolution.xml:708(para)
-#: C/evolution.xml:741(para) C/evolution.xml:1939(para)
-#: C/evolution.xml:2062(para) C/evolution.xml:2070(para)
-#: C/evolution.xml:2221(para) C/evolution.xml:2998(para)
-#: C/evolution.xml:3003(para) C/evolution.xml:3431(para)
-#: C/evolution.xml:3446(para) C/evolution.xml:3454(para)
-#: C/evolution.xml:3739(para) C/evolution.xml:3741(para)
-#: C/evolution.xml:3743(para) C/evolution.xml:3762(para)
-#: C/evolution.xml:3773(para) C/evolution.xml:3778(para)
-#: C/evolution.xml:3798(para) C/evolution.xml:3806(para)
-#: C/evolution.xml:3937(para) C/evolution.xml:3947(para)
-#: C/evolution.xml:3955(para) C/evolution.xml:3960(para)
-#: C/evolution.xml:4306(para) C/evolution.xml:4325(para)
-#: C/evolution.xml:4357(para) C/evolution.xml:4370(para)
-#: C/evolution.xml:4592(para) C/evolution.xml:6094(para)
-#: C/evolution.xml:6744(para) C/evolution.xml:6810(para)
+#: C/evolution.xml:331(para) C/evolution.xml:690(para)
+#: C/evolution.xml:723(para) C/evolution.xml:1939(para)
+#: C/evolution.xml:2063(para) C/evolution.xml:2071(para)
+#: C/evolution.xml:2238(para) C/evolution.xml:3016(para)
+#: C/evolution.xml:3021(para) C/evolution.xml:3447(para)
+#: C/evolution.xml:3462(para) C/evolution.xml:3470(para)
+#: C/evolution.xml:3803(para) C/evolution.xml:3805(para)
+#: C/evolution.xml:3807(para) C/evolution.xml:3827(para)
+#: C/evolution.xml:3838(para) C/evolution.xml:3843(para)
+#: C/evolution.xml:3864(para) C/evolution.xml:3872(para)
+#: C/evolution.xml:3988(para) C/evolution.xml:3999(para)
+#: C/evolution.xml:4004(para) C/evolution.xml:4015(para)
+#: C/evolution.xml:4023(para) C/evolution.xml:4028(para)
+#: C/evolution.xml:4374(para) C/evolution.xml:4393(para)
+#: C/evolution.xml:4425(para) C/evolution.xml:4438(para)
+#: C/evolution.xml:4660(para) C/evolution.xml:6102(para)
+#: C/evolution.xml:6768(para) C/evolution.xml:6834(para)
 msgid "or"
 msgstr "oder"
 
-#: C/evolution.xml:357(para) C/evolution.xml:709(para)
+#: C/evolution.xml:332(para) C/evolution.xml:691(para)
 msgid ""
 "Click Check for Supported Types to have Evolution check for supported types. "
 "Some servers do not announce the authentication mechanisms they support, so "
@@ -1243,36 +1276,28 @@ msgstr ""
 "nicht die verfügbaren Legitimationsarten, daher kann Evolution nicht "
 "garantieren, dass das Anklicken des Knopfes funktioniert."
 
-#: C/evolution.xml:358(para)
-msgid ""
-"If you are unsure what authentication type you need, contact your system "
-"administrator."
-msgstr ""
-"Falls Sie nicht wissen, welche Legitimationsart Sie benötigen, so fragen Sie "
-"Ihren System-Administrator."
-
-#: C/evolution.xml:361(para) C/evolution.xml:715(para)
+#: C/evolution.xml:336(para) C/evolution.xml:697(para)
 msgid "Select if you want Evolution to remember your password."
 msgstr "Wählen Sie, ob Evolution sich an Ihr Passwort erinnern soll."
 
-#: C/evolution.xml:367(para)
+#: C/evolution.xml:342(para)
 msgid ""
 "(Conditional) If you chose Microsoft Exchange as the server type, provide "
 "your username in the Username field and your Outlook Web Access (OWA) URL in "
-"the OWA URL field. The URL and the usernames should use the Outlook format."
+"the OWA URL field. The URL and the usernames should use the Outlook format. "
 "If the mailbox path is different from the username, the OWA path should also "
 "include mailbox path, for example http://<varname>server name</varname>/"
 "exchange/<varname>mail box path</varname>."
 msgstr ""
-"(Konditional) Falls Sie Microsoft Exchange als Server-Typen gewählzt haben, "
+"(Konditional) Falls Sie Microsoft Exchange als Server-Typen gewählt haben, "
 "so tragen Sie Ihren Benutzernamen in das »Benutzername«-Feld ein und Ihre "
 "Outlook Web Access (OWA)-Adresse in das OWA-Adressfeld. Die Adresse und die "
-"benutzernamen sollten das Outlook-Format nutzen. Falls der Postfach-Pfad "
+"Benutzernamen sollten das Outlook-Format nutzen. Falls der Postfach-Pfad "
 "anders als der Benutzername sein sollte, so muss die OWA-Adresse auch den "
 "Postfach-Pfad enthalten, zum Beispiel http://<varname>Servername</varname>/"
 "exchange/<varname>Postfach-Pfad</varname>."
 
-#: C/evolution.xml:368(para)
+#: C/evolution.xml:343(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -1280,24 +1305,25 @@ msgstr ""
 "Nachdem Sie dies beendet haben, fahren Sie fort unter <link linkend=\"more-"
 "mail-options\">E-Mail-Empfangsoptionen</link>."
 
-#: C/evolution.xml:372(title)
+#: C/evolution.xml:347(title)
 msgid "Local Configuration Options"
 msgstr "Lokale Konfigurationseinstellungen"
 
-#: C/evolution.xml:373(para)
+#: C/evolution.xml:348(para)
 msgid ""
 "If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format "
-"Mail Directories, or Standard Unix mbox spool file and Standard Unix mbox "
-"spool directory, you must specify the path to the local files in the path "
-"field. Continue with<link linkend=\"more-mail-options\">Receiving Mail "
-"Options</link> ."
+"Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool "
+"directory, you must specify the path to the local files in the path field. "
+"Continue with<link linkend=\"more-mail-options\">Receiving Mail Options</"
+"link>."
 msgstr ""
 "Falls Sie Lokale Auslieferung, Verzeichnisse im MH- oder Maildir-Format, "
-"oder Standard-Unix-mbox-Spool-Datei oder -Verzeichnis gewählt haben, so müssen Sie  einen Pfad zu diesen lokalen Dateien im »Pfad«-Feld angeben. Fahren Sie dann "
-"fort mit den <link linkend=\"more-mail-options\">E-Mail-Empfangsoptionen</"
-"link>."
+"oder Standard-Unix-mbox-Spool-Datei oder -Verzeichnis gewählt haben, so "
+"müssen Sie  einen Pfad zu diesen lokalen Dateien im »Pfad«-Feld angeben. "
+"Fahren Sie dann fort mit den <link linkend=\"more-mail-options\">E-Mail-"
+"Empfangsoptionen</link>."
 
-#: C/evolution.xml:379(para)
+#: C/evolution.xml:354(para)
 msgid ""
 "After you have selected a mail delivery mechanism, you can set some "
 "preferences for its behavior."
@@ -1305,43 +1331,43 @@ msgstr ""
 "Nachdem Sie den gewünschten E-Mail-Auslieferungsmechanismus festgelegt "
 "haben, können Sie nun einige Einstellungen über das Verhalten vornehmen."
 
-#: C/evolution.xml:382(link) C/evolution.xml:411(title)
+#: C/evolution.xml:357(link) C/evolution.xml:386(title)
 msgid "Novell GroupWise Receiving Options"
 msgstr "Novell GroupWise-Empfangsoptionen"
 
-#: C/evolution.xml:385(link) C/evolution.xml:451(title)
+#: C/evolution.xml:360(link) C/evolution.xml:426(title)
 msgid "Microsoft Exchange Receiving Options"
 msgstr "Microsoft Exchange-Empfangsoptionen"
 
-#: C/evolution.xml:388(link) C/evolution.xml:492(title)
+#: C/evolution.xml:363(link) C/evolution.xml:467(title)
 msgid "IMAP Receiving Options"
 msgstr "IMAP-Empfangsoptionen"
 
-#: C/evolution.xml:391(link) C/evolution.xml:536(title)
+#: C/evolution.xml:366(link) C/evolution.xml:511(title)
 msgid "POP Receiving Options"
 msgstr "POP-Empfangsoptionen"
 
-#: C/evolution.xml:394(link) C/evolution.xml:557(title)
+#: C/evolution.xml:369(link) C/evolution.xml:533(title)
 msgid "USENET News Receiving Options"
 msgstr "USENET-News-Empfangsoptionen"
 
-#: C/evolution.xml:397(link) C/evolution.xml:580(title)
+#: C/evolution.xml:372(link) C/evolution.xml:557(title)
 msgid "Local Delivery Receiving Options"
 msgstr "Empfangsoptionen für Lokale Auslieferung"
 
-#: C/evolution.xml:400(link) C/evolution.xml:594(title)
+#: C/evolution.xml:375(link) C/evolution.xml:572(title)
 msgid "MH-Format Mail Directories Receiving Options"
 msgstr "Empfangsoptionen für E-Mail-Verzeichnisse im MH-Format"
 
-#: C/evolution.xml:403(link) C/evolution.xml:613(title)
+#: C/evolution.xml:378(link) C/evolution.xml:592(title)
 msgid "Maildir-Format Mail Directories Receiving Options"
 msgstr "Empfangsoptionen für E-Mail-Verzeichnisse im Maildir-Format"
 
-#: C/evolution.xml:406(link) C/evolution.xml:633(title)
+#: C/evolution.xml:381(link) C/evolution.xml:613(title)
 msgid "Standard Unix mbox spool file Receiving Options"
 msgstr "Empfangsoptionen für Standard-Unix-mbox-Spool-Datei"
 
-#: C/evolution.xml:412(para)
+#: C/evolution.xml:387(para)
 msgid ""
 "If you select Novell GroupWise as your receiving server type, you need to "
 "specify the following options:"
@@ -1349,13 +1375,21 @@ msgstr ""
 "Falls Sie Novell GroupWise als Servertypen gewählt haben, sind folgende "
 "Einstellungen zu treffen:"
 
-#: C/evolution.xml:415(para) C/evolution.xml:456(para)
-#: C/evolution.xml:497(para)
+#: C/evolution.xml:390(para) C/evolution.xml:431(para)
+#: C/evolution.xml:472(para) C/evolution.xml:516(para)
+#: C/evolution.xml:538(para) C/evolution.xml:561(para)
+#: C/evolution.xml:576(para) C/evolution.xml:596(para)
+#: C/evolution.xml:616(para) C/evolution.xml:639(para)
+#: C/evolution.xml:5651(para)
 msgid "Select if you want Evolution to automatically check for new mail."
 msgstr "Wählen Sie, ob Evolution automatisch nach neuen Nachrichten schauen soll."
 
-#: C/evolution.xml:416(para) C/evolution.xml:457(para)
-#: C/evolution.xml:498(para) C/evolution.xml:5631(para)
+#: C/evolution.xml:391(para) C/evolution.xml:432(para)
+#: C/evolution.xml:473(para) C/evolution.xml:517(para)
+#: C/evolution.xml:539(para) C/evolution.xml:562(para)
+#: C/evolution.xml:577(para) C/evolution.xml:597(para)
+#: C/evolution.xml:617(para) C/evolution.xml:640(para)
+#: C/evolution.xml:5652(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "check for new messages."
@@ -1363,23 +1397,26 @@ msgstr ""
 "Falls Sie diese Option wählen müssen Sie angeben, wie oft Evolution nach "
 "neuen Nachrichten schauen soll."
 
-#: C/evolution.xml:419(para) C/evolution.xml:460(para)
-#: C/evolution.xml:5636(para)
+#: C/evolution.xml:394(para) C/evolution.xml:435(para)
+#: C/evolution.xml:5657(para)
 msgid "Select if you want to check for new messages in all folders."
 msgstr ""
 "Wählen Sie, ob Evolution nach neuen Nachrichten in allen Ordnern schauen "
 "soll."
 
-#: C/evolution.xml:422(para) C/evolution.xml:5639(para)
+#: C/evolution.xml:397(para) C/evolution.xml:453(para)
+#: C/evolution.xml:488(para) C/evolution.xml:600(para)
+#: C/evolution.xml:620(para) C/evolution.xml:643(para)
+#: C/evolution.xml:5660(para)
 msgid ""
-"Select if you want to apply filters to new messages in the Inbox on the "
-"server."
+"Select Apply filters to new messages in inbox on this server if you want to "
+"apply filters."
 msgstr ""
-"Wählen Sie, ob Filter auf neue Nachrichten im Inbox-Ordner dieses Servers "
-"angewendet werden sollen."
+"Wählen Sie »Filter auf neue Nachrichten in INBOX dieses Servers anwenden«, um "
+"Filter automatisch anzuwenden."
 
-#: C/evolution.xml:423(para) C/evolution.xml:514(para)
-#: C/evolution.xml:621(para) C/evolution.xml:5640(para)
+#: C/evolution.xml:398(para) C/evolution.xml:489(para)
+#: C/evolution.xml:601(para) C/evolution.xml:5661(para)
 msgid ""
 "For additional information on filtering, see <link linkend=\"usage-mail-org-"
 "filters-new\">Creating New Filter Rules</link>."
@@ -1387,53 +1424,67 @@ msgstr ""
 "Für weitere Informationen zum Filtern siehe <link linkend=\"usage-mail-org-"
 "filters-new\">Neue Nachrichtenfilter erstellen</link>."
 
-#: C/evolution.xml:426(para) C/evolution.xml:517(para)
-#: C/evolution.xml:5643(para)
+#: C/evolution.xml:401(para) C/evolution.xml:456(para)
+#: C/evolution.xml:492(para) C/evolution.xml:5664(para)
 msgid "Select if you want to check new messages for junk content."
 msgstr ""
 "Wählen Sie ob neue Nachrichten auf unerwünschte Inhalte (Spam) überprüft "
 "werden sollen."
 
-#: C/evolution.xml:427(para)
+#: C/evolution.xml:402(para) C/evolution.xml:457(para)
+#: C/evolution.xml:493(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"usage-mail-"
 "organize-spam\">Stopping Junk Mail (Spam)</link> and <link linkend=\"mail-"
-"prefs-junk\">Junk Mail Preferences</link>."
+"prefs-junk\">Junk</link>."
 msgstr ""
 "Für weitere Informationen über Spam siehe <link linkend=\"usage-mail-"
 "organize-spam\">Filtern unerwünschter Nachrichten (Spam)</link> und <link "
 "linkend=\"mail-prefs-junk\">Unerwünscht-Einstellungen</link>."
 
-#: C/evolution.xml:430(para) C/evolution.xml:5647(para)
+#: C/evolution.xml:405(para) C/evolution.xml:5668(para)
 msgid "Select if you want to only check for junk messages in the Inbox folder."
 msgstr ""
 "Wählen Sie, ob nur Nachrichten im Inbox-Ordner auf unerwünschte Inhalte "
 "(Spam) überprüft werden sollen."
 
-#: C/evolution.xml:433(para) C/evolution.xml:524(para)
-msgid "Select if you want to automatically synchronize remote mail locally."
+#: C/evolution.xml:408(para) C/evolution.xml:450(para)
+#: C/evolution.xml:499(para)
+msgid ""
+"Select Automatically synchronize remote mail locally to download the "
+"messages to your local system."
 msgstr ""
-"Wählen Sie, ob entfernte E-Mails automatisch lokal synchronisiert werden "
-"sollen."
+"Wählen Sie »Entfernte E-Mails automatisch lokal synchronisieren« um E-Mails "
+"automatisch auf Ihre Festplatte herunterzuladen."
 
-#: C/evolution.xml:434(para) C/evolution.xml:525(para)
+#: C/evolution.xml:409(para) C/evolution.xml:500(para)
 msgid ""
 "Evolution, by default downloads only the header information such as From, "
 "Subject, and Date. The body of the message and the attachments are "
 "downloaded only when you click the message. Thus you can save time and "
 "network usage. This is useful when you don't read all the messages you "
 "receive."
-msgstr "Evolution lädt in der Standardeinstellung nur Kopfzeilen wie den Absender, den Betreff und das Datum herunter. Der Inhalt der Nachricht und Anlagen werden erst heruntergeladen, wenn Sie auf die Nachricht klicken. Dadurch wird Zeit und Bandbreite gespart; dies ist zudem nützlich wenn Sie nicht alle Nachrichten lesen die Sie erhalten."
+msgstr ""
+"Evolution lädt in der Standardeinstellung nur Kopfzeilen wie den Absender, "
+"den Betreff und das Datum herunter. Der Inhalt der Nachricht und Anlagen "
+"werden erst heruntergeladen, wenn Sie auf die Nachricht klicken. Dadurch "
+"wird Zeit und Bandbreite gespart; dies ist zudem nützlich wenn Sie nicht "
+"alle Nachrichten lesen die Sie erhalten."
 
-#: C/evolution.xml:435(para)
+#: C/evolution.xml:410(para) C/evolution.xml:501(para)
 msgid ""
 "If you check this option, evolution fetches the headers as well as the body "
 "of the message simultaneously. In this case, the time taken to open a "
-"message is comparitevely less. In addition to that, you can download the "
-"mails for reading them offline, when you have checked this option."
-msgstr "Wenn Sie diese Option wählen lädt Evolution sowohl die Kopfzeilen als auch den Inhalt der Nachricht herunter, daher können Nachrichten vergleichsweise schnell geöffnet werden. Zudem können Sie auswählen, dass Nachrichten für die Offline-Nutzung heruntergeladen werden, damit Sie diese ohne eine Verbindung zum Server lesen können."
+"message is comparatively less. In addition to that, you can download the "
+"mail for reading them offline, when you have checked this option."
+msgstr ""
+"Wenn Sie diese Option wählen lädt Evolution sowohl die Kopfzeilen als auch "
+"den Inhalt der Nachricht herunter, daher können Nachrichten vergleichsweise "
+"schnell geöffnet werden. Zudem können Sie auswählen, dass Nachrichten für "
+"die Offline-Nutzung heruntergeladen werden, damit Sie diese ohne eine "
+"Verbindung zum Server lesen können."
 
-#: C/evolution.xml:438(para)
+#: C/evolution.xml:413(para)
 msgid ""
 "Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -1441,7 +1492,7 @@ msgstr ""
 "Geben Sie den Post-Office-Agent-SOAP-Port in das Feld »Post-Office-Agent-"
 "SOAP-Port« ein."
 
-#: C/evolution.xml:439(para) C/evolution.xml:5658(para)
+#: C/evolution.xml:414(para) C/evolution.xml:5679(para)
 msgid ""
 "If you are unsure what your Post Office Agent SOAP port is, contact your "
 "system administrator."
@@ -1449,11 +1500,11 @@ msgstr ""
 "Falls Sie sich nicht sicher sind, was der korrekte Post-Office-Agent-SOAP-"
 "Port ist, so kontaktieren Sie Ihren Systemadministrator."
 
-#: C/evolution.xml:447(para) C/evolution.xml:488(para)
-#: C/evolution.xml:532(para) C/evolution.xml:553(para)
-#: C/evolution.xml:576(para) C/evolution.xml:590(para)
-#: C/evolution.xml:609(para) C/evolution.xml:629(para)
-#: C/evolution.xml:650(para) C/evolution.xml:672(para)
+#: C/evolution.xml:422(para) C/evolution.xml:463(para)
+#: C/evolution.xml:507(para) C/evolution.xml:529(para)
+#: C/evolution.xml:553(para) C/evolution.xml:568(para)
+#: C/evolution.xml:588(para) C/evolution.xml:609(para)
+#: C/evolution.xml:631(para) C/evolution.xml:654(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"third-step\">Sending "
 "Mail</link>."
@@ -1461,7 +1512,7 @@ msgstr ""
 "Wenn Sie dies beendet haben, so fahren Sie fort mit <link linkend=\"third-"
 "step\">E-Mails verschicken</link>."
 
-#: C/evolution.xml:452(para)
+#: C/evolution.xml:427(para)
 msgid ""
 "If you select Microsoft Exchange as your receiving server type, you need to "
 "specify the following options:"
@@ -1469,7 +1520,7 @@ msgstr ""
 "Falls Sie Microsoft Exchange als Servertypen gewählt haben, sind folgende "
 "Einstellungen zu treffen:"
 
-#: C/evolution.xml:463(para)
+#: C/evolution.xml:438(para)
 msgid ""
 "Specify the Global Catalog server name in the Global Catalog Server Name "
 "field."
@@ -1477,7 +1528,7 @@ msgstr ""
 "Geben Sie den Namen des Global-Catalog-Servers in das Feld »Global-Catalog-"
 "Server« ein."
 
-#: C/evolution.xml:464(para)
+#: C/evolution.xml:439(para)
 msgid ""
 "The Global Catalog Server contains the user information for users. If you "
 "are unsure what your Global Catalog server name is, contact your system "
@@ -1487,26 +1538,26 @@ msgstr ""
 "zur Verfügung. Falls Sie sich unsicher sind, wie der Name Ihres Global-"
 "Catalog-Servers lautet, so kontaktieren Sie Ihren Systemadministrator."
 
-#: C/evolution.xml:467(para)
+#: C/evolution.xml:442(para)
 msgid "Select if you want to limit the number of Global Address Lists (GAL)."
 msgstr ""
 "Wählen Sie, ob die Anzahl der Antworten von der Globalen Adressliste (GAL) "
 "begrenzt werden soll."
 
-#: C/evolution.xml:468(para)
+#: C/evolution.xml:443(para)
 msgid ""
-"The GAL contains a list of all e-mail addresses. If you select this option, "
+"The GAL contains a list of all email addresses. If you select this option, "
 "you need to specify the maximum number of responses."
 msgstr ""
 "Eine Globale Adressliste enthält eine Liste aller E-Mail-Adressen. Wenn Sie "
 "diese Option wählen, so müssen Sie die maximale Anzahl der Antworten "
 "begrenzen."
 
-#: C/evolution.xml:471(para)
+#: C/evolution.xml:446(para)
 msgid "Select if you want to use a password expire warning time period."
 msgstr "Wählen Sie aus, ob vor dem Ablaufen des Passworts gewarnt werden soll."
 
-#: C/evolution.xml:472(para)
+#: C/evolution.xml:447(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "send the password expire message."
@@ -1514,39 +1565,7 @@ msgstr ""
 "Wenn dies ausgewählt wird, so müssen Sie angeben, wie oft Evolution Ihnen "
 "eine Warnung senden soll, dass Ihr Passwort bald abläuft."
 
-#: C/evolution.xml:475(para)
-msgid ""
-"Select automatically synchronize remote mail locally to download the "
-"messages to your local system."
-msgstr ""
-"Wählen Sie »Entfernte E-Mails automatisch lokal synchronisieren« um E-Mails "
-"automatisch auf Ihre Festplatte herunterzuladen."
-
-#: C/evolution.xml:478(para)
-msgid ""
-"Select apply filters to new messages in inbox on this server to apply "
-"filters."
-msgstr ""
-"Wählen Sie »Filter auf neue Nachrichten in INBOX dieses Servers anwenden«, "
-"um Filter automatisch anzuwenden."
-
-#: C/evolution.xml:481(para)
-msgid ""
-"Select check new messages for junk contents to filter new messages for spam "
-"messages."
-msgstr ""
-"Wählen Sie »Neue Nachrichten auf unerwünschten Inhalt prüfen«, um Spam-"
-"Nachrichten automatisch auszusortieren."
-
-#: C/evolution.xml:482(para)
-msgid ""
-"For more information refer <link linkend=\"usage-mail-organize-spam"
-"\">Stopping Junk Mail (Spam)</link>"
-msgstr ""
-"Für weitere Informationen siehe <link linkend=\"usage-mail-organize-spam"
-"\">Filtern unerwünschter Nachrichten (Spam)</link>"
-
-#: C/evolution.xml:493(para)
+#: C/evolution.xml:468(para)
 msgid ""
 "If you select IMAP as your receiving server type, you need to specify the "
 "following options:"
@@ -1554,13 +1573,15 @@ msgstr ""
 "Falls Sie IMAP als Servertypen gewählt haben, sind folgende Einstellungen zu "
 "treffen:"
 
-#: C/evolution.xml:501(para)
-msgid "Select if you want Evolution to use custom commands to connect to Evolution."
+#: C/evolution.xml:476(para)
+msgid ""
+"Select if you want Evolution to use custom commands to connect to the IMAP "
+"server."
 msgstr ""
 "Wählen Sie, ob Evolution einen benutzerdefinierten Befehl zum Verbinden mit "
 "dem IMAP-Server verwenden soll."
 
-#: C/evolution.xml:502(para)
+#: C/evolution.xml:477(para)
 msgid ""
 "If you select this option, specify the custom command you want Evolution to "
 "use."
@@ -1568,11 +1589,11 @@ msgstr ""
 "Wenn Sie diese Option wählen, so müssen Sie den Befehl angeben, den "
 "Evolution benutzen soll."
 
-#: C/evolution.xml:505(para)
+#: C/evolution.xml:480(para)
 msgid "Select if you want Evolution to show only subscribed folders."
 msgstr "Wählen Sie, ob Evolution nur abonnierte Ordner anzeigen soll."
 
-#: C/evolution.xml:506(para)
+#: C/evolution.xml:481(para)
 msgid ""
 "Subscribed folders are folders that you have chosen to receive mail from by "
 "subscribing to them."
@@ -1580,13 +1601,14 @@ msgstr ""
 "Abonnierte Ordner sind Ordner, die Sie für das Empfangen von E-Mail "
 "ausgewählt haben, indem Sie diese abonniert haben."
 
-#: C/evolution.xml:509(para)
-msgid "Select if you want Evolution to override server-supplied folder namespaces."
+#: C/evolution.xml:484(para)
+msgid ""
+"Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
 "Wählen Sie, ob Evolution sich über den vom Server vorgegebenen Ordner-"
 "Namensraum (Namespace) hinwegsetzen soll."
 
-#: C/evolution.xml:510(para)
+#: C/evolution.xml:485(para)
 msgid ""
 "By choosing this option you can rename the folders that the server provides. "
 "If you select this option, you need to specify the namespace to use."
@@ -1595,36 +1617,13 @@ msgstr ""
 "Ihnen der Server bereitstellt. Hierzu muss der zu benutzende Namensraum "
 "angegeben werden."
 
-#: C/evolution.xml:513(para) C/evolution.xml:620(para)
-#: C/evolution.xml:639(para) C/evolution.xml:661(para)
-msgid "Select if you want to apply filters to new messages in the Inbox."
-msgstr ""
-"Wählen Sie, ob Filter auf neue Nachrichten im Inbox-Ordner dieses Servers "
-"angewendet werden sollen."
-
-#: C/evolution.xml:518(para) C/evolution.xml:5644(para)
-msgid ""
-"For additional information on junk content, see <link linkend=\"mail-prefs-"
-"junk\">Junk Mail Preferences</link>."
-msgstr ""
-"Für weitere Informationen über fas Filtern unerwünschter Nachrichten siehe "
-"<link linkend=\"mail-prefs-junk\">Unerwünscht-Einstellungen</link>."
-
-#: C/evolution.xml:521(para)
+#: C/evolution.xml:496(para)
 msgid "Select if you want to check for junk messages in the Inbox folder."
 msgstr ""
 "Wählen Sie, ob Nachrichten im Inbox-Ordner auf unerwünschte Inhalte (Spam) "
 "überprüft werden sollen."
 
-#: C/evolution.xml:526(para)
-msgid ""
-"If you check this option, evolution fetches the headers as well as the body "
-"of the message simultaneously. In this case, the time taken to open a "
-"message is comparatively less. In addition to that, you can download the "
-"mails for reading them offline, when you have checked this option."
-msgstr "Wenn Sie diese Option wählen lädt Evolution sowohl die Kopfzeilen als auch den Inhalt der Nachricht herunter, daher können Nachrichten vergleichsweise schnell geöffnet werden. Zudem können Sie auswählen, dass Nachrichten für die Offline-Nutzung heruntergeladen werden, damit Sie diese ohne eine Verbindung zum Server lesen können."
-
-#: C/evolution.xml:538(para)
+#: C/evolution.xml:513(para)
 msgid ""
 "If you select POP as your receiving server type, you need to specify the "
 "following options:"
@@ -1632,32 +1631,17 @@ msgstr ""
 "Falls Sie POP als Servertypen gewählt haben, sind folgende Einstellungen zu "
 "treffen:"
 
-#: C/evolution.xml:541(para) C/evolution.xml:562(para)
-#: C/evolution.xml:584(para) C/evolution.xml:598(para)
-#: C/evolution.xml:617(para) C/evolution.xml:636(para)
-#: C/evolution.xml:658(para)
-msgid ""
-"Select if you want Evolution to automatically check for new mail.If you "
-"select this option, you need to specify how often Evolution should check for "
-"new messages."
-msgstr ""
-"Wählen Sie, ob Evolution automatisch nach neuen Nachrichten schauen soll. "
-"Falls Sie diese Option wählen müssen Sie angeben, wie oft Evolution nach "
-"neuen Nachrichten schauen soll."
-
-#: C/evolution.xml:544(para)
+#: C/evolution.xml:520(para)
 msgid "Select if you want to leave messages on the server."
 msgstr "Wählen Sie, ob die Nachrichten auf dem Server belassen werden sollen."
 
-#: C/evolution.xml:547(para)
-msgid ""
-"Select if you want to disable support for all POP3 extensions (support for "
-"POP3)."
+#: C/evolution.xml:523(para)
+msgid "Select if you want to disable support for all POP3 extensions."
 msgstr ""
 "Wählen Sie, ob jegliche Unterstützung von POP3-Erweiterungen deaktiviert "
 "werden sollen."
 
-#: C/evolution.xml:559(para)
+#: C/evolution.xml:535(para)
 msgid ""
 "If you select USENET News as your receiving server type, you need to specify "
 "the following options:"
@@ -1665,15 +1649,15 @@ msgstr ""
 "Falls Sie USENET-News als Servertypen gewählt haben, sind folgende "
 "Einstellungen zu treffen:"
 
-#: C/evolution.xml:565(para)
+#: C/evolution.xml:542(para)
 msgid "Select if you want to show folders in short notation."
 msgstr "Wählen Sie, ob Ordner in Kurznotation angezeigt werden sollen."
 
-#: C/evolution.xml:566(para)
+#: C/evolution.xml:543(para)
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr "comp.os.linux würde zum Beispiel als c.o.linux dargestellt werden."
 
-#: C/evolution.xml:569(para)
+#: C/evolution.xml:546(para)
 msgid ""
 "Select if you want to show relative folder names in the subscription dialog "
 "box."
@@ -1681,7 +1665,7 @@ msgstr ""
 "Wählen Sie, ob relative Ordnernamen im Abonnementdialog angezeigt werden "
 "sollen."
 
-#: C/evolution.xml:570(para)
+#: C/evolution.xml:547(para)
 msgid ""
 "If you select to show relative folder names in the subscription page, only "
 "the name of the folder is displayed. For example the folder evolution.mail "
@@ -1691,7 +1675,7 @@ msgstr ""
 "werden sollen, so wird nur der Name des Ordners angezeigt. Der Ordner "
 "evolution.mail würde also als evolution dargestellt werden."
 
-#: C/evolution.xml:581(para)
+#: C/evolution.xml:558(para)
 msgid ""
 "If you select Local Delivery as your receiving server type, you need to "
 "specify the following options:"
@@ -1699,7 +1683,7 @@ msgstr ""
 "Falls Sie Lokale Auslieferung als Servertypen gewählt haben, sind folgende "
 "Einstellungen zu treffen:"
 
-#: C/evolution.xml:595(para)
+#: C/evolution.xml:573(para)
 msgid ""
 "If you select MH-Format Mail Directories as your receiving server type, you "
 "need to specify the following options:"
@@ -1707,11 +1691,11 @@ msgstr ""
 "Falls Sie MH-Format-E-Mail-Verzeichnisse als Servertypen gewählt haben, sind "
 "folgende Einstellungen zu treffen:"
 
-#: C/evolution.xml:601(para)
+#: C/evolution.xml:580(para)
 msgid "Select if you want to use the <emphasis>.folders</emphasis> summary file."
 msgstr "Wählen Sie, ob die .folders-Zusammenfassungsdatei genutzt werden soll."
 
-#: C/evolution.xml:614(para)
+#: C/evolution.xml:593(para)
 msgid ""
 "If you select Maildir-Format Mail Directories as your receiving server type, "
 "you need to specify the following options:"
@@ -1719,25 +1703,25 @@ msgstr ""
 "Falls Sie Maildir-Format-E-Mail-Verzeichnisse als Servertypen gewählt haben, "
 "sind folgende Einstellungen zu treffen:"
 
-#: C/evolution.xml:642(para) C/evolution.xml:664(para)
+#: C/evolution.xml:623(para) C/evolution.xml:646(para)
 msgid "Select if you want to store status headers in Elm, Pine, and Mutt formats."
 msgstr ""
 "Wählen Sie, ob die Statuskopfzeilen im Elm-, Pine- oder Mutt-Format "
 "gespeichert werden sollen."
 
-#: C/evolution.xml:654(title)
+#: C/evolution.xml:635(title)
 msgid "Standard Unix mbox spool directory Receiving Options"
 msgstr "Empfangsoptionen für Standard-Unix-mbox-Verzeichnis"
 
-#: C/evolution.xml:655(para)
+#: C/evolution.xml:636(para)
 msgid ""
-"If you select Standard Unix Mbox Spool directory as your receiving server "
+"If you select Standard Unix mbox Spool directory as your receiving server "
 "type, you need to specify the following options:"
 msgstr ""
-"Falls Sie Standard-Unix-mbox-Verzeichnis als Eingangsserver-Typ"
-"gewählt haben, sind folgende Einstellungen zu treffen:"
+"Falls Sie Standard-Unix-mbox-Verzeichnis als Eingangsserver-Typ gewählt "
+"haben, sind folgende Einstellungen zu treffen:"
 
-#: C/evolution.xml:678(para)
+#: C/evolution.xml:660(para)
 msgid ""
 "Now that you have entered information about how you plan to get mail, "
 "Evolution needs to know about how you want to send it."
@@ -1745,19 +1729,19 @@ msgstr ""
 "Das Empfangen von E-Mails ist nun geregelt, Evolution benötigt nun "
 "Informationen darüber, wie Sie E-Mails verschicken möchten."
 
-#: C/evolution.xml:681(para)
+#: C/evolution.xml:663(para)
 msgid "Select a server type from the Server Type list."
 msgstr "Wählen Sie einen Server-Typen aus der Server-Typ-Liste."
 
-#: C/evolution.xml:682(para)
+#: C/evolution.xml:664(para)
 msgid "The following server types are available:"
 msgstr "Die folgenden Server-Typen sind verfügbar:"
 
-#: C/evolution.xml:684(title)
+#: C/evolution.xml:666(title)
 msgid "Sendmail:"
 msgstr "Sendmail:"
 
-#: C/evolution.xml:685(para)
+#: C/evolution.xml:667(para)
 msgid ""
 "Uses the Sendmail program to send mail from your system. Sendmail is more "
 "flexible, but is not as easy to configure, so you should select this option "
@@ -1767,11 +1751,11 @@ msgstr ""
 "Flexibilität, allerdings ist es schwieriger einzustellen. Sie sollten diese "
 "Option nur wählen, falls Sie mit Sendmail vertraut sind."
 
-#: C/evolution.xml:688(title)
+#: C/evolution.xml:670(title)
 msgid "SMTP:"
 msgstr "SMTP:"
 
-#: C/evolution.xml:689(para)
+#: C/evolution.xml:671(para)
 msgid ""
 "Sends mail using an outbound mail server. This is the most common choice for "
 "sending mail. If you choose SMTP, there are additional configuration "
@@ -1783,27 +1767,15 @@ msgstr ""
 "sind weitere Einstellungen zu treffen. Siehe <link linkend=\"bsthwzo\">SMTP-"
 "Einstellungen</link> für weitere Informationen."
 
-#: C/evolution.xml:695(title)
+#: C/evolution.xml:677(title)
 msgid "SMTP Configuration"
 msgstr "SMTP-Einstellungen"
 
-#: C/evolution.xml:699(para)
-msgid "Type the Server address in the Server field."
-msgstr "Geben Sie den Namen des E-Mail-Servers in das »Server«-Feld ein."
-
-#: C/evolution.xml:700(para)
-msgid ""
-"If you are unsure what your Server address is, contact your system "
-"administrator."
-msgstr ""
-"Falls Sie den Namen des Servers nicht kennen, so fragen Sie Ihren "
-"Administrator."
-
-#: C/evolution.xml:703(para)
+#: C/evolution.xml:685(para)
 msgid "Select if your server requires authentication."
 msgstr "Wählen Sie, ob der Server Legitimation erfordert."
 
-#: C/evolution.xml:704(para)
+#: C/evolution.xml:686(para)
 msgid ""
 "If you selected that your server requires authentication, you need to "
 "provide the following information:"
@@ -1811,29 +1783,21 @@ msgstr ""
 "Falls der Server Legitimation erfordert, müssen folgende Informationen "
 "eingegeben werden:"
 
-#: C/evolution.xml:712(para)
-msgid "Type your username in the Username field."
-msgstr "Tragen Sie Ihren Benutzernamen in das »Benutzername«-Feld ein."
-
-#: C/evolution.xml:720(para)
-msgid "Select if you use a secure connection (SSL)."
-msgstr "Wählen Sie aus, ob Sie eine sichere Verbindung benutzen möchten."
-
-#: C/evolution.xml:726(para)
+#: C/evolution.xml:708(para)
 msgid "Continue with <link linkend=\"bsti1ty\">Account Management</link>."
 msgstr "Fahren Sie fort mit <link linkend=\"bsti1ty\">Kontoverwaltung</link>."
 
-#: C/evolution.xml:732(para)
+#: C/evolution.xml:714(para)
 msgid ""
-"Now that you have finished the e-mail configuration process you need to give "
+"Now that you have finished the email configuration process you need to give "
 "the account a name. The name can be any name you prefer. Type your account "
 "name on the Name field, then click Forward."
 msgstr ""
 "Nachdem Sie nun den Konfigurationsvorgang abgeschlossen haben, müssen Sie "
-"Ihrem Konto einen namen geben. Sie können den Namen frei wählen. Geben Sie "
-"den Namen in das »Name«-Feld ein und klicken Sie auf Vor."
+"Ihrem Konto einen Namen geben. Sie können den Namen frei wählen. Geben Sie "
+"den Namen in das »Name«-Feld ein und klicken Sie auf »Vor«."
 
-#: C/evolution.xml:733(para)
+#: C/evolution.xml:715(para)
 msgid ""
 "Continue with <link linkend=\"step-three-b\">Time Zone</link><link linkend="
 "\"step-three-b\"/>."
@@ -1841,25 +1805,25 @@ msgstr ""
 "Fahren Sie fort mit <link linkend=\"step-three-b\">Zeitzone</link><link "
 "linkend=\"step-three-b\"/>."
 
-#: C/evolution.xml:740(para)
+#: C/evolution.xml:722(para)
 msgid "Select your time zone on the map."
 msgstr "Wählen Sie Ihre Zeitzone aus der Karte aus."
 
-#: C/evolution.xml:742(para)
+#: C/evolution.xml:724(para)
 msgid "Select from the time zone drop-down list."
 msgstr "Wählen Sie Ihre Zeitzone aus der Auswahlliste aus."
 
-#: C/evolution.xml:747(para)
+#: C/evolution.xml:729(para)
 msgid "Click OK, then click Apply."
 msgstr "Klicken Sie auf OK, klicken Sie dann auf Anwenden."
 
-#: C/evolution.xml:748(para)
+#: C/evolution.xml:730(para)
 msgid "Evolution opens with your new account created."
 msgstr "Evolution öffnet sich mit dem erstellten neuen Konto."
 
-#: C/evolution.xml:751(para)
+#: C/evolution.xml:733(para)
 msgid ""
-"If you want to import e-mail from another e-mail client, continue with <link "
+"If you want to import email from another email client, continue with <link "
 "linkend=\"fourth-step\">Importing Mail (Optional)</link>. If not, skip to "
 "<link linkend=\"ui-intro\">Using Evolution: An Overview</link>."
 msgstr ""
@@ -1868,13 +1832,13 @@ msgstr ""
 "(optional)</link>. Andernfalls fahren Sie fort mit <link linkend=\"ui-intro"
 "\">Evolution benutzen: Ein Überblick</link>."
 
-#: C/evolution.xml:755(title)
+#: C/evolution.xml:737(title)
 msgid "Importing Mail (Optional)"
 msgstr "E-Mails importieren (optional)"
 
-#: C/evolution.xml:756(para)
+#: C/evolution.xml:738(para)
 msgid ""
-"After selecting your time zone, if Evolution finds e-mail or address files "
+"After selecting your time zone, if Evolution finds email or address files "
 "from another application, it offers to import them. For a full description "
 "of the import feature, see <link linkend=\"importing-mail\">Importing Single "
 "Files</link>."
@@ -1884,37 +1848,42 @@ msgstr ""
 "vorgefunden werden. Siehe <link linkend=\"importing-mail\">Einzelne Dateien "
 "importieren</link> für eine komplette Beschreibung dieser Import-Funktion."
 
-#: C/evolution.xml:757(para)
+#: C/evolution.xml:739(para) C/evolution.xml:2355(para)
 msgid ""
 "Microsoft Outlook* and versions of Outlook Express after version 4 use "
-"proprietary formats that Evolution cannot read or import. To import "
-"information, you might want to use the Export tool under Windows*. See the "
-"instructions in <link linkend=\"outlook-migration-mail\">Migrating Local "
-"Outlook Mail Folders</link>."
+"proprietary formats that Evolution cannot read or import."
 msgstr ""
 "Microsoft Outlook und Versionen von Outlook Express nach Version 4 benutzen "
 "proprietäre Formate welche von Evolution nicht gelesen und importiert werden "
-"können. Um diese Informationen importieren zu können können Sie die "
-"Exportieren-Funktion unter Windows* benutzen, siehe die Anleitung unter "
-"<link linkend=\"outlook-migration-mail\">Lokale Outlook-E-Mail-Ordner "
-"migrieren</link>."
+"können."
 
-#: C/evolution.xml:758(para)
+#: C/evolution.xml:740(para)
 msgid ""
-"Before importing e-mail from Netscape*, make sure you have selected File "
-"&gt; Compact All Folders. If you don't, Evolution will import and undelete "
-"the messages in your Trash folders."
+"To import information, you might want to use the Export tool under Windows*. "
+"See the instructions in <link linkend=\"outlook-migration-mail\">Migrating "
+"Local Outlook Mail Folders</link>."
 msgstr ""
-"Mozilla*- und Netscape*-Benutzer sollten Datei &gt; Komprimieren &gt; Alle "
-"Ordner im Programm Netscape oder Mozilla Mail auswählen. Andernfalls "
-"importiert Evolution jegliche Nachrichten in den Papierkörben und macht das "
-"Löschen rückgängig."
+"Um diese Informationen importieren zu können können Sie die Exportieren-"
+"Funktion unter Windows* benutzen, siehe die Anleitung unter <link linkend="
+"\"outlook-migration-mail\">Lokale Outlook-E-Mail-Ordner migrieren</link>."
 
-#: C/evolution.xml:760(para)
+#: C/evolution.xml:741(para) C/evolution.xml:2360(para)
+msgid ""
+"Before importing email from Netscape*, Mozilla and Netscape users need to "
+"click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla "
+"mail tool. Otherwise, Evolution imports and undeletes the messages in your "
+"Trash folders."
+msgstr ""
+"Bevor Sie E-Mails aus Netscape* importieren, sollten Mozilla- und Netscape-"
+"Benutzer »Datei &gt; Komprimieren &gt; Alle Ordner« im Programm Netscape oder "
+"Mozilla Mail auswählen. Andernfalls importiert Evolution jegliche "
+"Nachrichten in den Papierkörben und macht das Löschen rückgängig."
+
+#: C/evolution.xml:743(para)
 msgid ""
-"Evolution uses standard file types for e-mail and calendar information, so "
+"Evolution uses standard file types for email and calendar information, so "
 "you can copy those files from your <command>~/.evolution</command> "
-"directory. The file formats used are <command>mbox</command> for e-mail and "
+"directory. The file formats used are <command>mbox</command> for email and "
 "iCal for calendar information."
 msgstr ""
 "Evolution nutzt Standard-Dateitypen für E-Mail und Kalender, so dass Sie "
@@ -1922,20 +1891,20 @@ msgstr ""
 "können. E-Mails werden im <command>mbox</command>-Format gespeichert und "
 "Kalender im <command>iCal</command>-Format."
 
-#: C/evolution.xml:761(para)
+#: C/evolution.xml:744(para)
 msgid ""
 "Contacts files are stored in a database, but can be saved as a standard "
-"vCard*. To export contact data, open your contacts tool and select the "
-"contacts you want to export (press Ctrl+A to select them all). Click File "
-"&gt; Save Contact as VCard."
+"vCard*. To export an addressbook, click File &gt; Save Address Book As VCard"
+"\". If you want to export only one contact, click File &gt; Save Contact as "
+"VCard."
 msgstr ""
 "Adressdaten werden in einer Datenbank gespeichert, können aber im Standard-"
 "vCard*-Format gespeichert werden. Um Adressdaten zu exportieren, wählen Sie "
 "zunächst die zu exportierenden Kontakte aus. Wählen Sie dann Datei &gt; "
 "Kontakt als VCard speichern aus der Menüleiste aus, oder Adressbuch als "
-"VCard speichern, falls das gesamte Adressbiuch exportiert werden soll."
+"VCard speichern, falls das gesamte Adressbuch exportiert werden soll."
 
-#: C/evolution.xml:769(para)
+#: C/evolution.xml:752(para)
 msgid ""
 "Now that the first-run configuration has finished, you're ready to begin "
 "using Evolution. Here's a quick explanation of what's happening in your main "
@@ -1945,11 +1914,11 @@ msgstr ""
 "mit Evolution beginnen. Hier ist eine kurze Einleitung, was Sie im "
 "Hauptfenster vorfinden."
 
-#: C/evolution.xml:772(title)
+#: C/evolution.xml:755(title)
 msgid "Menu Bar:"
 msgstr "Menüleiste:"
 
-#: C/evolution.xml:773(para)
+#: C/evolution.xml:756(para)
 msgid ""
 "The menu bar gives you access to most Evolution features. For additional "
 "information, see <link linkend=\"usage-mainwindow-menubar\">The Menu Bar</"
@@ -1959,25 +1928,25 @@ msgstr ""
 "Evolution. Für weitere Informationen siehe <link linkend=\"usage-mainwindow-"
 "menubar\">Die Menüleiste</link>."
 
-#: C/evolution.xml:776(title)
+#: C/evolution.xml:759(title)
 msgid "Folder List:"
 msgstr "Ordnerleiste:"
 
-#: C/evolution.xml:777(para)
+#: C/evolution.xml:760(para)
 msgid ""
 "The folder list gives you a list of the available folders for each account. "
 "To see the contents of a folder, click the folder name and the contents are "
-"displayed in the e-mail list."
+"displayed in the message list."
 msgstr ""
 "Die Ordnerleiste bietet Ihnen Zugriff auf die verfügbaren Ordner für jedes "
 "Konto. Um die Inhalte eines Ordners zu sehen, klicken Sie auf den "
 "Ordnernamen, und die Inhalte werden in der E-Mail-Liste dargestellt."
 
-#: C/evolution.xml:780(title)
+#: C/evolution.xml:763(title)
 msgid "Toolbar:"
 msgstr "Werkzeugleiste:"
 
-#: C/evolution.xml:781(para)
+#: C/evolution.xml:764(para)
 msgid ""
 "The toolbar gives you fast and easy access to the frequently used features "
 "in each component."
@@ -1985,41 +1954,41 @@ msgstr ""
 "Die Werkzeugleiste bietet Ihnen schnellen und einfachen Zugriff auf die am "
 "meisten benutzten Funktionen in jedem Evolution-Fenster."
 
-#: C/evolution.xml:784(title)
+#: C/evolution.xml:767(title)
 msgid "Search Tool:"
 msgstr "Suchfunktion:"
 
-#: C/evolution.xml:785(para)
+#: C/evolution.xml:768(para)
 msgid ""
-"The search tool lets you search your e-mail, contacts, calendar, and tasks "
-"to easily find what you're looking for."
+"The search tool lets you search your email, contacts, calendar, and tasks to "
+"easily find what you're looking for."
 msgstr ""
 "Die Suchfunktion hilft Ihnen beim Finden von E-Mails, Kontakten, "
 "Kalendereinträgen und Aufgaben."
 
-#: C/evolution.xml:788(title) C/evolution.xml:947(title)
+#: C/evolution.xml:771(title) C/evolution.xml:930(title)
 msgid "Message List:"
 msgstr "E-Mail-Liste:"
 
-#: C/evolution.xml:789(para)
+#: C/evolution.xml:772(para)
 msgid ""
-"The message list displays a list of e-mail that you have received. To view "
-"an e-mail in the preview pane, click the e-mail in the e-mail list."
+"The message list displays a list of email that you have received. To view an "
+"email in the preview pane, click the email in the message list."
 msgstr ""
 "Die E-Mail-Liste zeigt eine Liste der empfangenen E-Mails an. Um eine dieser "
 "E-Mails in der Nachrichtenvorschau anzuzeigen, klicken Sie auf eine E-Mail "
 "in der E-Mail-Liste."
 
-#: C/evolution.xml:792(title)
+#: C/evolution.xml:775(title)
 msgid "Side bar:"
 msgstr "Seitenleiste:"
 
-#: C/evolution.xml:793(para)
+#: C/evolution.xml:776(para)
 msgid ""
 "The side bar lets you switch between folders and between Evolution tools. At "
 "the bottom of the side bar is the switcher that let you switch Evolution "
 "tools, and above that is a list of all the available folders for the current "
-"tool.For additional information, see <link linkend=\"usage-mainwindow-"
+"tool. For additional information, see <link linkend=\"usage-mainwindow-"
 "shortcutbar\">The Side Bar</link>."
 msgstr ""
 "Die Seitenleiste enthält die Ordnerleiste und ermöglicht daher das Wechseln "
@@ -2030,28 +1999,28 @@ msgstr ""
 "Informationen siehe <link linkend=\"usage-mainwindow-shortcutbar\">Die "
 "Seitenleiste</link>."
 
-#: C/evolution.xml:796(title)
+#: C/evolution.xml:779(title)
 msgid "Switcher:"
 msgstr "Fensterknöpfe:"
 
-#: C/evolution.xml:797(para)
+#: C/evolution.xml:780(para)
 msgid ""
 "The switcher at the bottom of the side bar lets you switch between the "
-"Evolution tools - mail, contacts, Calendars, Memos and Tasks."
+"Evolution tools - Mail, Contacts, Calendars, Memos and Tasks."
 msgstr ""
 "Die Knöpfe im unteren Bereich der Seitenleiste ermöglichen das Wechseln zu "
 "den verschiedenen Evolution-Fenstern (wie E-Mail, Adressbuch, Kalender, "
 "Notizen und Aufgaben)."
 
-#: C/evolution.xml:800(title)
+#: C/evolution.xml:783(title)
 msgid "Status Bar:"
 msgstr "Statusleiste:"
 
-#: C/evolution.xml:801(para)
+#: C/evolution.xml:784(para)
 msgid ""
 "The status bar periodically displays a message, or tells you the progress of "
-"a task. This most often happens when you're checking or sending e-mail. "
-"These progress queues are shown in the previous figure. The Online/Offline "
+"a task. This most often happens when you're checking or sending email. These "
+"progress queues are shown in the previous figure. The Online/Offline "
 "indicator is here, too, in the lower left of the window."
 msgstr ""
 "Die Statusleiste stellt Meldungen dar oder berichtet über den Fortschritt "
@@ -2059,29 +2028,28 @@ msgstr ""
 "verschicken (siehe auch vorherige Abbildung). Der Online-/Offline-Knopf "
 "befindet sich auch hier, in der linken unteren Ecke des Fensters."
 
-#: C/evolution.xml:804(title) C/evolution.xml:951(title)
+#: C/evolution.xml:787(title) C/evolution.xml:934(title)
 msgid "Preview Pane:"
 msgstr "Vorschauleiste:"
 
-#: C/evolution.xml:805(para)
+#: C/evolution.xml:788(para)
 msgid ""
-"The preview pane displays the contents of the e-mail that is selected in the "
-"e-mail list."
+"The preview pane displays the contents of the email that is selected in the "
+"message list."
 msgstr ""
 "Die Nachrichtenvorschau stellt den Inhalt der E-Mail dar, welche in der E-"
 "Mail-Liste ausgewählt ist."
 
-#: C/evolution.xml:809(title)
+#: C/evolution.xml:792(title)
 msgid "The Menu Bar"
 msgstr "Die Menüleiste"
 
-#: C/evolution.xml:810(para)
+#: C/evolution.xml:793(para)
 msgid ""
 "The menu bar's contents always provide all the possible actions for any "
 "given view of your data. If you're looking at your Inbox, most of the menu "
-"items relate to e-mail. Some content relates to other components of "
-"Evolution and some, especially in the File menu, relates to the application "
-"as a whole."
+"items relate to email. Some content relates to other components of Evolution "
+"and some, especially in the File menu, relates to the application as a whole."
 msgstr ""
 "Die Inhalte der Menüleiste bieten Ihnen alle verfügbaren Aktionen für die "
 "dargestellten Daten. Wenn Sie Ihren E-Mail-Eingangsordner betrachten, so "
@@ -2089,11 +2057,11 @@ msgstr ""
 "sich auf andere Evolution-Fenster und einige, speziell im Menü Datei, "
 "beziehen sich auf die Anwendung als ganzes."
 
-#: C/evolution.xml:812(title)
+#: C/evolution.xml:795(title)
 msgid "File:"
 msgstr "Datei:"
 
-#: C/evolution.xml:813(para)
+#: C/evolution.xml:796(para)
 msgid ""
 "Anything related to a file or to the operations of the application is listed "
 "in this menu, such as creating things, saving them to disk, printing them, "
@@ -2103,11 +2071,11 @@ msgstr ""
 "Programm als solchem zu tun haben, so zum Beispiel das Erstellen von Dingen, "
 "das Speichern auf Festplatte, Drucken, oder das Verlassen der Anwendung."
 
-#: C/evolution.xml:816(title)
+#: C/evolution.xml:799(title)
 msgid "Edit:"
 msgstr "Bearbeiten:"
 
-#: C/evolution.xml:817(para)
+#: C/evolution.xml:800(para)
 msgid ""
 "Holds useful tools that help you edit text and move it around. Lets you "
 "access the settings and configuration options in the Edit menu."
@@ -2115,11 +2083,11 @@ msgstr ""
 "Beinhaltet Möglichkeiten die Ihnen beim Bearbeiten und Bewegen von Text "
 "helfen, sowie den Zugriff auf Einstellungen und Konfigurationsoptionen."
 
-#: C/evolution.xml:820(title)
+#: C/evolution.xml:803(title)
 msgid "View:"
 msgstr "Ansicht:"
 
-#: C/evolution.xml:821(para)
+#: C/evolution.xml:804(para)
 msgid ""
 "Lets you decide how Evolution should look. Some of the features control the "
 "appearance of Evolution as a whole, and others the way a particular kind of "
@@ -2129,11 +2097,11 @@ msgstr ""
 "Funktionen bestimmen das Aussehen des gesamten Programmes, während andere "
 "nur einige Teile bestimmen."
 
-#: C/evolution.xml:824(title)
+#: C/evolution.xml:807(title)
 msgid "Folder:"
 msgstr "Ordner:"
 
-#: C/evolution.xml:825(para)
+#: C/evolution.xml:808(para)
 msgid ""
 "Holds actions that can be performed on folders. You can find things like "
 "copy, rename, delete, and so on."
@@ -2141,26 +2109,26 @@ msgstr ""
 "Beinhaltet Aktionen für Ordner, zum Beispiel Kopieren, Umbenennen, Löschen "
 "usw."
 
-#: C/evolution.xml:828(title)
+#: C/evolution.xml:811(title)
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: C/evolution.xml:829(para)
+#: C/evolution.xml:812(para)
 msgid ""
 "Holds actions that can be applied to a message. If there is only one target "
 "for the action, such as replying to a message, you can normally find it in "
-"the Message menu.<command/><command/>"
+"the Message menu."
 msgstr ""
 "Beinhaltet Aktionen für Nachrichten. Falls eine Aktion nur auf ein "
 "bestimmtes Objekt angewendet werden kann (zum Beispiel auf eine Nachricht "
 "antworten), so kann diese Aktion normalerweise im Nachricht-Menü vorgefunden "
-"werden.<command/><command/>"
+"werden."
 
-#: C/evolution.xml:832(title)
+#: C/evolution.xml:815(title)
 msgid "Search:"
 msgstr "Suchen:"
 
-#: C/evolution.xml:833(para)
+#: C/evolution.xml:816(para)
 msgid ""
 "Lets you search for messages, or for phrases within a message. You can also "
 "see previous searches you have made. In addition to the Search menu, there "
@@ -2173,42 +2141,41 @@ msgstr ""
 "Werkzeugleiste und E-Mail-Liste, welches Sie für die Suche nach Nachrichten "
 "benutzen können. Sie können auch einen Suchordner aus einer Suche erstellen."
 
-#: C/evolution.xml:836(title)
+#: C/evolution.xml:819(title)
 msgid "Help:"
 msgstr "Hilfe:"
 
-#: C/evolution.xml:837(para)
+#: C/evolution.xml:820(para)
 msgid "Opens the Evolution Help files."
 msgstr "Öffnet die Evolution-Hilfe-Dateien."
 
-#: C/evolution.xml:842(title)
-msgid "The Side Bar"
+#: C/evolution.xml:825(title)
+msgid "The Sidebar"
 msgstr "Die Seitenleiste"
 
-#: C/evolution.xml:843(para)
+#: C/evolution.xml:826(para)
 msgid ""
-"The most important job for Evolution is to give you access to your "
-"information and help you use it quickly. One way it does that is through the "
-"side bar, which is the column on the left side of the main window. The "
-"switcher at the bottom of the side bar let you switch between the Evolution "
-"tools, such as Mail and Contacts, are the shortcuts. Above them is a list of "
-"folders for the current Evolution tool."
+"Sidebar is the vertical panel on the left side of the Evolution main window. "
+"At the bottom of the sidebar is the Switcher, that lets you switch between "
+"the Evolution tools like Mail, Memo,Tasks and Contacts. Above the Switcher "
+"you can see a list of folders for the current Evolution tool."
 msgstr ""
 "Um Ihnen schnellen Zugriff auf Ihre Informationen zu bieten, befindet sich "
 "links im Hauptfenster die Seitenleiste. Sie enthält Knöpfe zum Zugriff auf "
 "die verschiedenen Evolution-Fenster, wie E-Mail und Kontakte, sowie darüber "
 "eine Liste der Ordner im jeweiligen Evolution-Fenster."
 
-#: C/evolution.xml:844(para)
+#: C/evolution.xml:827(para)
 msgid ""
-"The folder list organizes your e-mail, calendars, contact lists, and task "
-"lists in a tree, similar to a <link linkend=\"filetree\">file tree</link>. "
-"Most people find one to four folders at the base of the tree, depending on "
-"the tool and their system configuration. Each Evolution tool has at least "
-"one folder, called On This Computer, for local information. For example, the "
-"folder list for the e-mail tool shows any remote e-mail storage you have set "
-"up, plus local folders and search folders, which are discussed in <link "
-"linkend=\"usage-mail-organize-vfolders\">Using Search Folders</link>."
+"The folder list organizes your email, calendars, address books, task lists "
+"and memo lists in a tree, similar to a <link linkend=\"filetree\">file tree</"
+"link>. Most people find one to four folders at the base of the tree, "
+"depending on the tool and their system configuration. Each Evolution tool "
+"has at least one folder, called On This Computer, for local information. For "
+"example, the folder list for the email tool shows any remote email storage "
+"you have set up, plus local folders and search folders, which are discussed "
+"in <link linkend=\"usage-mail-organize-vfolders\">Using Search Folders</"
+"link>."
 msgstr ""
 "Die Ordnerliste organisiert Ihre E-Mails, Kalender, Adressbücher, Tasklisten "
 "und Notizlisten in einer Baumansicht, vergleichbar mit einem <link linkend="
@@ -2219,60 +2186,63 @@ msgstr ""
 "(siehe <link linkend=\"usage-mail-organize-vfolders\">Suchordner benutzen</"
 "link>)."
 
-#: C/evolution.xml:845(para)
+#: C/evolution.xml:828(para)
 msgid ""
-"If you get large amounts of e-mail, you might want more folders than just "
+"If you get large amounts of email, you might want more folders than just "
 "your Inbox. You can create multiple calendar, task, or contacts folders."
 msgstr ""
 "Falls Sie große Mengen an E-Mails erhalten, bietet es sich an, mehrere E-"
 "Mail-Ordner zu benutzen. Sie können zudem mehrere Kalender-, Aufgaben- und "
 "Kontaktordner erstellen."
 
-#: C/evolution.xml:846(para)
+#: C/evolution.xml:829(para)
 msgid "To create a new folder:"
 msgstr "Einen neuen Ordner erzeugen:"
 
-#: C/evolution.xml:849(para)
+#: C/evolution.xml:832(para)
 msgid "Click Folder &gt; New."
 msgstr "Klicken Sie auf Ordner &gt; Neu."
 
-#: C/evolution.xml:852(para)
+#: C/evolution.xml:835(para)
 msgid "Type the name of the folder in the Folder Name field."
 msgstr "Geben Sie den Namen des neuen Ordners in das Ordnername-Feld ein."
 
-#: C/evolution.xml:855(para)
+#: C/evolution.xml:838(para)
 msgid "Select the location of the new folder."
 msgstr "Wählen Sie den Ort für den neuen Ordner aus."
 
-#: C/evolution.xml:858(para) C/evolution.xml:1256(para)
-#: C/evolution.xml:1279(para) C/evolution.xml:1291(para)
-#: C/evolution.xml:1526(para) C/evolution.xml:1805(para)
+#: C/evolution.xml:841(para) C/evolution.xml:1250(para)
+#: C/evolution.xml:1276(para) C/evolution.xml:1288(para)
+#: C/evolution.xml:1523(para) C/evolution.xml:1805(para)
 #: C/evolution.xml:1907(para) C/evolution.xml:1923(para)
-#: C/evolution.xml:2130(para) C/evolution.xml:2168(para)
-#: C/evolution.xml:2228(para) C/evolution.xml:2707(para)
-#: C/evolution.xml:2740(para) C/evolution.xml:2936(para)
-#: C/evolution.xml:2978(para) C/evolution.xml:3111(para)
-#: C/evolution.xml:3208(para) C/evolution.xml:3223(para)
-#: C/evolution.xml:3501(para) C/evolution.xml:4049(para)
-#: C/evolution.xml:4115(para) C/evolution.xml:4238(para)
-#: C/evolution.xml:4280(para) C/evolution.xml:4612(para)
-#: C/evolution.xml:4667(para) C/evolution.xml:5241(para)
-#: C/evolution.xml:5263(para) C/evolution.xml:5287(para)
-#: C/evolution.xml:5321(para) C/evolution.xml:5802(para)
-#: C/evolution.xml:5829(para) C/evolution.xml:5851(para)
-#: C/evolution.xml:5867(para) C/evolution.xml:5893(para)
-#: C/evolution.xml:5924(para) C/evolution.xml:6078(para)
-#: C/evolution.xml:6156(para) C/evolution.xml:6186(para)
-#: C/evolution.xml:6716(para) C/evolution.xml:6814(para)
-#: C/evolution.xml:6931(para)
+#: C/evolution.xml:2140(para) C/evolution.xml:2179(para)
+#: C/evolution.xml:2245(para) C/evolution.xml:2725(para)
+#: C/evolution.xml:2758(para) C/evolution.xml:2954(para)
+#: C/evolution.xml:2996(para) C/evolution.xml:3129(para)
+#: C/evolution.xml:3223(para) C/evolution.xml:3238(para)
+#: C/evolution.xml:3256(para) C/evolution.xml:3303(para)
+#: C/evolution.xml:3517(para) C/evolution.xml:3521(para)
+#: C/evolution.xml:3748(para) C/evolution.xml:4117(para)
+#: C/evolution.xml:4183(para) C/evolution.xml:4305(para)
+#: C/evolution.xml:4348(para) C/evolution.xml:4680(para)
+#: C/evolution.xml:4735(para) C/evolution.xml:5186(para)
+#: C/evolution.xml:5261(para) C/evolution.xml:5283(para)
+#: C/evolution.xml:5307(para) C/evolution.xml:5341(para)
+#: C/evolution.xml:5685(para) C/evolution.xml:5820(para)
+#: C/evolution.xml:5847(para) C/evolution.xml:5867(para)
+#: C/evolution.xml:5882(para) C/evolution.xml:5905(para)
+#: C/evolution.xml:5931(para) C/evolution.xml:6063(para)
+#: C/evolution.xml:6086(para) C/evolution.xml:6164(para)
+#: C/evolution.xml:6194(para) C/evolution.xml:6740(para)
+#: C/evolution.xml:6838(para) C/evolution.xml:6973(para)
 msgid "Click OK."
 msgstr "Klicken Sie auf OK."
 
-#: C/evolution.xml:863(title)
+#: C/evolution.xml:846(title)
 msgid "Changing Switcher Appearance:"
 msgstr "Das Erscheinungsbild der Fensterknöpfe ändern:"
 
-#: C/evolution.xml:864(para)
+#: C/evolution.xml:847(para)
 msgid ""
 "To change the appearance of your switcher click <emphasis>View &gt; Switcher "
 "Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can "
@@ -2282,51 +2252,52 @@ msgstr ""
 "&gt; Erscheinungsbild der Schaltflächen in der Menüleiste. Hier können Sie "
 "folgendes auswählen:"
 
-#: C/evolution.xml:866(title)
+#: C/evolution.xml:849(title)
 msgid "Icons and Text:"
 msgstr "Symbole und Text:"
 
-#: C/evolution.xml:867(para)
+#: C/evolution.xml:850(para)
 msgid "Displays buttons with the label and the icon corresponding to it."
 msgstr "Stellt die Knöpfe mit Namen und Symbolen dar."
 
-#: C/evolution.xml:870(title)
+#: C/evolution.xml:853(title)
 msgid "Icons Only:"
 msgstr "Nur Symbole:"
 
-#: C/evolution.xml:871(para)
+#: C/evolution.xml:854(para)
 msgid "Shows only the icons."
 msgstr "Stellt nur die Symbole dar."
 
-#: C/evolution.xml:874(title)
+#: C/evolution.xml:857(title)
 msgid "Texts Only:"
 msgstr "Nur Text:"
 
-#: C/evolution.xml:875(para)
+#: C/evolution.xml:858(para)
 msgid "Displays buttons with the label, not the icons."
 msgstr "Stellt nur den Namen dar, aber nicht die Symbole."
 
-#: C/evolution.xml:878(title)
+#: C/evolution.xml:861(title)
 msgid "Toolbar Style:"
 msgstr "Werkzeugleistenstil:"
 
-#: C/evolution.xml:879(para)
+#: C/evolution.xml:862(para)
 msgid "Shows buttons using the desktop toolbar settings."
 msgstr "Stellt die Knöpfe gemäß den Desktop-weiten Einstellungen dar."
 
-#: C/evolution.xml:882(title)
+#: C/evolution.xml:865(title)
 msgid "Hide Buttons:"
 msgstr "Schaltflächen verbergen:"
 
-#: C/evolution.xml:883(para)
+#: C/evolution.xml:866(para)
 msgid "This option hides all the shortcut buttons of switcher."
-msgstr "Diese Option verbirgt die Knöpfe zum Wechseln zu anderen Evolution-Fenstern."
+msgstr ""
+"Diese Option verbirgt die Knöpfe zum Wechseln zu anderen Evolution-Fenstern."
 
-#: C/evolution.xml:888(title)
+#: C/evolution.xml:871(title)
 msgid "Folder Management"
 msgstr "Ordnerverwaltung"
 
-#: C/evolution.xml:889(para)
+#: C/evolution.xml:872(para)
 msgid ""
 "Right-click a folder or subfolder to display a menu with the following "
 "options:"
@@ -2334,11 +2305,11 @@ msgstr ""
 "Klicken Sie mit der rechten Maustaste auf einen Unterordner, um ein Menü mit "
 "den folgenden Optionen angezeigt zu bekommen:"
 
-#: C/evolution.xml:891(title)
+#: C/evolution.xml:874(title)
 msgid "Copy:"
 msgstr "Kopieren:"
 
-#: C/evolution.xml:892(para)
+#: C/evolution.xml:875(para)
 msgid ""
 "Copies the folder to a different location. When you select this item, "
 "Evolution offers a choice of locations to copy the folder to."
@@ -2347,59 +2318,59 @@ msgstr ""
 "wird ein Fenster zur Auswahl des Ortes angezeigt, an den dieser Ordner "
 "kopiert werden soll."
 
-#: C/evolution.xml:895(title)
+#: C/evolution.xml:878(title)
 msgid "Move:"
 msgstr "Verschieben:"
 
-#: C/evolution.xml:896(para)
+#: C/evolution.xml:879(para)
 msgid "Moves the folder to another location."
 msgstr "Verschiebt den Ordner an einen anderen Ort."
 
-#: C/evolution.xml:899(title)
+#: C/evolution.xml:882(title)
 msgid "Mark Messages As Read:"
 msgstr "Nachrichten als gelesen markieren:"
 
-#: C/evolution.xml:900(para)
+#: C/evolution.xml:883(para)
 msgid "Marks all the messages in the folder as read."
 msgstr "Markiert alle Nachrichten im Ordner als gelesen."
 
-#: C/evolution.xml:903(title)
+#: C/evolution.xml:886(title)
 msgid "New Folder:"
 msgstr "Ordner anlegen:"
 
-#: C/evolution.xml:904(para)
+#: C/evolution.xml:887(para)
 msgid "Creates another folder in the same location."
 msgstr "Erzeugt einen weiteren Ordner am selben Ort."
 
-#: C/evolution.xml:907(title) C/evolution.xml:2866(title)
+#: C/evolution.xml:890(title) C/evolution.xml:2884(title)
 msgid "Delete:"
 msgstr "Löschen:"
 
-#: C/evolution.xml:908(para)
+#: C/evolution.xml:891(para)
 msgid "Deletes the folder and all its contents."
 msgstr "Löscht den Ordner mit all seinen Inhalten."
 
-#: C/evolution.xml:911(title)
+#: C/evolution.xml:894(title)
 msgid "Rename:"
 msgstr "Umbenennen:"
 
-#: C/evolution.xml:912(para)
+#: C/evolution.xml:895(para)
 msgid "Lets you change the name of the folder."
 msgstr "Ermöglicht das Ändern des Ordnernamens."
 
-#: C/evolution.xml:915(title)
+#: C/evolution.xml:898(title)
 msgid "Disable:"
 msgstr "Deaktivieren:"
 
-#: C/evolution.xml:916(para)
+#: C/evolution.xml:899(para)
 msgid "Disables the account."
 msgstr "Deaktiviert das Konto."
 
-#: C/evolution.xml:919(title)
+#: C/evolution.xml:902(title)
 msgid "Properties:"
 msgstr "Eigenschaften:"
 
-#: C/evolution.xml:920(para)
+#: C/evolution.xml:903(para)
 msgid ""
 "Checks the number of total and unread messages in a folder, and, for remote "
 "folders, lets you select whether to copy the folder to your local system for "
@@ -2409,75 +2380,75 @@ msgstr ""
 "Ordner an, und bietet bei nicht-lokalen Ordner die Option, ob der Ordner auf "
 "die lokale Festplatte zur Offline-Nutzung kopiert werden soll."
 
-#: C/evolution.xml:922(para)
+#: C/evolution.xml:905(para)
 msgid "You can also rearrange folders and messages by dragging and dropping them."
 msgstr ""
 "Sie können auch Ordner und Dateien anders anordnen, indem Sie diese mit der "
 "linken Maustaste an eine andere Stelle ziehen und loslassen (Drag and Drop)."
 
-#: C/evolution.xml:923(para)
+#: C/evolution.xml:906(para)
 msgid ""
-"Any time new e-mail arrives in a e-mail folder, that folder label is "
-"displayed in bold text, along with the number of new messages in that folder."
+"Any time new email arrives in a email folder, that folder label is displayed "
+"in bold text, along with the number of new messages in that folder."
 msgstr ""
 "Jedes Mal wenn neue E-Mails in einem Ordner ankommen, so wird der Name des "
 "Ordners in Fettbuchstaben angezeigt und die Anzahl der ungelesenen "
 "Nachrichten in Klammern angezeigt."
 
-#: C/evolution.xml:928(title)
-msgid "E-Mail"
+#: C/evolution.xml:911(title)
+msgid "Email"
 msgstr "E-Mail"
 
-#: C/evolution.xml:929(para)
-msgid "Evolution e-mail is like other e-mail programs in several ways:"
-msgstr "Evolutions E-Mail-Teil ist ähnlich wie viele andere Programme:"
+#: C/evolution.xml:912(para)
+msgid "Evolution email is like other email programs in several ways:"
+msgstr "Evolutions E-Mail-Bereich ist ähnlich wie viele andere Programme:"
 
-#: C/evolution.xml:932(para)
+#: C/evolution.xml:915(para)
 msgid ""
-"It can send and receive e-mail in HTML or as plain text, and makes it easy "
-"to send and receive multiple file attachments."
+"It can send and receive email in HTML or as plain text, and makes it easy to "
+"send and receive multiple file attachments."
 msgstr ""
 "Sie können E-Mails als HTML or Text sowie einfach mehrere Dateianhänge "
 "verschicken und empfangen."
 
-#: C/evolution.xml:935(para)
+#: C/evolution.xml:918(para)
 msgid ""
-"It supports multiple e-mail sources, including <link linkend=\"imap\">IMAP</"
+"It supports multiple email sources, including <link linkend=\"imap\">IMAP</"
 "link>, <link linkend=\"pop\">POP3</link>, and local mbox or mh spools and "
-"files created by other e-mail programs."
+"files created by other email programs."
 msgstr ""
 "Evolution unterstützt verschiedene mögliche E-Mail-Quellen, wie <link "
 "linkend=\"imap\">IMAP</link>, <link linkend=\"pop\">POP3</link>, und lokale "
 "mbox- oder MH-Spools und -Dateien, die von anderen E-Mail-Programmen erzeugt "
 "wurden."
 
-#: C/evolution.xml:938(para)
+#: C/evolution.xml:921(para)
 msgid ""
-"It can sort and organize your e-mail in a wide variety of ways with folders, "
+"It can sort and organize your email in a wide variety of ways with folders, "
 "searches, and filters."
 msgstr ""
 "Sie können mit Evolution Ihre E-Mails in Ordnern, Suchen und mit Filtern "
 "sortieren und organisieren."
 
-#: C/evolution.xml:941(para)
+#: C/evolution.xml:924(para)
 msgid "It lets you guard your privacy with encryption."
 msgstr ""
 "Evolution kann Ihre Privätsphäre durch die Verwendung von "
 "Verschlüsselungstechnik schützen."
 
-#: C/evolution.xml:944(para)
+#: C/evolution.xml:927(para)
 msgid ""
-"However, Evolution has some important differences from other e-mail "
-"programs. First, It is built to handle very large amounts of e-mail. The "
-"<link linkend=\"usage-mail-organize-spam\">junk e-mail</link>, message <link "
-"linkend=\"usage-mail-organize-filters\">filtering</link> and <link linkend="
-"\"usage-mail-organize-search\">searching</link> functions were built for "
-"speed and efficiency. There's also the <link linkend=\"usage-mail-organize-"
-"vfolders\">search folder</link>, an advanced organizational feature not "
-"found in some e-mail clients. If you get a lot of e-mail, or if you keep "
-"every message you get in case you need to refer to it later, you'll find "
-"this feature especially useful. Here's a quick explanation of what's "
-"happening in your main Evolution e-mail window."
+"However, Evolution has some important differences from other email programs. "
+"First, It is built to handle very large amounts of email. The <link linkend="
+"\"usage-mail-organize-spam\">junk email</link>, message <link linkend="
+"\"usage-mail-organize-filters\">filtering</link> and <link linkend=\"usage-"
+"mail-organize-search\">searching</link> functions were built for speed and "
+"efficiency. There's also the <link linkend=\"usage-mail-organize-vfolders"
+"\">search folder</link>, an advanced organizational feature not found in "
+"some email clients. If you get a lot of email, or if you keep every message "
+"you get in case you need to refer to it later, you will find this feature "
+"especially useful. Here's a quick explanation of what's happening in your "
+"main Evolution email window."
 msgstr ""
 "Zu den Unterschieden gehört, dass Evolution für das Verarbeiten großer "
 "Mengen von E-Mails konzipiert wurde. Das <link linkend=\"usage-mail-organize-"
@@ -2492,22 +2463,24 @@ msgstr ""
 "diese zurückgreifen wollen, werden Sie diese Funktion besonders nützlich "
 "finden. Es folgt eine kurze Erklärung, was im E-Mail-Hauptfenster passiert."
 
-#: C/evolution.xml:948(para)
+#: C/evolution.xml:931(para)
 msgid ""
 "The message list displays all the messages that you have. This includes all "
-"your read and unread messages, and e-mail that is flagged to be deleted."
+"your read and unread messages, and email that is flagged to be deleted."
 msgstr ""
 "Die E-Mail-Liste zeigt alle E-Mails an, die Sie haben. Dies beinhaltet alle "
 "gelesenen und ungelesenen Nachrichten, und E-Mails, die als gelöscht "
 "markiert sind."
 
-#: C/evolution.xml:952(para)
-msgid "This is where your e-mail is displayed."
+#: C/evolution.xml:935(para)
+msgid ""
+"The preview pane displays the message that is currently chosen in the "
+"message list."
 msgstr ""
-"In der Nachrichtenvorschau wird die jeweils in der E-Mail-Liste ausgewählte "
-"E-Mail angezeigt."
+"Die Nachrichtenvorschau stellt den Inhalt der E-Mail dar, welche in der E-"
+"Mail-Liste ausgewählt ist."
 
-#: C/evolution.xml:954(para)
+#: C/evolution.xml:937(para)
 msgid ""
 "If you find the preview pane too small, you can resize the pane, enlarge the "
 "whole window, or double-click the message in the message list to have it "
@@ -2520,7 +2493,7 @@ msgstr ""
 "einem neuen Fenster öffnen, indem Sie auf die Nachricht in der E-Mail-Liste "
 "mit der linken Maustaste doppelt klicken."
 
-#: C/evolution.xml:955(para)
+#: C/evolution.xml:938(para)
 msgid ""
 "As with folders, you can right-click messages in the message list and get a "
 "menu of possible actions, including moving or deleting them, creating "
@@ -2531,9 +2504,9 @@ msgstr ""
 "wie zum Beispiel das Verschieben und Löschen von Nachrichten, das Erstellen "
 "von Filtern und Suchordnern, und das Markieren als Unerwünscht."
 
-#: C/evolution.xml:956(para)
+#: C/evolution.xml:939(para)
 msgid ""
-"Most of the e-mail-related actions you want to perform are listed in the "
+"Most of the email-related actions you want to perform are listed in the "
 "Message Menu and Folder Menu in the menu bar. The most frequently used ones, "
 "like Reply and Forward, also appear as buttons in the toolbar. Most of them "
 "are also located in the right-click menu and as keyboard shortcuts."
@@ -2545,19 +2518,19 @@ msgstr ""
 "und im Menü verfügbar, welches durch einen Klick mit der rechten Maustaste "
 "dargestellt wird."
 
-#: C/evolution.xml:957(para)
+#: C/evolution.xml:940(para)
 msgid ""
-"For an in-depth guide to the e-mail capabilities of Evolution, read <link "
-"linkend=\"usage-mail\">Sending and Receiving E-Mail</link>."
+"For an in-depth guide to the email capabilities of Evolution, read <link "
+"linkend=\"usage-mail\">Sending and Receiving Email</link>."
 msgstr ""
 "Für einen tieferen Einblick in die E-Mail-Fähigkeiten von Evolution siehe "
 "<link linkend=\"usage-mail\">Verschicken und Abrufen von E-Mail</link>."
 
-#: C/evolution.xml:961(title)
+#: C/evolution.xml:944(title)
 msgid "The Calendar"
 msgstr "Der Kalender"
 
-#: C/evolution.xml:962(para)
+#: C/evolution.xml:945(para)
 msgid ""
 "To begin using the calendar, click Calendar in the switcher. By default, the "
 "calendar shows today's schedule on a ruled background. At the left bottom, "
@@ -2572,19 +2545,19 @@ msgstr ""
 "Liste von Aufgaben außerhalb des Kalenders verwalten können. Unten rechts "
 "befindet sich die Liste von Notizen."
 
-#: C/evolution.xml:965(title)
+#: C/evolution.xml:948(title)
 msgid "Appointment List:"
 msgstr "Kalenderansicht:"
 
-#: C/evolution.xml:966(para)
+#: C/evolution.xml:949(para)
 msgid "The appointment list displays all your scheduled appointments."
 msgstr "Die Kalenderansicht stellt alle anstehenden Termine dar."
 
-#: C/evolution.xml:969(title)
+#: C/evolution.xml:952(title)
 msgid "Month Pane:"
 msgstr "Der kleine Kalender:"
 
-#: C/evolution.xml:970(para)
+#: C/evolution.xml:953(para)
 msgid ""
 "The month pane is a small view of a calendar month. To display additional "
 "months, drag the column border to the right. You can also select a range of "
@@ -2597,22 +2570,22 @@ msgstr ""
 "eine freigewählte Anzahl an Tagen auswählen. Wählen Sie hierzu die Tage aus, "
 "die in Ihrer Kalenderansicht angezeigt werden sollen."
 
-#: C/evolution.xml:973(title)
+#: C/evolution.xml:956(title)
 msgid "Task List:"
 msgstr "Aufgabenliste:"
 
-#: C/evolution.xml:974(para)
+#: C/evolution.xml:957(para)
 msgid ""
 "Tasks are distinct from appointments because they generally don't have times "
-"associated with them. You can see a larger view of your task list by "
-"clicking Tasks in the switcher."
+"associated with them. You can use the list in a larger window by clicking "
+"the Tasks button in the side bar."
 msgstr ""
 "Aufgaben unterscheiden sich von Terminen, da allgemein damit keine festen "
 "Zeiten verknüpft sind. Sie erhalten eine größere Ansicht Ihrer "
 "Aufgabenliste, indem Sie den Aufgaben-Knopf unten links in der Seitenleiste "
 "klicken, so dass Sie das Aufgaben-Fenster erhalten."
 
-#: C/evolution.xml:976(para)
+#: C/evolution.xml:959(para)
 msgid ""
 "For more information about the calendar, see <link linkend=\"usage-calendar"
 "\">Evolution Calendar</link>."
@@ -2620,11 +2593,11 @@ msgstr ""
 "Für weitere Informationen über den Kalender siehe <link linkend=\"usage-"
 "calendar\">Der Kalender</link>."
 
-#: C/evolution.xml:980(title)
+#: C/evolution.xml:963(title)
 msgid "The Contacts"
 msgstr "Die Kontakte"
 
-#: C/evolution.xml:981(para)
+#: C/evolution.xml:964(para)
 msgid ""
 "The Evolution contacts can handle all of the functions of an address book or "
 "phone book. However, it is easier to update Evolution than it is to change "
@@ -2638,7 +2611,7 @@ msgstr ""
 "kann und <link linkend=\"ldap\">LDAP</link>-Verzeichnisse in einem Netzwerk "
 "nutzen kann."
 
-#: C/evolution.xml:982(para)
+#: C/evolution.xml:965(para)
 msgid ""
 "To use the contacts tool, click Contacts in the switcher. By default, the "
 "display shows all your contacts in alphabetical order, in a minicard view. "
@@ -2652,32 +2625,32 @@ msgstr ""
 "und Höhen der einzelnen Bereiche durch das Anklicken und Ziehen der Balken "
 "mit der Maus ändern."
 
-#: C/evolution.xml:984(para)
+#: C/evolution.xml:967(para)
 msgid ""
 "Another advantage of the Evolution contacts is its integration with the rest "
-"of the application. For example, you can right-click an e-mail address in "
+"of the application. For example, you can right-click an email address in "
 "Evolution mail to instantly create a contact entry."
 msgstr ""
 "Ein weiterer Vorteil ist die gute Einbindung mit dem Rest der Anwendung. Sie "
 "können zum Beispiel mit der rechten Maustaste auf eine E-Mail-Adresse im E-"
 "Mail-Fenster klicken und dadurch einfach einen neuen Kontakt erstellen."
 
-#: C/evolution.xml:985(emphasis)
-msgid "Contact list"
+#: C/evolution.xml:968(emphasis)
+msgid "Contact List"
 msgstr "Liste der Kontakte"
 
-#: C/evolution.xml:986(para)
+#: C/evolution.xml:969(para)
 msgid ""
 "The largest section of the contacts display shows a list of individual "
-"contacts. You can also search the contacts in the same way that you search e-"
-"mail folders, using the search tool on the right side of the toolbar."
+"contacts. You can also search the contacts in the same way that you search "
+"email folders, using the search tool on the right side of the toolbar."
 msgstr ""
 "Der größte Bereich des Kontakte-Fensters zeigt Ihnen die Liste der "
 "vorhandenen Kontakte. Sie können die Kontakte auf die gleiche Art und Weise "
 "wie E-Mail-Ordner durchsuchen, indem Sie die Suchfunktion rechts unterhalb "
 "der Werkzeugleiste benutzen."
 
-#: C/evolution.xml:987(para)
+#: C/evolution.xml:970(para)
 msgid ""
 "For detailed instructions on how to use the address book, read <link linkend="
 "\"usage-contact\">Evolution Contacts: the Address Book</link>."
@@ -2685,40 +2658,38 @@ msgstr ""
 "Für weitere Informationen über die Nutzung des Adressbuchs siehe <link "
 "linkend=\"usage-contact\">Das Adressbuch</link>."
 
-#: C/evolution.xml:992(title)
-msgid "Backup And Restore Evolution"
+#: C/evolution.xml:975(title)
+msgid "Backing Up And Restoring Evolution"
 msgstr "Sichern und Wiederherstellen von Evolution"
 
-#: C/evolution.xml:993(para)
+#: C/evolution.xml:976(para)
 msgid ""
-"With the Backup and Restore plugin enabled, you can successfully backup "
-"Evolution to your machine and restore it whenever it is required. The back "
-"up saves your Evolution gconf settings, mails, contacts, tasks, memos and "
+"With the Backup and Restore plug-in enabled, you can successfully back up "
+"Evolution to your machine and restore it whenever it is required. The backup "
+"saves your Evolution gconf settings, mail, contacts, tasks, memos, and "
 "calendars and creates an archive."
 msgstr ""
-"Wenn das Plugin zum Sichern und Wiederherstellen von Evolution aktiviert ist, so können Sie "
-"erfolgreich sämtliche Evolution-Daten und -Einstellungen sichern (»Backup«) "
-"und wiederherstellen, wann immer dies erforderlich ist. In der zu "
-"erstellenden Sicherungsdatei werden Evolutions GConf-Einstellungen, E-Mails, "
-"Kalender, Notizen, Kontakte und Aufgaben gespeichert."
-
-#: C/evolution.xml:994(para)
-msgid "To take the backup,"
-msgstr "Um eine Sicherung zu erstellen,"
+"Wenn das Plugin zum Sichern und Wiederherstellen von Evolution aktiviert "
+"ist, so können Sie erfolgreich sämtliche Evolution-Daten und -Einstellungen "
+"sichern (»Backup«) und wiederherstellen, wann immer dies erforderlich ist. In "
+"der zu erstellenden Sicherungsdatei werden Evolutions GConf-Einstellungen, E-"
+"Mails, Kalender, Notizen, Kontakte und Aufgaben gespeichert."
 
-#: C/evolution.xml:997(para)
-msgid "Select File &gt; Backup Settings to select the folder to save the backup."
+#: C/evolution.xml:979(para)
+msgid ""
+"Select File &gt; Backup Settings to select the folder where you want to save "
+"the backup."
 msgstr ""
 "Wählen Sie Datei &gt; Einstellungen sichern um den Ordner auszuwählen, in "
 "dem die Sicherungsdatei gespeichert werden soll."
 
-#: C/evolution.xml:999(para)
+#: C/evolution.xml:981(para)
 msgid "Evolution is always backed up as evolution-backup.tar.gz."
 msgstr ""
 "Die Sicherungsdatei wird immer mit dem Namen »evolution-backup.tar.gz« "
 "angelegt."
 
-#: C/evolution.xml:1000(para)
+#: C/evolution.xml:982(para)
 msgid ""
 "Before the backup process starts, it asks you to close Evolution and "
 "displays a warning as shown below:"
@@ -2726,107 +2697,125 @@ msgstr ""
 "Bevor die eigentliche Evolution-Sicherung gestartet wird, werden Sie dazu "
 "aufgefordert, Evolution zu beenden. Hierzu wird eine Warnung angezeigt:"
 
-#: C/evolution.xml:1005(para)
+#: C/evolution.xml:987(para)
 msgid ""
-"Click Restart Evolution after backup to restart Evolution immediately after "
+"Select Restart Evolution after backup to restart Evolution immediately after "
 "the backup process."
 msgstr ""
 "Klicken Sie auf »Evolution nach Sicherung neu starten«, damit Evolution nach "
 "Abschluss der Sicherung automatisch wieder gestartet wird."
 
-#: C/evolution.xml:1008(para)
-msgid "Click Yes to close Evolution and start backup."
-msgstr "Klicken Sie auf »Ja«, um Evolution zu beenden und die Sicherung zu starten."
+#: C/evolution.xml:990(para)
+msgid "Click Yes to close Evolution and start the backup."
+msgstr ""
+"Klicken Sie auf »Ja«, um Evolution zu beenden und die Sicherung zu starten."
 
-#: C/evolution.xml:1010(para) C/evolution.xml:1029(para)
+#: C/evolution.xml:992(para) C/evolution.xml:1010(para)
 msgid "Evolution will auto-restart after the process."
 msgstr "Evolution wird nach Beendigung des Vorgangs automatisch wieder gestartet."
 
-#: C/evolution.xml:1015(title)
-msgid "Restore Evolution"
-msgstr "Evolution wiederherstellen."
+#: C/evolution.xml:997(title)
+msgid "Restoring Evolution"
+msgstr "Evolution wiederherstellen"
 
-#: C/evolution.xml:1016(para)
+#: C/evolution.xml:998(para)
 msgid "This feature restores your settings from the archive."
-msgstr "Diese Funktion stellt die Einstellungen aus dem Sicherungsarchiv wieder her."
-
-#: C/evolution.xml:1017(para)
-msgid "To restore Evolution,"
-msgstr "Um Evolution wiederherzustellen,"
+msgstr ""
+"Diese Funktion stellt die Einstellungen aus dem Sicherungsarchiv wieder her."
 
-#: C/evolution.xml:1020(para)
+#: C/evolution.xml:1001(para)
 msgid ""
 "Select File &gt; Restore Settings to open the available evolution.tar.gz "
-"files"
+"files."
 msgstr ""
 "Wählen Sie Datei &gt; Einstellungen zurücksetzen um die verfügbaren "
-"evolution.tar.gz-Dateien zu öffnen"
+"evolution.tar.gz-Dateien zu öffnen."
 
-#: C/evolution.xml:1023(para)
+#: C/evolution.xml:1004(para)
 msgid "Select the evolution.tar.gz and click Save."
 msgstr ""
 "Wählen Sie die gewünschte »evolution.tar.gz«-Datei und klicken Sie auf "
 "Speichern."
 
-#: C/evolution.xml:1024(para)
+#: C/evolution.xml:1005(para)
 msgid ""
-"Before the process starts, it asks you to close Evolution. Close the windows "
-"and click Restore to restore Evolution."
+"Before the process starts, a pop-up window appears and asks you to close "
+"Evolution. Close all the windows and then click Restore in the pop-up window."
 msgstr ""
 "Bevor die Wiederherstellung startet werden Sie dazu aufgefordert, Evolution "
 "zu beenden. Schließen Sie die Fenster und klicken Sie auf Wiederherstellen, "
 "um Evolution wiederherzustellen."
 
-#: C/evolution.xml:1026(para)
+#: C/evolution.xml:1007(para)
 msgid ""
-"If you are creating your first account via the startup-wizard, you have an "
-"option to restore from the archive if it is available locally."
+"If you are creating your first account via the Startup Wizard, you can use "
+"the option to restore from the archive if it is available locally."
 msgstr ""
 "Falls Sie Ihr allererstes Konto in Evolution mit dem Einrichtungsassistent "
 "erstellen, so ist die Option verfügbar, Evolution aus einer vorherigen "
 "Sicherung wiederherzustellen, falls eine Sicherungsdatei lokal vorhanden ist."
 
-#: C/evolution.xml:1036(title)
+#: C/evolution.xml:1017(title)
+msgid "Crash Recovery"
+msgstr "Wiederabsturzverhinderung"
+
+#: C/evolution.xml:1018(para)
+msgid ""
+"Evolution displays a crash detection message when you restart it after a "
+"crash."
+msgstr ""
+"Wenn Sie Evolution nach einem Absturz wieder startet, so wird eine Nachricht "
+"angezeigt."
+
+#: C/evolution.xml:1020(para)
+msgid ""
+"Click Ignore to restore the preview pane displayed when Evolution crashed. "
+"If you click Recover, Evolution opens with all preview panes hidden."
+msgstr ""
+
+#: C/evolution.xml:1023(title)
 msgid "Command Line Options"
 msgstr "Befehlszeilen-Optionen"
 
-#: C/evolution.xml:1037(para)
+#: C/evolution.xml:1024(para)
 msgid ""
-"Evolution has a number of command line options that you can use. You can "
-"find the full list by entering the command <command>man evolution</command> "
-"or <command>evolution --help</command>. The most important command line "
-"options are:"
+"Evolution has a number of command line options that you can use. For more "
+"information about command line options, open a terminal window and type "
+"<command>evolution --help</command>."
 msgstr ""
-"Evolution besitzt eine Anzahl an Befehlszeilen-Optionen. Für Informationen "
-"über die Befehlszeilen-Optionen, öffnen Sie ein Terminal-Fenster und geben "
-"Sie <command>evolution --help</command> ein. Die wichtigsten Kommandozeilen-"
-"Optionen sind:"
+"Evolution besitzt eine Anzahl nützlicher Befehlszeilen-Optionen. Für "
+"Informationen über die Befehlszeilen-Optionen, öffnen Sie ein Terminal-"
+"Fenster und geben Sie <command>evolution --help</command> ein."
+
+#: C/evolution.xml:1025(para)
+msgid "The most important command line options are:"
+msgstr "Die wichtigsten Befehlszeilen-Optionen sind:"
 
-#: C/evolution.xml:1045(para)
+#: C/evolution.xml:1033(para)
 msgid "Command"
 msgstr "Befehl"
 
-#: C/evolution.xml:1048(para) C/evolution.xml:1710(para)
+#: C/evolution.xml:1036(para) C/evolution.xml:1710(para)
 msgid "Description"
 msgstr "Beschreibung"
 
-#: C/evolution.xml:1055(para)
+#: C/evolution.xml:1043(para)
 msgid "evolution --offline"
 msgstr "evolution --offline"
 
-#: C/evolution.xml:1058(para)
+#: C/evolution.xml:1046(para)
 msgid "Starts Evolution in offline mode."
 msgstr "Startet Evolution im Offline-Betrieb."
 
-#: C/evolution.xml:1063(para)
+#: C/evolution.xml:1051(para)
 msgid "evolution --disable-preview"
 msgstr "evolution --disable-preview"
 
-#: C/evolution.xml:1066(para)
+#: C/evolution.xml:1054(para)
 msgid "Disables all the preview panes when you launch Evolution."
 msgstr "Deaktiviert den Vorschaubereich beim Starten von Evolution."
 
-#: C/evolution.xml:1067(para)
+#: C/evolution.xml:1055(para)
 msgid ""
 "It lets Evolution not to open the last crashed message, task or contact when "
 "you restart Evolution. Thus, it provides a way to avoid system crash caused "
@@ -2836,95 +2825,96 @@ msgstr ""
 "Nachricht, Aufgabe oder Kontakt. Damit wird verhindert, dass Evolution durch "
 "das Anzeigen der Vorschau sofort abstürzt."
 
-#: C/evolution.xml:1072(para)
+#: C/evolution.xml:1060(para)
 msgid "evolution mailto:<varname>joe@somewhere.net</varname>"
 msgstr "evolution mailto:<varname>joe@somewhere.net</varname>"
 
-#: C/evolution.xml:1075(para)
-msgid "Starts Evolution and begins composing a message to the e-mail address listed."
+#: C/evolution.xml:1063(para)
+msgid ""
+"Starts Evolution and begins composing a message to the email address listed."
 msgstr ""
 "Startet Evolution und öffnet ein Editor-Fenster mit der genannten E-Mail-"
 "Adresse als Empfänger."
 
-#: C/evolution.xml:1080(para)
+#: C/evolution.xml:1068(para)
 msgid "evolution -c mail"
 msgstr "evolution -c mail"
 
-#: C/evolution.xml:1083(para)
+#: C/evolution.xml:1071(para)
 msgid "Starts Evolution in mail mode."
 msgstr "Startet Evolution mit dem E-Mail-Fenster."
 
-#: C/evolution.xml:1088(para)
+#: C/evolution.xml:1076(para)
 msgid "evolution -c calendar"
 msgstr "evolution -c calendar"
 
-#: C/evolution.xml:1091(para)
+#: C/evolution.xml:1079(para)
 msgid "Starts Evolution in calendar mode."
 msgstr "Startet Evolution mit dem Kalender-Fenster."
 
-#: C/evolution.xml:1096(para)
+#: C/evolution.xml:1084(para)
 msgid "evolution -c contacts"
 msgstr "evolution -c contacts"
 
-#: C/evolution.xml:1099(para)
+#: C/evolution.xml:1087(para)
 msgid "Starts Evolution in contacts mode."
 msgstr "Startet Evolution mit dem Adressbuch-Fenster."
 
-#: C/evolution.xml:1104(para)
+#: C/evolution.xml:1092(para)
 msgid "evolution --force-shutdown"
 msgstr "evolution --force-shutdown"
 
-#: C/evolution.xml:1107(para)
+#: C/evolution.xml:1095(para)
 msgid "Forces every part of Evolution to shut down immediately."
 msgstr "Zwingt jegliche Teile von Evolution, sich sofort zu beenden."
 
-#: C/evolution.xml:1112(para)
-msgid "evolution ”%s”"
-msgstr "evolution ”%s”"
+#: C/evolution.xml:1100(para)
+msgid "evolution <quote>%s</quote>"
+msgstr "evolution <quote>%s</quote>"
 
-#: C/evolution.xml:1115(para)
+#: C/evolution.xml:1103(para)
 msgid ""
-"Makes Evolution your default e-mail handler for your Web browser and in the "
+"Makes Evolution your default email handler for your Web browser and in the "
 "GNOME* Control Center."
 msgstr ""
 "Macht Evolution zum Vorgabe-E-Mail-Programm für Ihren Internet-Browser und "
 "im GNOME*-Kontrollzentrum."
 
-#: C/evolution.xml:1126(para)
+#: C/evolution.xml:1114(para)
 msgid ""
-"This section, and <link linkend=\"usage-mail-organize\">Organizing Your E-"
-"Mail</link>, provide you with an in-depth guide to the capabilities of "
-"Evolution™ as a mail client. For information about how to customize your "
-"mail account, see <link linkend=\"config-prefs-mail\">Mail Preferences</"
-"link>."
+"This section, and <link linkend=\"usage-mail-organize\">Organizing Your "
+"Email</link>, provide you with an in-depth guide to the capabilities of "
+"<trademark>Evolution</trademark> as a mail client. For information about how "
+"to customize your mail account, see <link linkend=\"config-prefs-mail\">Mail "
+"Preferences</link>."
 msgstr ""
 "Dieser Abschnitt, und <link linkend=\"usage-mail-organize\">E-Mails "
 "organisieren</link>, gibt Ihnen einen tieferen Einblick in die Fähigkeiten "
-"von Evolution™ als einem E-Mail-Programm. Für weitere Informationen "
-"über das Einrichten eines E-Mail-Kontos siehe <link linkend=\"config-prefs-"
-"mail\">E-Mail-Einstellungen</link>."
+"von <trademark>Evolution</trademark> als einem E-Mail-Programm. Für weitere "
+"Informationen über das Einrichten eines E-Mail-Kontos siehe <link linkend="
+"\"config-prefs-mail\">E-Mail-Einstellungen</link>."
 
-#: C/evolution.xml:1129(link) C/evolution.xml:1146(title)
+#: C/evolution.xml:1117(link) C/evolution.xml:1134(title)
 msgid "Reading Mail"
 msgstr "E-Mails lesen"
 
-#: C/evolution.xml:1132(link) C/evolution.xml:1389(title)
-msgid "Composing New E-Mail Messages"
+#: C/evolution.xml:1120(link) C/evolution.xml:1386(title)
+msgid "Composing New Email Messages"
 msgstr "Neue E-Mail-Nachrichten schreiben"
 
-#: C/evolution.xml:1135(link) C/evolution.xml:1981(title)
+#: C/evolution.xml:1123(link) C/evolution.xml:1982(title)
 msgid "Sending Invitations by Mail"
 msgstr "Einladungen per E-Mail versenden"
 
-#: C/evolution.xml:1138(link) C/evolution.xml:2004(title)
+#: C/evolution.xml:1126(link) C/evolution.xml:2005(title)
 msgid "IMAP Subscriptions Manager"
 msgstr "IMAP-Abonnements"
 
-#: C/evolution.xml:1141(link) C/evolution.xml:2028(title)
+#: C/evolution.xml:1129(link) C/evolution.xml:2029(title)
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: C/evolution.xml:1147(para)
+#: C/evolution.xml:1135(para)
 msgid ""
 "If you are not already viewing mail, switch to the mail tool by clicking the "
 "Mail shortcut button, or press Ctrl+1. To read a message, select it in the "
@@ -2938,21 +2928,22 @@ msgstr ""
 "betrachten möchten, klicken Sie zweimal auf die Nachricht, drücken Sie die "
 "Eingabetaste, oder drücken Sie Steuerung+O."
 
-#: C/evolution.xml:1149(para)
+#: C/evolution.xml:1137(para)
 msgid ""
 "To read mail with the keyboard, you can click the Spacebar to page down and "
-"press Backspace to page up while reading an e-mail. Ensure that you use the "
-"keys when message list is enabled."
+"press Backspace to page up while reading an email. Ensure that you use the "
+"keys when the message list is enabled."
 msgstr ""
 "Um E-Mails per Tastatur zu lesen, können Sie die Leertaste zum "
 "Herunterbewegen und die Rücktaste zum Heraufbewegen innerhalb einer E-Mail "
-"benutzen."
+"benutzen. Stellen Sie hierfür sicher, dass Sie sich in der E-Mail-Liste "
+"befinden."
 
-#: C/evolution.xml:1150(para)
+#: C/evolution.xml:1138(para)
 msgid ""
 "Navigate the message list by using the arrow keys on the keyboard. To go to "
 "the next and previous unread messages, press the period (.) or comma (,) "
-"keys. On most keyboards, these keys are also marked with the &gt; and &lt; "
+"keys. On some keyboards, these keys are also marked with the &gt; and &lt; "
 "symbols, which is a convenient way to remember that they move you forward "
 "and backward in your message list. You can also use the right square bracket "
 "(]) for the next unread message, and the left square bracket ([) for the "
@@ -2965,79 +2956,95 @@ msgstr ""
 "nächsten ungelesenen Nachricht zu gelangen, und die Taste mit der linken "
 "eckigen Klammer ([) für die vorherige ungelesene Nachricht."
 
-#: C/evolution.xml:1154(title)
+#: C/evolution.xml:1142(title)
 msgid "Magic Spacebar For Reading Mail"
 msgstr "Magische Leertaste für das Lesen von E-Mails"
 
-#: C/evolution.xml:1155(para)
+#: C/evolution.xml:1143(para)
 msgid ""
 "With Magic Spacebar, you can easily read the unread messages in all the mail "
-"folders. You can read mail, scroll the mail and switch folders using the "
-"spacebar on your keyboard."
+"folders. You can read mail, scroll through mail and switch folders by using "
+"the Spacebar on your keyboard."
 msgstr ""
 "Mit der »Magischen Leertaste« können Sie einfach die ungelesenen E-Mails in "
 "allen Ordnern lesen. Durch Drücken der Leertaste auf Ihrer Tastatur können "
 "Sie E-Mails lesen, in den E-Mails scrollen und den Ordner wechseln."
 
-#: C/evolution.xml:1156(para)
-msgid ""
-"When you are on the Mail view, the spacebar will give you the following "
-"behavior:"
+#: C/evolution.xml:1144(para)
+msgid "To enable Magic Spacebar:"
+msgstr "Um die »Magische Leertaste« zu aktivieren:"
+
+#: C/evolution.xml:1147(para) C/evolution.xml:1243(para)
+#: C/evolution.xml:2128(para) C/evolution.xml:2167(para)
+#: C/evolution.xml:2228(para) C/evolution.xml:5053(para)
+#: C/evolution.xml:5326(para) C/evolution.xml:5609(para)
+#: C/evolution.xml:5625(para) C/evolution.xml:6043(para)
+msgid "Select Edit &gt; Preferences, then select Mail Accounts."
+msgstr "Klicken Sie auf Bearbeiten &gt; Einstellungen, dann E-Mail-Konten."
+
+#: C/evolution.xml:1150(para)
+msgid "Select the Enable Magic Spacebar check box."
+msgstr "Wählen Sie »Magische Leertaste einschalten« aus."
+
+#: C/evolution.xml:1153(para)
+msgid "When you are in the Mail view, the Spacebar has the following behavior:"
 msgstr ""
 "Wenn Sie sich im E-Mail-Fenster befinden, verhält sich die Leertaste wie "
 "folgt:"
 
-#: C/evolution.xml:1159(para)
+#: C/evolution.xml:1156(para)
 msgid ""
-"When you press the spacebar for the first time, it takes you to the next "
+"When you press the Spacebar for the first time, it takes you to the next "
 "unread message."
 msgstr ""
 "Wenn Sie die Leertaste das erste Mal drücken, so wird die nächste ungelesene "
 "Nachricht angezeigt."
 
-#: C/evolution.xml:1162(para)
-msgid "If the message is more than one screen long, the spacebar works as pagedown."
+#: C/evolution.xml:1159(para)
+msgid ""
+"If the message is more than one screen long, the Spacebar works as Page Down "
+"key."
 msgstr ""
 "Falls die Nachricht länger ist und nicht vollständig auf dem Bildschirm "
 "angezeigt werden kann, so wird durch das Drücken der Leertaste die Nachricht "
 "heruntergescrollt, so dass Sie die Nachricht weiterlesen können."
 
-#: C/evolution.xml:1165(para)
+#: C/evolution.xml:1162(para)
 msgid ""
-"If you press the spacebar after you reach the bottom of the page, it takes "
-"you to the next unread message if any."
+"If you press the Spacebar after you reach the bottom of the page, it takes "
+"you to the next unread message."
 msgstr ""
 "Wenn die Leertaste am Ende der Nachricht gedrückt wird, so wird die nächste "
 "ungelesene Nachricht angezeigt."
 
-#: C/evolution.xml:1168(para)
+#: C/evolution.xml:1165(para)
 msgid ""
-"If there are no more unread messages in the mailbox, pressing spacebar takes "
-"you to the next unread message in the next folder."
+"If there are no more unread messages in the mailbox, pressing the Spacebar "
+"takes you to the next unread message in the next folder."
 msgstr ""
 "Falls keine weiteren ungelesenen Nachrichten im Ordner vorhanden sind, so "
 "wird durch das Drücken der Leertaste die erste ungelesene Nachricht im "
 "nächsten Ordner angezeigt."
 
-#: C/evolution.xml:1171(para)
+#: C/evolution.xml:1168(para)
 msgid ""
-"If new messages arrive in a number of folders, spacebar toggles between "
+"If new messages arrive in a number of folders, the Spacebar toggles between "
 "those folders. This feature allows you to switch to the next unread message "
-"in a different folder without having to click the folder."
+"in a different folder without clicking the folder."
 msgstr ""
 "Falls Sie neue Nachrichten in mehreren Ordnern erhalten haben, so ermöglicht "
 "die Leertaste das Springen zu den Ordnern. Es ist hiermit nicht mehr nötig, "
 "erst den nächsten Ordner auszuwählen."
 
-#: C/evolution.xml:1177(title)
+#: C/evolution.xml:1174(title)
 msgid "Checking for New Mail"
 msgstr "Nach neuen E-Mails schauen"
 
-#: C/evolution.xml:1178(para)
+#: C/evolution.xml:1175(para)
 msgid ""
 "To check your mail, click Send/Receive in the toolbar. If you haven't "
 "created any mail accounts yet, the setup assistant asks you for the "
-"information it needs to check your e-mail. For information on creating mail "
+"information it needs to check your email. For information on creating mail "
 "accounts, see <link linkend=\"usage-mainwindow-starting\">Starting Evolution "
 "for the First Time</link>."
 msgstr ""
@@ -3048,24 +3055,18 @@ msgstr ""
 "<link linkend=\"usage-mainwindow-starting\">Evolution zum ersten Mal "
 "starten</link>."
 
-#: C/evolution.xml:1180(para)
-msgid "‘Get Mail' in the Evolution toolbar replaced with Send/Receive tool in SLED."
-msgstr ""
-"Im Suse Linux Enterprise Desktop ist der Verschicken/Abrufen-Knopf in der "
-"Werkzeugleiste mit &lsquo;Get Mail' beschriftet."
-
-#: C/evolution.xml:1182(para)
+#: C/evolution.xml:1176(para)
 msgid ""
 "If this is your first time checking mail, or you haven't asked Evolution to "
 "store your password, you are prompted for the password. Enter your password "
-"to download your e-mail."
+"to download your email."
 msgstr ""
 "Falls Sie zum ersten Mal E-Mails abrufen, oder falls Sie nicht eingestellt "
 "haben, dass Evolution Ihr Passwort speichern soll, so werden Sie nun nach "
 "dem Passwort gefragt. Geben Sie Ihr Passwort ein, um Ihre E-Mails "
 "herunterzuladen."
 
-#: C/evolution.xml:1183(para)
+#: C/evolution.xml:1177(para)
 msgid ""
 "If you get an error message instead of mail, you probably need to check your "
 "network settings. To learn how to do that, see <link linkend=\"mail-prefs-"
@@ -3075,26 +3076,26 @@ msgstr ""
 "bitte Ihre Netzwerkeinstellungen. Siehe hierzu TODO, oder fragen Sie Ihren "
 "System-Administrator."
 
-#: C/evolution.xml:1187(title)
+#: C/evolution.xml:1181(title)
 msgid "New Mail Notification"
 msgstr "Benachrichtigung bei neuen E-Mails"
 
-#: C/evolution.xml:1188(para)
+#: C/evolution.xml:1182(para)
 msgid ""
-"Evolution notifies you of new e-mail arriving. When you receive a new mail "
-"in your inbox, Evolution display an e-mail notifier at the notification area "
-"for a few seconds."
+"Evolution notifies you of new email. When you receive a new mail in your "
+"inbox, a blinking icon appears on the Switcher."
 msgstr ""
 "Evolution benachrichtigt Sie über neu eingetroffene E-Mails. Falls eine neue "
-"Nachricht in Ihrem Eingangsordner eintrifft, so zeigt Evolution für einige "
-"Sekunden ein Symbol im Benachrichtigungsfeld an."
+"Nachricht in Ihrem Eingangsordner eintrifft, so zeigt Evolution ein Symbol im "
+"Benachrichtigungsfeld an."
 
-#: C/evolution.xml:1190(para)
+#: C/evolution.xml:1184(para)
 msgid ""
-"The e-mail notification feature also includes a blinking icon <inlinegraphic "
-"format=\"PNG\" fileref=\"figures/evo_blink.png\"/> that disappears when you "
-"open the new e-mail. You can also click the icon <inlinegraphic format=\"PNG"
-"\" fileref=\"figures/evo_blink.png\"/> to turn the notifier off."
+"You can also see a blinking icon <inlinegraphic format=\"PNG\" fileref="
+"\"figures/evo_blink.png\"/> in the notification area that disappears when "
+"you open the new email. You can keep the mouse over the <inlinegraphic "
+"format=\"PNG\" fileref=\"figures/evo_blink.png\"/> icon to view the "
+"notification message."
 msgstr ""
 "Die E-Mail-Benachrichtigungsfunktion beinhaltet auch ein blinkendes Symbol "
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/> welches "
@@ -3102,11 +3103,11 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/> klicken, "
 "damit dieses ausgeschaltet wird."
 
-#: C/evolution.xml:1196(title)
-msgid "Vertical View Vs Classical View"
+#: C/evolution.xml:1188(title)
+msgid "Vertical View Versus Classical View"
 msgstr "Vertikale Ansicht vs. Klassische Ansicht"
 
-#: C/evolution.xml:1197(para)
+#: C/evolution.xml:1189(para)
 msgid ""
 "Evolution provides you vertical view in addition to the classical view. In "
 "the vertical view, message preview pane is located at the right side of the "
@@ -3121,22 +3122,22 @@ msgstr ""
 "Monitore mit breitem Bildschirm (zum Beispiel 16:9 oder Widescreen-Format) "
 "an."
 
-#: C/evolution.xml:1199(title)
+#: C/evolution.xml:1191(title)
 msgid "Vertical View:"
 msgstr "Vertikale Ansicht:"
 
-#: C/evolution.xml:1200(para)
+#: C/evolution.xml:1192(para)
 msgid "To switch to vertical view"
 msgstr "Zur Vertikalen Ansicht wechseln"
 
-#: C/evolution.xml:1204(para)
+#: C/evolution.xml:1196(para)
 msgid "Click View &gt; Preview &gt; Vertical View"
 msgstr "Wählen Sie Ansicht &gt; Vorschau &gt; Vertikale Ansicht"
 
-#: C/evolution.xml:1207(para)
+#: C/evolution.xml:1199(para)
 msgid ""
 "In Vertical view, default message list contains a double line compressed "
-"headers, which enables you to consume the extra width in the preview column."
+"headers, which enables you to consume the extra width in the preview column. "
 "The compressed columns have Sender Name and Email, Attachment Icon, Date and "
 "Subject in the second line."
 msgstr ""
@@ -3145,23 +3146,23 @@ msgstr ""
 "bereitstellt. Die zwei Zeilen stellen Absendernamen und -E-Mail, "
 "Anhangssymbol, Datum und Betreff dar."
 
-#: C/evolution.xml:1210(title)
+#: C/evolution.xml:1202(title)
 msgid "Classical View:"
 msgstr "Klassische Ansicht:"
 
-#: C/evolution.xml:1211(para)
+#: C/evolution.xml:1203(para)
 msgid "To switch to classical view,"
 msgstr "Um zur Klassischen Ansicht zu wechseln,"
 
-#: C/evolution.xml:1215(para)
+#: C/evolution.xml:1207(para)
 msgid "Click View &gt; Preview &gt; Classical View"
 msgstr "Wählen Sie Ansicht &gt; Vorschau &gt; Klassische Ansicht"
 
-#: C/evolution.xml:1221(title)
+#: C/evolution.xml:1213(title)
 msgid "Collapsible Message Headers"
 msgstr "Empfängerkopfzeilen verkleinern"
 
-#: C/evolution.xml:1222(para)
+#: C/evolution.xml:1214(para)
 msgid ""
 "Evolution compresses the TO, CC, BCC headers of received mail and shows only "
 "limited addresses. You can set the limit of the number of addresses to be "
@@ -3172,64 +3173,71 @@ msgstr ""
 "Nachrichtenvorschau angezeigt wird. Sie können die Anzahl der anzuzeigenden "
 "Adressen selbst bestimmen."
 
-#: C/evolution.xml:1224(para)
+#: C/evolution.xml:1216(para)
 msgid "Use the following procedure to set the limit of addresses to be displayed:"
 msgstr ""
 "Gehen Sie wie folgt vor, um die Anzahl der anzuzeigenden Adressen zu "
 "bestimmen:"
 
-#: C/evolution.xml:1227(para)
-msgid "Click Edit &gt; Preferences"
-msgstr "Klicken Sie auf Bearbeiten &gt; Einstellungen"
+#: C/evolution.xml:1219(para) C/evolution.xml:1877(para)
+#: C/evolution.xml:2204(para) C/evolution.xml:5028(para)
+#: C/evolution.xml:5222(para) C/evolution.xml:6333(para)
+msgid "Select Edit &gt; Preferences."
+msgstr "Klicken Sie auf Bearbeiten, dann Einstellungen,"
 
-#: C/evolution.xml:1230(para)
-msgid "Select Mail Preferences"
-msgstr "Wählen Sie E-Mail-Einstellungen"
+#: C/evolution.xml:1222(para)
+msgid "Select Mail Preferences."
+msgstr "Wählen Sie E-Mail-Einstellungen."
 
-#: C/evolution.xml:1233(para)
-msgid "Check “Shrink To/CC/Bcc headers to column” to limit the address"
+#: C/evolution.xml:1225(para)
+msgid ""
+"Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
+"address."
 msgstr ""
-"Wählen Sie &ldquo;Empfängerkopfzeilen (An/Kopie/Blindkopie) "
-"verkleinern&rdquo; um die Anzahl der angezeigten Adressen zu begrenzen."
+"Wählen Sie <guilabel>Empfängerkopfzeilen (An/Kopie/Blindkopie) verkleinern</"
+"guilabel> um die Anzahl der angezeigten Adressen zu begrenzen."
 
-#: C/evolution.xml:1236(para)
+#: C/evolution.xml:1228(para)
 msgid "Enter the limit in the field."
 msgstr "Geben Sie die Anzahl der anzuzeigenden Adressen in das Feld ein."
 
-#: C/evolution.xml:1239(para)
+#: C/evolution.xml:1231(para)
 msgid ""
-"You can expand the message headers by click the <inlinegraphic format=\"PNG"
-"\" fileref=\"figures/plus.png\"/> icon or the ’...’ in the message preview "
-"pane. To collapse click <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"minus.png\"/> icon in the preview pane."
+"You can expand the message headers by clicking the <inlinegraphic format="
+"\"PNG\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> "
+"in the message preview pane. To collapse click <inlinegraphic format=\"PNG\" "
+"fileref=\"figures/minus.png\"/> icon in the preview pane."
 msgstr ""
 "Um alle Adressen zu sehen, klicken Sie auf das <inlinegraphic format=\"PNG\" "
-"fileref=\"figures/plus.png\"/> Symbol oder auf &rsquo;...&rsquo; in der "
-"Nachrichtenvorschau. Um wieder zu verkleinern, klicken Sie auf das "
+"fileref=\"figures/plus.png\"/> Symbol oder auf <guilabel>...</guilabel> in "
+"der Nachrichtenvorschau. Um wieder zu verkleinern, klicken Sie auf das "
 "<inlinegraphic format=\"PNG\" fileref=\"figures/minus.png\"/> Symbol in der "
 "Nachrichtenvorschau."
 
-#: C/evolution.xml:1243(title)
+#: C/evolution.xml:1235(title)
 msgid "Sharing Mailboxes with Other Mail Programs"
 msgstr "Postfächer mit anderen E-Mail-Programmen zusammen benutzen"
 
-#: C/evolution.xml:1244(para)
+#: C/evolution.xml:1236(para)
 msgid ""
-"If you want to use Evolution and another e-mail client, such as Mutt, at the "
+"If you want to use Evolution and another email client, such as Mutt, at the "
 "same time, use the following procedure:"
 msgstr ""
 "Falls Sie Evolution und ein anderes E-Mail-Programm, zum Beispiel Mutt, "
 "gleichzeitig benutzen möchten, gehen Sie wie folgt vor:"
 
-#: C/evolution.xml:1247(para)
+#: C/evolution.xml:1239(para)
 msgid "Download your mail in the other application as you would normally."
 msgstr "Laden Sie Ihre E-Mails in der anderen Anwendung wie sonst auch herunter."
 
-#: C/evolution.xml:1250(para)
+#: C/evolution.xml:1242(para)
+msgid "In Evolution:"
+msgstr "In Evolution:"
+
+#: C/evolution.xml:1244(para)
 msgid ""
-"In Evolution, click Edit &gt; Preferences, then click Mail Accounts. Select "
-"the account you want to use to share mail and click Edit. Instead of Edit, "
-"you might want to create a new account just for this source of mail by "
+"Select the account you want to use to share mail and click Edit. Instead of "
+"Edit, you might want to create a new account just for this source of mail by "
 "clicking New."
 msgstr ""
 "Klicken Sie in Evolution auf Bearbeiten &gt; Einstellungen, dann auf E-Mail-"
@@ -3238,7 +3246,7 @@ msgstr ""
 "Sie ein neues Konto hierfür anlegen möchten, so klicken Sie auf Neu anstatt "
 "auf Bearbeiten."
 
-#: C/evolution.xml:1253(para)
+#: C/evolution.xml:1247(para)
 msgid ""
 "Under the Receiving Mail tab, select the type of mail file that your other "
 "mail application uses, then specify the full path to that location. A "
@@ -3250,7 +3258,7 @@ msgstr ""
 "Ort an. Eine übliche Auswahl hier sind zum Beispiel mbox-Dateien, mit dem "
 "Pfad /home/<varname>benutzername</varname>/Mail/."
 
-#: C/evolution.xml:1259(para)
+#: C/evolution.xml:1253(para)
 msgid ""
 "You can only use one mail client at a time. The mail files are locked by the "
 "mail program that is currently using them, so the mail files can't be "
@@ -3261,11 +3269,11 @@ msgstr ""
 "zugreift, daher kann ein anderes Programm nicht auf die E-Mail-Daten "
 "zugreifen."
 
-#: C/evolution.xml:1263(title)
+#: C/evolution.xml:1257(title)
 msgid "Working with Attachments and HTML Mail"
 msgstr "Mit Anhängen und HTML-E-Mails arbeiten"
 
-#: C/evolution.xml:1264(para)
+#: C/evolution.xml:1258(para)
 msgid ""
 "If someone sends you an <link linkend=\"attachment\">attachment</link>, "
 "Evolution displays a file icon at the end of the message to which it is "
@@ -3284,19 +3292,19 @@ msgstr ""
 "einen Anhang zu öffnen, klicken Sie doppelt mit der linken Maustaste auf "
 "diesen. Benutzen Sie den »Alle speichern«-Knopf um alle Anhänge zu speichern."
 
-#: C/evolution.xml:1267(title)
+#: C/evolution.xml:1261(title)
 msgid "Saving or Opening Attachments"
 msgstr "Speichern und Öffnen von Anhängen"
 
-#: C/evolution.xml:1268(para)
+#: C/evolution.xml:1262(para)
 msgid ""
-"If you get an e-mail message with an attachment, Evolution can help you save "
+"If you get an email message with an attachment, Evolution can help you save "
 "the attachment or open it with the appropriate applications."
 msgstr ""
 "Falls Sie eine E-Mail-Nachricht mit einem Anhang erhalten, so können Sie die "
 "Datei speichern oder mit einer geeigneten Anwendung öffnen."
 
-#: C/evolution.xml:1269(para)
+#: C/evolution.xml:1263(para)
 msgid ""
 "Evolution shows a right-arrow icon, the number of attachments, and a Save or "
 "Save All button to save all the attachments. Click the right-arrow icon to "
@@ -3307,41 +3315,36 @@ msgstr ""
 "speichern. Klicken Sie auf den Pfeil, um die Anlagenliste angezeigt zu "
 "bekommen."
 
-#: C/evolution.xml:1270(para)
+#: C/evolution.xml:1264(para)
 msgid "To save an attachment to disk:"
 msgstr "Um einen Anhang auf Festplatte zu speichern:"
 
-#: C/evolution.xml:1273(para)
+#: C/evolution.xml:1267(para) C/evolution.xml:1282(para)
 msgid ""
-"Click the down-arrow on the attachment icon, or right-click the attachment "
-"icon in the attachment bar, then click Save As."
+"Click the down-arrow on the attachment icon or right-click the attachment "
+"icon in the attachment bar."
 msgstr ""
 "Klicken Sie auf den nach unten zeigenden Pfeil auf dem Anhangsknopf, oder "
 "klicken Sie mit der rechten Maustaste auf das Anhangssymbol in der "
-"Anlagenleiste, und wählen Sie Speichern unter."
+"Anlagenleiste."
+
+#: C/evolution.xml:1270(para)
+msgid "Click Save As."
+msgstr "Klicken Sie auf »Speichern unter«."
 
-#: C/evolution.xml:1276(para)
+#: C/evolution.xml:1273(para)
 msgid "Select a location and name for the file."
 msgstr "Wählen Sie einen Ort und einen Namen für die Datei."
 
-#: C/evolution.xml:1282(para)
+#: C/evolution.xml:1279(para)
 msgid "To open an attachment using another application:"
 msgstr "Um den Anhang mit einer anderen Anwendung zu öffnen:"
 
 #: C/evolution.xml:1285(para)
-msgid ""
-"Click the down-arrow on the attachment icon or right-click the attachment "
-"icon in the attachment bar."
-msgstr ""
-"Klicken Sie auf den nach unten zeigenden Pfeil auf dem Anhangsknopf, oder "
-"klicken Sie mit der rechten Maustaste auf das Anhangssymbol in der "
-"Anlagenleiste."
-
-#: C/evolution.xml:1288(para)
 msgid "Select the application to open the attachment."
 msgstr "Wählen Sie die Anwendung aus, mit der Sie den Anhang öffnen möchten."
 
-#: C/evolution.xml:1294(para)
+#: C/evolution.xml:1291(para)
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications your system has installed. For example, "
@@ -3354,11 +3357,11 @@ msgstr ""
 "Textdateien in OpenOffice.org oder einer anderen Textverarbeitung geöffnet "
 "werden, und Archivdateien können mit dem Archivmanager geöffnet werden."
 
-#: C/evolution.xml:1298(title)
+#: C/evolution.xml:1295(title)
 msgid "Inline Images in HTML Mail"
 msgstr "Eingebettete Bilder in HTML-E-Mails"
 
-#: C/evolution.xml:1299(para)
+#: C/evolution.xml:1296(para)
 msgid ""
 "When someone sends you HTML mail that includes an image in the body of the "
 "message (for example, the welcome message in your Inbox), Evolution displays "
@@ -3373,13 +3376,13 @@ msgstr ""
 "benutzen. Sie können auch ein Bild per Maus (Drag and Drop) in das Textfeld "
 "des E-Mail-Editors ziehen."
 
-#: C/evolution.xml:1300(para)
+#: C/evolution.xml:1297(para)
 msgid ""
 "Some images are links in a message, rather than being part of the message. "
 "Evolution can download those images from the Internet, but does not do so "
-"unless you request it. This is because remotely Servered images can be slow "
+"unless you request it. This is because remotely servered images can be slow "
 "to load and display, and can even be used by spammers to track who reads the "
-"e-mail. Not automatically loading images helps protect your privacy."
+"email. Not automatically loading images helps protect your privacy."
 msgstr ""
 "Einige Bilder sind Verweise in einer Nachricht und nicht Teil der Nachricht "
 "selbst. Evolution kann diese Bilder aus dem Internet herunterladen, tut dies "
@@ -3389,27 +3392,28 @@ msgstr ""
 "Mail-Adresse existiert. Das nicht-automatische Laden von Bildern hilft "
 "Ihnen, Ihre Privatsphäre zu schützen."
 
-#: C/evolution.xml:1301(para)
+#: C/evolution.xml:1298(para)
 msgid "To load the images for one message:"
 msgstr "Um die Bilder in einer Nachricht zu laden:"
 
-#: C/evolution.xml:1304(para)
+#: C/evolution.xml:1301(para)
 msgid "Click View &gt; Load Images."
 msgstr "Klicken Sie auf Ansicht &gt; Bilder laden."
 
-#: C/evolution.xml:1307(para)
+#: C/evolution.xml:1304(para)
 msgid "To set the default action for loading images:"
 msgstr "Um die Vorgabeaktion für das Laden von Bildern zu bestimmen:"
 
-#: C/evolution.xml:1310(para)
-msgid "Click Edit &gt; Preferences, then click Mail Preferences."
-msgstr "Klicken Sie auf Bearbeiten &gt; Einstellungen, dann auf E-Mail-Einstellungen."
+#: C/evolution.xml:1307(para)
+msgid "Select Edit &gt; Preferences, then select Mail Preferences."
+msgstr ""
+"Klicken Sie auf Bearbeiten &gt; Einstellungen, dann auf E-Mail-Einstellungen."
 
-#: C/evolution.xml:1313(para)
+#: C/evolution.xml:1310(para)
 msgid "Click the HTML Mail tab."
 msgstr "Klicken Sie auf den HTML-E-Mail-Reiter."
 
-#: C/evolution.xml:1316(para)
+#: C/evolution.xml:1313(para)
 msgid ""
 "Select one of the items: Never Load Images Off the Net, Load Images in Mail "
 "From Contacts, or Always Load Images Off the Net."
@@ -3417,27 +3421,28 @@ msgstr ""
 "Wählen Sie eine Option aus: Bilder nie aus dem Internet laden, Bilder in "
 "Nachrichten von Kontakten laden, oder Bilder immer aus dem Internet laden."
 
-#: C/evolution.xml:1319(para) C/evolution.xml:1367(para)
-#: C/evolution.xml:1790(para) C/evolution.xml:1824(para)
-#: C/evolution.xml:1847(para) C/evolution.xml:2133(para)
-#: C/evolution.xml:2171(para) C/evolution.xml:2202(para)
-#: C/evolution.xml:2231(para)
+#: C/evolution.xml:1316(para) C/evolution.xml:1364(para)
+#: C/evolution.xml:1555(para) C/evolution.xml:1790(para)
+#: C/evolution.xml:1824(para) C/evolution.xml:1847(para)
+#: C/evolution.xml:2143(para) C/evolution.xml:2182(para)
+#: C/evolution.xml:2216(para) C/evolution.xml:2248(para)
+#: C/evolution.xml:5686(para) C/evolution.xml:6064(para)
 msgid "Click Close."
 msgstr "Klicken Sie auf Schließen"
 
-#: C/evolution.xml:1322(para)
+#: C/evolution.xml:1319(para)
 msgid "To set your proxy in KDE:"
 msgstr "Um die Proxy-Einstellungen in KDE vorzunehmen:"
 
-#: C/evolution.xml:1325(para)
+#: C/evolution.xml:1322(para)
 msgid "Click the menu icon &gt; System &gt; Configuration &gt; Yast."
 msgstr "Klicken Sie auf das Menü-Symbol &gt; System %gt; Konfiguration %gt; Yast."
 
-#: C/evolution.xml:1328(para) C/evolution.xml:1343(para)
+#: C/evolution.xml:1325(para) C/evolution.xml:1340(para)
 msgid "Click Network Services, then click Proxy."
 msgstr "Klicken Sie auf Netzwerk-Dienste und dann auf Proxy."
 
-#: C/evolution.xml:1331(para) C/evolution.xml:1346(para)
+#: C/evolution.xml:1328(para) C/evolution.xml:1343(para)
 msgid ""
 "Specify your proxy settings (if you don't know your proxy settings, contact "
 "your ISP or system administrator)."
@@ -3445,15 +3450,15 @@ msgstr ""
 "Geben Sie Ihre Proxy-Einstellungen ein (falls Sie diese nicht wissen, so "
 "fragen Sie Ihren Internet-Dienst (ISP) oder Ihren System-Administrator."
 
-#: C/evolution.xml:1334(para) C/evolution.xml:1349(para)
+#: C/evolution.xml:1331(para) C/evolution.xml:1346(para)
 msgid "Click Finish, then click Close."
 msgstr "Klicken Sie auf Beenden, und dann auf Schließen."
 
-#: C/evolution.xml:1337(para)
+#: C/evolution.xml:1334(para)
 msgid "To set your proxy in GNOME:"
 msgstr "Um die Proxy-Einstellungen in GNOME vorzunehmen:"
 
-#: C/evolution.xml:1340(para)
+#: C/evolution.xml:1337(para)
 msgid ""
 "Click System &gt; Administrative Settings (enter your root password if "
 "needed)."
@@ -3461,17 +3466,17 @@ msgstr ""
 "Klicken Sie auf System &gt; Administrationeinstellungen (geben Sie das Root-"
 "Passwort ein, falls benötigt)."
 
-#: C/evolution.xml:1356(title)
+#: C/evolution.xml:1353(title)
 msgid "Using Evolution for News"
 msgstr "Evolution für Newsgroups benutzen"
 
-#: C/evolution.xml:1357(para)
+#: C/evolution.xml:1354(para)
 msgid ""
 "USENET newsgroups are similar to mail, so it is often convenient to read "
 "news and mail side by side. You can add a news source, called an NNTP "
-"server, the same way you would add <link linkend=\"bse54o0\">new e-mail "
-"account</link>, selecting USENET News as the source type. The news server "
-"appear as a remote mail server, and each news group works like an IMAP "
+"server, the same way you would add <link linkend=\"bse54o0\">new email "
+"account</link>, selecting USENET News as the Server type. The news server "
+"appear as a remote mail server, and each newsgroup works like an IMAP "
 "folder. When you click Send/Receive, Evolution also checks for news messages."
 msgstr ""
 "USENET-Newsgroups sind ähnlich wie E-Mail, daher ist es oftmals angenehm, "
@@ -3482,19 +3487,19 @@ msgstr ""
 "funktioniert wie ein IMAP-Ordner. Wenn Sie auf Verschicken/Abrufen klicken, "
 "so sucht Evolution auch nach neuen Nachrichten in Newsgroups."
 
-#: C/evolution.xml:1358(para)
+#: C/evolution.xml:1355(para)
 msgid ""
-"When you create a news group account, you are not subscribed to any groups. "
-"To subscribe to a news group:"
+"When you create a newsgroup account, you are not subscribed to any groups. "
+"To subscribe to a newsgroup:"
 msgstr ""
 "Wenn Sie ein USENET-News-Konto erstellen, haben Sie noch keine Newsgroups "
 "abonniert. Um Newsgroups zu abonnieren:"
 
-#: C/evolution.xml:1361(para) C/evolution.xml:5276(para)
+#: C/evolution.xml:1358(para) C/evolution.xml:5296(para)
 msgid "Click Folder &gt; Subscriptions."
 msgstr "Klicken Sie auf Ordner &gt; Abonnements."
 
-#: C/evolution.xml:1364(para)
+#: C/evolution.xml:1361(para)
 msgid ""
 "Select your NNTP account, select the groups you want to subscribe to, then "
 "click Subscribe."
@@ -3502,11 +3507,11 @@ msgstr ""
 "Wählen Sie Ihr NNTP-Konto aus, wählen Sie die Newsgroups aus, die Sie "
 "abonnieren möchten, und klicken Sie auf Abonnieren."
 
-#: C/evolution.xml:1373(title)
+#: C/evolution.xml:1370(title)
 msgid "Deleting Mail"
 msgstr "E-Mails löschen"
 
-#: C/evolution.xml:1374(para)
+#: C/evolution.xml:1371(para)
 msgid ""
 "Evolution allows you to delete unwanted messages. To delete a message, "
 "select it and press the Delete key, or click the delete tool in the toolbar, "
@@ -3518,10 +3523,10 @@ msgstr ""
 "Steuerung+D, oder klicken Sie mit der rechten Maustaste auf eine Nachricht "
 "und wählen Sie dann Löschen aus."
 
-#: C/evolution.xml:1375(para)
+#: C/evolution.xml:1372(para)
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
-"deleted, but is marked for deletion. Your e-mail is recoverable until you "
+"deleted, but is marked for deletion. Your email is recoverable until you "
 "have expunged your mail. When you expunge a folder, you remove all the mail "
 "that you have marked for deletion.To show deleted messages, uncheck Hide "
 "Deleted Messages option from the View menu. You can view the messages "
@@ -3539,7 +3544,7 @@ msgstr ""
 "markiert sind, in der E-Mail-Liste als durchgestrichen dargestellt. Sie "
 "können als gelöscht markierte E-Mails auch im Müllordner finden."
 
-#: C/evolution.xml:1376(para)
+#: C/evolution.xml:1373(para)
 msgid ""
 "To permanently erase all the deleted messages in a folder, click Folder &gt; "
 "Expunge or press Ctrl+E."
@@ -3548,11 +3553,11 @@ msgstr ""
 "löschen, wählen Sie Ordner &gt; Säubern in der Menüleiste, oder drücken Sie "
 "Steuerung+E."
 
-#: C/evolution.xml:1377(para)
+#: C/evolution.xml:1374(para)
 msgid ""
 "Trash folders in GroupWise, local and IMAP accounts are actually virtual "
 "search folders that display all messages you have marked for later deletion. "
-"Hence, emptying Trash is nothing but expunging deleted mails from all your "
+"Hence, emptying Trash is nothing but expunging deleted mail from all your "
 "folders in the account."
 msgstr ""
 "Müllordner in Groupwise-, lokalen und IMAP-Konten sind virtuelle Suchordner, "
@@ -3560,7 +3565,7 @@ msgstr ""
 "gelöscht markiert sind. Daher ist das Leeren des Müllordners nichts anderes "
 "als das Säubern aller Ordner in Ihrem Konto."
 
-#: C/evolution.xml:1378(para)
+#: C/evolution.xml:1375(para)
 msgid ""
 "However, this is not true for the Trash folder on Exchange servers, which "
 "behaves just the same as it does in Outlook. It is a normal folder with "
@@ -3573,14 +3578,15 @@ msgstr ""
 "siehe <link linkend=\"usage-mail-organize-vfolders\">Suchordner benutzen</"
 "link>."
 
-#: C/evolution.xml:1382(title)
+#: C/evolution.xml:1379(title)
 msgid "Undeleting Messages"
 msgstr "Gelöschte Nachrichten wiederherstellen"
 
-#: C/evolution.xml:1383(para)
+#: C/evolution.xml:1380(para)
 msgid ""
 "You can undelete a message that has been deleted but not expunged. To "
-"undelete a message, select the message, click Edit &gt; Undelete."
+"undelete a message, select the message, click Edit &gt; Undelete. Note that "
+"View &gt; Hide Deleted messages in the menubar must be disabled for this."
 msgstr ""
 "Sie das Löschen einer Nachricht rückgängig machen, wenn der Ordner noch "
 "nicht gesäubert wurde (bzw. der Müllordner noch nicht geleert wurde). Um das "
@@ -3589,7 +3595,7 @@ msgstr ""
 "Gegebenenfalls müssen Sie zunächst in der Menüleiste die Einstellung Ansicht "
 "&gt; Gelöschte Nachrichten verbergen deaktivieren."
 
-#: C/evolution.xml:1384(para)
+#: C/evolution.xml:1381(para)
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is removed from the Trash folder."
@@ -3598,9 +3604,9 @@ msgstr ""
 "Machen diese Markierung, und die Nachricht wird nicht mehr im Müllordner "
 "angezeigt."
 
-#: C/evolution.xml:1390(para)
+#: C/evolution.xml:1387(para)
 msgid ""
-"You can start writing a new e-mail message by clicking File &gt; New &gt; "
+"You can start writing a new email message by clicking File &gt; New &gt; "
 "Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking "
 "New in the toolbar."
 msgstr ""
@@ -3608,11 +3614,11 @@ msgstr ""
 "Neu &gt; E-Mail-Nachricht klicken, Steuerung+N im E-Mail-Fenster drücken, "
 "oder den Neu-Knopf in der Werkzeugleiste drücken."
 
-#: C/evolution.xml:1391(para)
+#: C/evolution.xml:1388(para)
 msgid ""
 "Enter an address in the To field. If you want to enter multiple email "
-"addresses, type in the addresses separated by comma. You can also use "
-"contact list to send messages to multiple recipients.Enter a subject in the "
+"addresses, type in the addresses separated by comma. You can also use a "
+"contact list to send messages to multiple recipients. Enter a subject in the "
 "Subject field, and a message in the box at the bottom of the window. After "
 "you have written your message, click Send."
 msgstr ""
@@ -3624,63 +3630,63 @@ msgstr ""
 "Nachricht geschrieben haben klicken Sie auf den Abschicken-Knopf in der "
 "Werkzeugleiste."
 
-#: C/evolution.xml:1392(para)
+#: C/evolution.xml:1389(para)
 msgid "New mail message window look like this:"
 msgstr "Das E-Mail-Editor-Fenster sieht so aus:"
 
-#: C/evolution.xml:1394(para) C/evolution.xml:5937(para)
+#: C/evolution.xml:1391(para) C/evolution.xml:5944(para)
 msgid "This section contains the following topics:"
 msgstr "Diese Kapitel beiinhaltet die folgenden Themen:"
 
-#: C/evolution.xml:1397(link) C/evolution.xml:1435(title)
+#: C/evolution.xml:1394(link) C/evolution.xml:1432(title)
 msgid "Unicode, ASCII, and Non-Latin Alphabets"
 msgstr "Unicode, ASCII und Nicht-lateinische Alphabete"
 
-#: C/evolution.xml:1400(link) C/evolution.xml:1447(title)
+#: C/evolution.xml:1397(link) C/evolution.xml:1444(title)
 msgid "Sending Composed Messages Later"
 msgstr "Geschriebene Nachrichten zu einem späteren zeitpunkt senden"
 
-#: C/evolution.xml:1403(link) C/evolution.xml:1463(title)
+#: C/evolution.xml:1400(link) C/evolution.xml:1460(title)
 msgid "Working Offline"
 msgstr "Offline arbeiten"
 
-#: C/evolution.xml:1406(link) C/evolution.xml:1516(title)
+#: C/evolution.xml:1403(link) C/evolution.xml:1513(title)
 msgid "Attachments"
 msgstr "Anlagen"
 
-#: C/evolution.xml:1409(link) C/evolution.xml:1560(title)
-msgid "Specifying Additional Recipients for E-Mail"
+#: C/evolution.xml:1406(link) C/evolution.xml:1560(title)
+msgid "Specifying Additional Recipients for Email"
 msgstr "Weitere Empfänger zu einer E-Mail hinzufügen"
 
-#: C/evolution.xml:1412(link) C/evolution.xml:1585(title)
+#: C/evolution.xml:1409(link) C/evolution.xml:1585(title)
 msgid "Choosing Recipients Quickly"
 msgstr "Empfänger schneller auswählen"
 
-#: C/evolution.xml:1415(link) C/evolution.xml:1593(title)
-msgid "Replying to E-Mail Messages"
+#: C/evolution.xml:1412(link) C/evolution.xml:1593(title)
+msgid "Replying to Email Messages"
 msgstr "Auf E-Mail-Nachrichten antworten"
 
-#: C/evolution.xml:1418(link) C/evolution.xml:1659(title)
+#: C/evolution.xml:1415(link) C/evolution.xml:1659(title)
 msgid "Searching and Replacing with the Composer"
 msgstr "Suchen und Ersetzen im E-Mail-Editor"
 
-#: C/evolution.xml:1421(link) C/evolution.xml:1681(title)
-msgid "Enhancing Your E-Mail with HTML"
+#: C/evolution.xml:1418(link) C/evolution.xml:1681(title)
+msgid "Enhancing Your Email with HTML"
 msgstr "HTML-Funktionen für E-Mails benutzen"
 
-#: C/evolution.xml:1424(link) C/evolution.xml:1855(title)
+#: C/evolution.xml:1421(link) C/evolution.xml:1855(title)
 msgid "Mail Send Options"
 msgstr "E-Mail-Versandoptionen"
 
-#: C/evolution.xml:1427(link) C/evolution.xml:1933(title)
+#: C/evolution.xml:1424(link) C/evolution.xml:1933(title)
 msgid "Forwarding Mail"
 msgstr "Weiterleiten von E-Mails"
 
-#: C/evolution.xml:1430(link) C/evolution.xml:1953(title)
-msgid "Tips for E-Mail Courtesy"
+#: C/evolution.xml:1427(link) C/evolution.xml:1954(title)
+msgid "Tips for Email Courtesy"
 msgstr "Tipps zur Höflichkeit beim E-Mail-Versenden"
 
-#: C/evolution.xml:1436(para)
+#: C/evolution.xml:1433(para)
 msgid ""
 "If you want to write in a non-Latin alphabet while using a Latin keyboard, "
 "try selecting a different input method in the message composer. Right-click "
@@ -3688,8 +3694,9 @@ msgid ""
 "Methods menu, then begin typing. The actual keys vary by language and input "
 "style. For example, the Cyrillic input method uses transliterated Latin "
 "keyboard combinations to get the Cyrillic alphabet, combining letters where "
-"necessary. “Zh” and “ya” produce the appropriate single Cyrillic letters, "
-"and the single-quote (‘) produces a soft sign character."
+"necessary. <quote>Zh</quote> and <quote>ya</quote> produce the appropriate "
+"single Cyrillic letters, and the single-quote (') produces a soft sign "
+"character."
 msgstr ""
 "Wenn Sie in einem nicht-lateinische Alphabet mit Ihrer lateinischen Tastatur "
 "schreiben möchten, so wählen Sie eine andere Eingabemethode im E-Mail-"
@@ -3698,11 +3705,11 @@ msgstr ""
 "können Sie schreiben. Die jeweiligen Tasten variieren je nach Sprache und "
 "Eingabemethode; so nutzt die kyrillische Eingabemethode transliterierte "
 "Tastenkombinationen um das gesamte kyrillische Alphabet zu erzeugen, weshalb "
-"das Kombinieren von Buchstaben nötig ist. &ldquo;Zh&rdquo; und &ldquo;"
-"ya&rdquo; erzeugen die jeweiligen kyrillischen Buchstaben, und ein einfaches "
-"Anführungszeichen (&lsquo;) erzeugt das Weichheitszeichen."
+"das Kombinieren von Buchstaben nötig ist. <quote>Zh</quote> und <quote>ya</"
+"quote> erzeugen die jeweiligen kyrillischen Buchstaben, und ein einfaches "
+"Anführungszeichen (') erzeugt das Weichheitszeichen."
 
-#: C/evolution.xml:1437(para)
+#: C/evolution.xml:1434(para)
 msgid ""
 "For greater language display capabilities, click Edit &gt; Preferences, then "
 "select the character set choices in the Mail Preferences and Composer "
@@ -3716,11 +3723,11 @@ msgstr ""
 "sicher sind, so wählen Sie UTF-8, da dies den größten Umfang an Zeichen und "
 "daher auch den größten Umfang an Sprachen gewährt."
 
-#: C/evolution.xml:1440(title)
+#: C/evolution.xml:1437(title)
 msgid "Using Character Sets"
 msgstr "Zeichenkodierungen benutzen"
 
-#: C/evolution.xml:1441(para)
+#: C/evolution.xml:1438(para)
 msgid ""
 "A character set is a computer's version of an alphabet. In the past, the "
 "ASCII character set was used almost universally. However, it contains only "
@@ -3743,18 +3750,17 @@ msgstr ""
 "UTF-8 Unicode*-Zeichensatz, der einen einzigen und kompatiblen Zeichensatz "
 "für alle benötigten Buchstaben darstellt."
 
-#: C/evolution.xml:1442(para)
-msgid ""
-"Most e-mail messages state in advance which character set they use, so "
-"Evolution usually knows what to display for a given binary number. However, "
-"if you find that messages are displayed as rows of incomprehensible "
-"characters, try selecting a different character set in the mail settings "
-"screen. If your recipients can't read your messages, try selecting a "
-"different character set in the composer options dialog box. For some "
-"languages, such as Turkish or Korean, it might work best for you to select "
-"the language-specific character set. However, the best choice for most users "
-"is UTF-8, which offers the widest range of characters for the widest range "
-"of languages."
+#: C/evolution.xml:1439(para)
+msgid ""
+"Most email messages state in advance which character set they use, so "
+"Evolution usually can display those messages correctly. However, if you find "
+"that messages are displayed as rows of incomprehensible characters, try "
+"selecting a different character set in the mail settings screen. If your "
+"recipients can't read your messages, try selecting a different character set "
+"in the composer options dialog box. For some languages, such as Turkish or "
+"Korean, it might work best for you to select the language-specific character "
+"set. However, the best choice for most users is UTF-8, which offers the "
+"widest range of characters for the widest range of languages."
 msgstr ""
 "Die meisten E-Mail-Nachrichten deklarieren, welchen Zeichensatz sie "
 "benutzen, Evolution kann in diesem Falle die Nachricht korrekt darstellen. "
@@ -3768,7 +3774,7 @@ msgstr ""
 "größten Umfang an Zeichen und daher auch den größten Umfang an Sprachen "
 "gewährt."
 
-#: C/evolution.xml:1448(para)
+#: C/evolution.xml:1445(para)
 msgid ""
 "Evolution normally sends mail as soon as you click Send. However, can save a "
 "message to be sent later:"
@@ -3776,7 +3782,7 @@ msgstr ""
 "Evolution sendet Nachrichten normalerweise sofort, nachdem auf Abschicken "
 "geklickt wurde. Sie können Nachrichten allerdings auch später senden:"
 
-#: C/evolution.xml:1451(para)
+#: C/evolution.xml:1448(para)
 msgid ""
 "If you are offline when you click Send, Evolution adds your message to the "
 "Outbox queue. The next time you connect to the Internet and send or receive "
@@ -3787,7 +3793,7 @@ msgstr ""
 "mit dem Internet verbinden und E-Mails verschicken und empfangen, so wird "
 "die Nachricht gesendet."
 
-#: C/evolution.xml:1454(para)
+#: C/evolution.xml:1451(para)
 msgid ""
 "Click File &gt; Save Draft to store your messages in the drafts folder for "
 "later revision."
@@ -3795,7 +3801,7 @@ msgstr ""
 "Klicken Sie auf Datei &gt; Entwurf speichern um Nachrichten im Entwurf-"
 "Ordner für eine spätere Weiterbearbeitung zu speichern."
 
-#: C/evolution.xml:1457(para)
+#: C/evolution.xml:1454(para)
 msgid ""
 "If you prefer to save your message as a text file, click File &gt; Save As, "
 "then specify a filename."
@@ -3803,22 +3809,22 @@ msgstr ""
 "Falls Sie das Speichern von Nachricht als Textdatei bevorzugen, so wählen "
 "Sie Datei &gt; Speichern unter und geben Sie einen Dateinamen ein."
 
-#: C/evolution.xml:1464(para)
+#: C/evolution.xml:1461(para)
 msgid ""
-"Offline mode help you communicate with remote mail storage systems like "
-"GroupWise®, IMAP or Exchange, in situations where you are not connected to "
-"the network at all times. Evolution keeps a local copy of one or more "
-"folders to allow you to compose messages, storing them in your Outbox to be "
-"sent the next time you connect."
+"Offline mode helps you communicate with remote mail storage systems like "
+"<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
+"situations where you are not connected to the network at all times. "
+"Evolution keeps a local copy of one or more folders to allow you to compose "
+"messages, storing them in your Outbox to be sent the next time you connect."
 msgstr ""
-"Der Offline-Modus hilft Ihnen, mit entfernten Mail-Systemen wie "
-"GroupWise&reg;, IMAP oder Exchange ohne durchgehende Verbindung zum Netzwerk "
-"zu arbeiten. Evolution hält eine lokale Kopie von einem oder mehreren Ordner "
-"vorrätig, damit Sie Nachrichten schreiben und im Ausgangsordner speichern "
-"können, so dass diese bei der nächsten Verbindung mit einem Netzwerk "
-"verschickt werden können."
+"Der Offline-Modus hilft Ihnen, mit entfernten Mail-Systemen wie <trademark "
+"class=\"registered\">GroupWise</trademark>, IMAP oder Exchange ohne "
+"durchgehende Verbindung zum Netzwerk zu arbeiten. Evolution hält eine lokale "
+"Kopie von einem oder mehreren Ordner vorrätig, damit Sie Nachrichten "
+"schreiben und im Ausgangsordner speichern können, so dass diese bei der "
+"nächsten Verbindung mit einem Netzwerk verschickt werden können."
 
-#: C/evolution.xml:1465(para)
+#: C/evolution.xml:1462(para)
 msgid ""
 "POP mail downloads all messages to your local system, but other connections "
 "usually download just the headers, and get the rest only when you want to "
@@ -3831,23 +3837,23 @@ msgstr ""
 "offline gehen lädt Evolution die ungelesenen Nachrichten aus den Ordnern "
 "herunter, die Sie zur Speicherung ausgewählt haben."
 
-#: C/evolution.xml:1466(para)
+#: C/evolution.xml:1463(para)
 msgid "To mark a folder for offline use,"
 msgstr "Um einen Ordner für die Offline-Nutzung zu markieren,"
 
-#: C/evolution.xml:1469(para)
+#: C/evolution.xml:1466(para)
 msgid "Right-click the folder, then click Properties."
 msgstr ""
 "Klicken Sie mit der rechten Maustaste auf den Ordner, und wählen Sie "
 "Eigenschaften."
 
-#: C/evolution.xml:1472(para)
+#: C/evolution.xml:1469(para)
 msgid "Click Copy Folder Content Locally for Offline Operation."
 msgstr ""
 "Klicken Sie auf »Den Ordnerinhalt lokal zum Arbeiten im Offline-Modus "
 "kopieren«."
 
-#: C/evolution.xml:1475(para)
+#: C/evolution.xml:1472(para)
 msgid ""
 "Your connection status is shown by the small icon in the lower left border "
 "of the Evolution main window. When you are online, it displays two connected "
@@ -3858,13 +3864,13 @@ msgstr ""
 "verbundene Kabel angezeigt. Wenn Sie offline gehen, werden die beiden Kabel "
 "getrennt."
 
-#: C/evolution.xml:1476(para)
+#: C/evolution.xml:1473(para)
 msgid "To cache your selected folders and disconnect from the network,"
 msgstr ""
 "Um die ausgewählten Ordner lokal verfügbar zu machen und danach die "
 "Netzwerkverbindung zu beenden,"
 
-#: C/evolution.xml:1479(para)
+#: C/evolution.xml:1476(para)
 msgid ""
 "Click File &gt; Work Offline, or click the connection status icon in the "
 "lower left of the screen."
@@ -3872,7 +3878,7 @@ msgstr ""
 "Klicken Sie auf Datei &gt; Offline arbeiten, oder klicken Sie auf das kleine "
 "Verbindungsstatus-Symbol unten links."
 
-#: C/evolution.xml:1480(para)
+#: C/evolution.xml:1477(para)
 msgid ""
 "A message pop-ups and asks you whether you want to go offline immediately or "
 "cache before you go offline."
@@ -3881,7 +3887,7 @@ msgstr ""
 "Ordnerinhalte zunächst lokal verfügbar gemacht werden sollen bevor Sie "
 "offline gehen."
 
-#: C/evolution.xml:1485(para)
+#: C/evolution.xml:1482(para)
 msgid ""
 "Click Synchronize to download all the messages to the folders marked for "
 "offline."
@@ -3889,11 +3895,11 @@ msgstr ""
 "Klicken Sie auf »Synchronisieren« um die Nachrichten in den Ordnern "
 "herunterzuladen, die für den Offline-Modus markiert wurden."
 
-#: C/evolution.xml:1486(para) C/evolution.xml:3680(para)
+#: C/evolution.xml:1483(para) C/evolution.xml:3696(para)
 msgid "Or"
 msgstr "Oder"
 
-#: C/evolution.xml:1487(para)
+#: C/evolution.xml:1484(para)
 msgid ""
 "Click Do not synchronize to go offline immediately, without downloading the "
 "messages locally for offline operations."
@@ -3901,7 +3907,7 @@ msgstr ""
 "Klicken Sie »Nicht synchronisieren« falls Sie sofort offline gehen möchten, "
 "ohne zuvor die Nachrichten für die Offline-Nutzung herunterzuladen."
 
-#: C/evolution.xml:1488(para)
+#: C/evolution.xml:1485(para)
 msgid ""
 "Select Do not show this message again to switch off this popup. The default "
 "is to not synchronize while going offline."
@@ -3910,21 +3916,21 @@ msgstr ""
 "Zukunft nicht mehr angezeigt wird. Die Vorgabe-Einstellung ist es, beim "
 "Offline-Gehen nicht zu synchronisieren."
 
-#: C/evolution.xml:1491(para)
+#: C/evolution.xml:1488(para)
 msgid "When you want to reconnect,"
 msgstr "Falls Sie sich wiederverbinden möchten,"
 
-#: C/evolution.xml:1494(para)
+#: C/evolution.xml:1491(para)
 msgid "Click File &gt; Work Online, or click the connection status icon again."
 msgstr ""
 "Klicken Sie auf Datei &gt; Online arbeiten, oder klicken Sie nochmals auf "
 "das kleine Verbindungsstatus-Symbol unten links."
 
-#: C/evolution.xml:1499(title)
+#: C/evolution.xml:1496(title)
 msgid "Download Messages for Offline Operations"
 msgstr "Nachrichten für den Offline-Modus herunterladen"
 
-#: C/evolution.xml:1500(para)
+#: C/evolution.xml:1497(para)
 msgid ""
 "This features prepares you for going offline and for offline operations. It "
 "helps you download all the messages locally before you go offline. If "
@@ -3935,19 +3941,19 @@ msgstr ""
 "Nachrichten lokal kopiert bevor Sie offline gehen. Standardmäßig werden "
 "diese Nachrichten nicht heruntergeladen, wenn Sie offline gehen."
 
-#: C/evolution.xml:1501(para)
+#: C/evolution.xml:1498(para)
 msgid "To download messages for offline operations,"
 msgstr "Um Nachrichten zur Offline-Nutzung herunterzuladen,"
 
-#: C/evolution.xml:1504(para)
+#: C/evolution.xml:1501(para)
 msgid "Select File &gt; Download messages for offline."
 msgstr "Wählen Sie Datei &gt; Nachrichten für Offline-Modus herunterladen."
 
-#: C/evolution.xml:1510(title)
+#: C/evolution.xml:1507(title)
 msgid "Automatic Network State Handling"
 msgstr "Automatische Erkennung des Verbindungsstatus"
 
-#: C/evolution.xml:1511(para)
+#: C/evolution.xml:1508(para)
 msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
@@ -3960,23 +3966,24 @@ msgstr ""
 "Netzwerk wieder verfügbar ist. Stellen Sie sicher, dass die Anwendung "
 "Network Manager installiert ist, damit diese Funktion funktioniert."
 
-#: C/evolution.xml:1517(para)
-msgid "To attach a file to your e-mail:"
+#: C/evolution.xml:1514(para)
+msgid "To attach a file to your email:"
 msgstr "Um einer E-mail eine Datei beizulegen:"
 
-#: C/evolution.xml:1520(para)
+#: C/evolution.xml:1517(para)
 msgid "Click the Attach icon in the composer toolbar."
-msgstr "Klicken Sie auf den Beilegen-Knopf in der Werkzeugleiste des E-Mail-Editors."
+msgstr ""
+"Klicken Sie auf den Beilegen-Knopf in der Werkzeugleiste des E-Mail-Editors."
 
-#: C/evolution.xml:1523(para)
+#: C/evolution.xml:1520(para)
 msgid "Select the file you want to attach."
 msgstr "Wählen Sie die anzufügende Datei aus."
 
-#: C/evolution.xml:1529(para)
+#: C/evolution.xml:1526(para)
 msgid ""
-"You can also drag a file into the composer window. If you want to send it as "
-"an inline attachment, right-click the attachment and click Properties, then "
-"select Automatic Display of Attachments."
+"You can also drag a file to the attachment bar of the composer window. If "
+"you want to send it as an inline attachment, right-click the attachment and "
+"click Properties, then select Automatic Display of Attachments."
 msgstr ""
 "Sie können auch die Datei mit der Maus in die Anlagenleiste im unteren Teil "
 "des Editorfensters ziehen. Falls Sie eine Datei als sofort-dargestellte "
@@ -3984,7 +3991,7 @@ msgstr ""
 "Anlage, wählen Sie Eigenschaften, und wählen Sie Automatische Anzeige der "
 "Anlage vorschlagen aus."
 
-#: C/evolution.xml:1530(para)
+#: C/evolution.xml:1527(para)
 msgid ""
 "When you send the message, a copy of the attached file goes with it. Be "
 "aware that large attachments can take a long time to send and receive."
@@ -3993,72 +4000,88 @@ msgstr ""
 "Datei mitverschickt. Seien Sie sich darüber bewußt, dass große Anhänge eine "
 "längere Zeit zum Senden und Empfangen benötigen."
 
-#: C/evolution.xml:1533(title)
+#: C/evolution.xml:1530(title)
 msgid "Attachment Reminder:"
 msgstr "Anlagenerinnerung:"
 
-#: C/evolution.xml:1534(para)
+#: C/evolution.xml:1531(para)
 msgid ""
-"With Attachment plugin enabled, Evolution reminds you to attach a file to "
-"your email if it appears that you have not. If it finds that you have missed "
-"to attach a file, a message is displayed as shown below:"
+"Evolution has an Attachment Reminder plugin you can use to remind yourself "
+"to attach a file to an email. If it determines that you have not attached "
+"the file, it displays the following message:"
 msgstr ""
 "Falls das Anlagenerinnerung-Plugin aktiviert ist, so erinnert Evolution Sie "
 "daran, eine Dateianlage zu der E-Mail hinzuzufügen, die Sie verschicken "
 "möchten, falls es scheint als ob Sie das Hinzufügen vergessen haben. Hierzu "
 "wird folgende Nachricht angezeigt:"
 
-#: C/evolution.xml:1538(para)
+#: C/evolution.xml:1535(para)
 msgid ""
-"Click Continue Editing to attach the missing file you are reminded of, or "
-"click Send to send the message without any attachment."
+"Click Continue Editing to attach the missing file, or click Send to send the "
+"message without any attachment."
 msgstr ""
-"Klicken Sie auf »Nachricht bearbeiten« um die fehlende Datei hinzuzufügen, oder "
-"klicken Sie auf »Abschicken« um die Nachricht ohne Dateianlagen zu "
+"Klicken Sie auf »Nachricht bearbeiten« um die fehlende Datei hinzuzufügen, "
+"oder klicken Sie auf »Abschicken« um die Nachricht ohne Dateianlagen zu "
 "verschicken."
 
-#: C/evolution.xml:1541(para)
-msgid "To enable the Attachment Reminder,"
-msgstr "Um die Anlagenerinnerung zu aktivieren,"
+#: C/evolution.xml:1538(para)
+msgid "To enable the Attachment Reminder:"
+msgstr "Um die Anlagenerinnerung zu aktivieren:"
 
-#: C/evolution.xml:1544(para)
+#: C/evolution.xml:1541(para)
 msgid "Select Edit &gt; Plugins &gt; Attachment Reminder."
 msgstr "Wählen Sie Bearbeiten &gt; Plugins &gt; Anlagenerinnerung."
 
-#: C/evolution.xml:1547(para)
-msgid "Click Configure to add the keywords."
-msgstr "Klicken Sie auf »Konfigurieren«, um Schlüsselwörter hinzuzufügen."
+#: C/evolution.xml:1544(para)
+msgid ""
+"Click Configuration, then make sure that Remind Missing Attachments is "
+"selected."
+msgstr ""
+"Wählen Sie den Reiter »Konfiguration« und stellen Sie sicher, dass »An "
+"vergessene Anlagen erinnern« aktiviert ist."
 
-#: C/evolution.xml:1552(para)
-msgid "Click Add to add keywords such as “Attach” or “Attachment”."
+#: C/evolution.xml:1548(para)
+msgid ""
+"Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> "
+"and click Add."
 msgstr ""
-"Klicken Sie auf »Hinzufügen«, um Schlüsselwörter wie &ldquo;Anlage&ldquo;, "
-"&ldquo;Anhang&ldquo; oder &ldquo;mitgeschickt&ldquo; hinzuzufügen."
+"Klicken Sie auf »Hinzufügen«, um Schlüsselwörter wie <quote>Anhang</quote> "
+"oder <quote>beigelegt</quote> hinzuzufügen."
 
-#: C/evolution.xml:1553(para)
+#: C/evolution.xml:1549(para)
 msgid ""
-"Based on the keywords you have added here, it searches every email you are "
-"sending. If it finds the keywords such as “attach” in your e-mail and no "
-"actual attached file, you are reminded of missing attachments."
+"Based on the keywords you have added here, it searches every mail you are "
+"sending. If it finds the keywords such as <quote>attach</quote> in your mail "
+"and there is no actual attached file, you are reminded of missing "
+"attachments."
 msgstr ""
 "Evolution durchsucht nun jede E-Mail, die Sie verschicken wollen, nach den "
 "hier aufgelisteten Schlüsselwörtern. Falls ein Schlüsselwort gefunden wird "
 "und der E-Mail keine Datei beigelegt ist, so werden Sie nun vor vergessenen "
 "Dateianlagen gewarnt."
 
+#: C/evolution.xml:1552(para)
+msgid ""
+"To edit any of the existing keywords, select the keyword, click Edit, then "
+"modify the word as desired."
+msgstr ""
+"Um bestehende Schlüsselwörter zu bearbeiten, wählen Sie »Bearbeiten« aus und "
+"ändern Sie das Schlüsselwort wie gewünscht."
+
 #: C/evolution.xml:1561(para)
 msgid ""
-"Evolution, like most e-mail programs, recognizes three types of addressee: "
-"primary recipients, secondary recipients, and hidden (blind) recipients. The "
-"simplest way to direct a message is to put the e-mail address or addresses "
-"in the To: field, which denotes primary recipients. Use the Cc: field to "
-"send a message to secondary recipients."
+"<trademark>Evolution</trademark>, like most email programs, recognizes three "
+"types of addresses: primary recipients, secondary recipients, and hidden "
+"(blind) recipients. The simplest way to direct a message is to put the email "
+"address or addresses in the To: field, which denotes primary recipients. Use "
+"the Cc: field to send a message to secondary recipients."
 msgstr ""
-"Evolution versteht (wie die meisten anderen E-mail-Programme auch) drei "
-"verschiedene Arten von Adressen: Primäre Adressen, sekundäre Adressen, und "
-"versteckte (blinde) Adressen. Der einfachste Weg ist es, eine oder mehrere E-"
-"Mail-Adressen in das An:-Feld einzufügen, wobei es sich dann um primäre "
-"Adressen handelt. Nutzen Sie das Kopie:-Feld für sekundäre Adressen."
+"<trademark>Evolution</trademark> versteht (wie die meisten anderen E-mail-"
+"Programme auch) drei verschiedene Arten von Adressen: Primäre Adressen, "
+"sekundäre Adressen, und versteckte (blinde) Adressen. Der einfachste Weg ist "
+"es, eine oder mehrere E-Mail-Adressen in das An:-Feld einzufügen, wobei es "
+"sich dann um primäre Adressen handelt. Nutzen Sie das Kopie:-Feld für "
+"sekundäre Adressen."
 
 #: C/evolution.xml:1562(para)
 msgid ""
@@ -4076,7 +4099,7 @@ msgstr ""
 
 #: C/evolution.xml:1563(para)
 msgid ""
-"If you frequently write e-mail to the same groups of people, you can create "
+"If you frequently write email to the same groups of people, you can create "
 "address lists in the contacts tool, and then send them mail as though they "
 "have a single address. To learn how to do that, see <link linkend=\"usage-"
 "contact-organize-group-list\">Creating a List of Contacts</link>."
@@ -4089,12 +4112,12 @@ msgstr ""
 
 #: C/evolution.xml:1564(para)
 msgid ""
-"Evolution has the ability to let you specify the Reply-To in an e-mail. "
-"Using this, you can set up a special Reply-To for an e-mail.To do this:"
+"Evolution has the ability to let you specify the Reply-To in an email. Using "
+"this, you can set up a special Reply-To for an email.To do this:"
 msgstr ""
 "Mit Evolution kann eine Antwort-an-E-Mail-Adresse in einer E-Mail angegeben "
 "werden. Hierdurch können Sie festlegen, an welche E-Mail-Adresse der "
-"Empfänger seine Antwort auf Ihre E-Mail schickt:"
+"Empfänger seine Antwort auf Ihre E-Mail schickt."
 
 #: C/evolution.xml:1567(para)
 msgid "Open a compose window."
@@ -4116,14 +4139,15 @@ msgstr "Geben Sie die gewünschte Adresse im Antwort-An-Feld ein."
 msgid "Complete the rest of your message."
 msgstr "Schreiben Sie Ihre E-Mail."
 
-#: C/evolution.xml:1579(para)
+#: C/evolution.xml:1579(para) C/evolution.xml:1947(para)
+#: C/evolution.xml:2161(para) C/evolution.xml:5206(para)
 msgid "Click Send."
 msgstr "Klicken Sie auf Abschicken."
 
 #: C/evolution.xml:1586(para)
 msgid ""
 "Address auto completion is by default enabled in Evolution when you create "
-"contacts.Evolution makes it easy for you to quickly fill in the address "
+"contacts. Evolution makes it easy for you to quickly fill in the address "
 "field without having to remember the email address of recipients. You can "
 "type nicknames or other portions of address data in the address field and "
 "Evolution will display a drop-down list of possible address completions from "
@@ -4140,8 +4164,8 @@ msgstr ""
 #: C/evolution.xml:1587(para)
 msgid ""
 "If Evolution does not complete addresses automatically, click Edit &gt; "
-"Preferences, then click Autocompletion. There, select the groups of contacts "
-"you want to use for address autocompletion in the mailer."
+"Preferences, then click Autocompletion. There, select the address book you "
+"want to use for address autocompletion in the mailer."
 msgstr ""
 "Falls Evolution nicht automatisch Adressen vervollständigt, so klicken Sie "
 "in der Menüleiste auf Bearbeiten &gt; Einstellungen, dann auf Auto-"
@@ -4151,7 +4175,7 @@ msgstr ""
 #: C/evolution.xml:1588(para)
 msgid ""
 "Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of "
-"the e-mail addresses in your contacts. Select addresses and click the arrows "
+"the email addresses in your contacts. Select addresses and click the arrows "
 "to move them into the appropriate address columns."
 msgstr ""
 "Sie können auch auf die An:-, Kopie an:- und Blindkopie an:-Knöpfe drücken, "
@@ -4161,7 +4185,7 @@ msgstr ""
 
 #: C/evolution.xml:1589(para)
 msgid ""
-"For more information about using e-mail with the contact manager and the "
+"For more information about using email with the contact manager and the "
 "calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: "
 "Adding New Cards Quickly</link> and <link linkend=\"usage-calendar-apts"
 "\">Scheduling With the Evolution Calendar</link>."
@@ -4173,14 +4197,14 @@ msgstr ""
 
 #: C/evolution.xml:1594(para)
 msgid ""
-"To reply to a message, click the message to reply to in the e-mail list and "
-"click Reply, or right-click within the message and select Reply to Sender. "
-"This opens the message composer. The To: and Subject: fields are already "
-"filled, although you can alter them if you prefer. In addition, the full "
-"text of the old message is inserted into the new message, either in grey "
-"with a blue line on one side (for HTML display) or with the &gt; character "
-"before each line (in plain text mode), to indicate that it is part of the "
-"previous message."
+"To reply to a message, click the message to reply to in the message list and "
+"click the Reply button in the toolbar, or right-click within the message and "
+"select Reply to Sender. This opens the message composer. The To: and "
+"Subject: fields are already filled, although you can alter them if you "
+"prefer. In addition, the full text of the old message is inserted into the "
+"new message, either in grey with a blue line on one side (for HTML display) "
+"or with the &gt; character before each line (in plain text mode), to "
+"indicate that it is part of the previous message."
 msgstr ""
 "Um auf eine Nachricht zu antworten, wählen Sie die Nachricht in der E-Mail-"
 "Liste aus und klicken Sie auf den Antwort-Knopf in der Werkzeugleiste, oder "
@@ -4208,7 +4232,7 @@ msgstr "Antwort an Alle"
 
 #: C/evolution.xml:1599(para)
 msgid ""
-"Susan sends an e-mail to a client and sends copies to Tim and to an internal "
+"Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
 "of them to read, he uses Reply to All, but if he just wants to tell Susan "
 "that he agrees with her, he uses Reply. His reply does not reach anyone that "
@@ -4277,7 +4301,8 @@ msgid "Ctrl+F"
 msgstr "Steuerung+F"
 
 #: C/evolution.xml:1660(para)
-msgid "The message composer makes several text searching features available to you."
+msgid ""
+"The message composer makes several text searching features available to you."
 msgstr "Der E-Mail-Editor enthält verschiedene Möglichkeiten zur Textsuche."
 
 #: C/evolution.xml:1662(title)
@@ -4297,13 +4322,13 @@ msgstr "Einen regulären Ausdruck suchen:"
 #: C/evolution.xml:1667(para)
 msgid ""
 "You can search for a complex pattern of characters, called a <link linkend="
-"\"regular-expression\">regular expression</link> or “regex” in your composer "
-"window. If you're not sure what a regular expression is, you should ignore "
-"this feature."
+"\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
+"your composer window. If you're not sure what a regular expression is, you "
+"should ignore this feature."
 msgstr ""
 "Sie können nach einem komplexeren Muster im Text Ihrer E-Mail suchen, <link "
-"linkend=\"regular-expression\">Regulärer Ausdruck</link> oder &ldquo;"
-"Regex&rdquo; genannt. Falls Sie sich nicht sicher sind, was dies ist, so "
+"linkend=\"regular-expression\">Regulärer Ausdruck</link> oder <quote>Regex</"
+"quote> genannt. Falls Sie sich nicht sicher sind, was dies ist, so "
 "ignorieren Sie diese Funktion einfach."
 
 #: C/evolution.xml:1670(title)
@@ -4320,7 +4345,8 @@ msgstr "Ersetzen:"
 
 #: C/evolution.xml:1675(para)
 msgid "Find a word or phrase, and replace it with something else."
-msgstr "Nach einem oder mehreren Wörtern suchen und diese mit etwas anderem ersetzen."
+msgstr ""
+"Nach einem oder mehreren Wörtern suchen und diese mit etwas anderem ersetzen."
 
 #: C/evolution.xml:1677(para)
 msgid ""
@@ -4334,8 +4360,8 @@ msgstr ""
 
 #: C/evolution.xml:1682(para)
 msgid ""
-"Normally, you can't set text styles or insert pictures in e-mail. However, "
-"most newer e-mail programs can display images and text styles in addition to "
+"Normally, you can't set text styles or insert pictures in email. However, "
+"most newer email programs can display images and text styles in addition to "
 "basic alignment and paragraph formatting. They do this with <link linkend="
 "\"html\">HTML</link>, just like Web pages do."
 msgstr ""
@@ -4362,8 +4388,8 @@ msgstr "Grundlegende HTML-Formatierung"
 
 #: C/evolution.xml:1687(para)
 msgid ""
-"You can change the format of an e-mail message from plain text to HTML by "
-"choosing Format HTML."
+"You can change the format of an email message from plain text to HTML by "
+"choosing Format &gt; HTML from the menu bar."
 msgstr ""
 "Sie können das Format einer E-Mail-Nachricht von Text zu HTML ändern, indem "
 "Sie in der Menüleiste Format &gt; HTML auswählen."
@@ -4411,10 +4437,10 @@ msgid ""
 msgstr ""
 "Links in der Werkzeugleiste befindet sich die Auswahlliste für die "
 "Textgröße. Daneben können Sie den Textstil auswählen, so zum Beispiel "
-"»Normal« für den Vorgabetextstil oder «Überschrift 1« (groß) bis "
-"»Überschrift 6« (klein) für verschiedene Größen von Überschriften. Andere "
-"Stile sind zum Beispiel »Vorformatiert«, um vorformattierten Text in seiner "
-"Form zu belassen, oder drei verschiedene Arten vor Aufzählungen für Listen."
+"»Normal« für den Vorgabetextstil oder «Überschrift 1« (groß) bis »Überschrift "
+"6« (klein) für verschiedene Größen von Überschriften. Andere Stile sind zum "
+"Beispiel »Vorformatiert«, um vorformattierten Text in seiner Form zu "
+"belassen, oder drei verschiedene Arten vor Aufzählungen für Listen."
 
 #: C/evolution.xml:1695(para)
 msgid ""
@@ -4434,7 +4460,7 @@ msgstr "Textstile:"
 
 #: C/evolution.xml:1698(para)
 msgid ""
-"Use these buttons to determine the way your e-mail looks. If you have text "
+"Use these buttons to determine the way your email looks. If you have text "
 "selected, the style applies to the selected text. If you do not have text "
 "selected, the style applies to whatever you type next."
 msgstr ""
@@ -4529,7 +4555,7 @@ msgid ""
 "you have text selected, the color applies to the selected text. If you do "
 "not have text selected, the color applies to whatever you type next. You can "
 "select a background color or image by right-clicking the message background, "
-"then selecting Style Page."
+"then selecting Style &gt; Page Style."
 msgstr ""
 "Ganz rechts befindet sich die Farbauswahl, wobei die Box die momentane "
 "Textfarbe anzeigt. Um eine andere Farbe zu wählen, klicken Sie auf den nach "
@@ -4547,8 +4573,8 @@ msgstr "Weiterführende HTML-Formatierung"
 #: C/evolution.xml:1774(para)
 msgid ""
 "Under the Insert menu, there are several more items you can use to style "
-"your e-mail. To use these and other HTML formatting tools, make sure you "
-"have enabled HTML mode by using Format HTML."
+"your email. To use these and other HTML formatting tools, make sure you have "
+"enabled HTML mode by using Format &gt; HTML from the menu bar."
 msgstr ""
 "Im Einfügen-Menü in der Menüleiste befinden sich weitere Funktionen zum "
 "Formatieren Ihrer E-Mail. Um diese und die anderen HTML-"
@@ -4589,8 +4615,8 @@ msgid "Inserting an Image"
 msgstr "Ein Bild einfügen"
 
 #: C/evolution.xml:1799(para)
-msgid "Click Image."
-msgstr "Wählen Sie Einfügen &gt; Bild in der Menüleiste aus."
+msgid "Click Insert &gt; Image in the menubar."
+msgstr "Klicken Sie auf Einfügen &gt; Bild in der Menüleiste."
 
 #: C/evolution.xml:1802(para)
 msgid "Browse to and select the image file."
@@ -4601,14 +4627,15 @@ msgid "Inserting a Rule"
 msgstr "Eine Trennlinie einfügen"
 
 #: C/evolution.xml:1812(para)
-msgid "You can insert a horizontal line into the text to help divide two sections:"
+msgid ""
+"You can insert a horizontal line into the text to help divide two sections:"
 msgstr ""
 "Sie können eine horizontale Trennlinie in den Text einfügen, um die "
 "Lesbarkeit zu verbessern:"
 
 #: C/evolution.xml:1815(para)
-msgid "Click Rule."
-msgstr "Wählen Sie Einfügen &gt; Trennlinie in der Menüleiste aus."
+msgid "Click Insert &gt; Rule in the menubar."
+msgstr "Klicken Sie auf Einfügen &gt; Trennlinie in der Menüleiste."
 
 #: C/evolution.xml:1818(para)
 msgid "Select the width, size, and alignment."
@@ -4627,8 +4654,8 @@ msgid "You can insert a table into the text:"
 msgstr "Sie können eine Tabelle in den Text einfügen:"
 
 #: C/evolution.xml:1834(para)
-msgid "Click Table."
-msgstr "Wählen Sie Einfügen &gt; Tabelle in der Menüleiste aus."
+msgid "Click Insert &gt; Table in the menubar."
+msgstr "Klicken Sie auf Einfügen &gt; Tabelle in der Menüleiste."
 
 #: C/evolution.xml:1837(para)
 msgid "Select the number of rows and columns."
@@ -4644,17 +4671,17 @@ msgstr "Wählen Sie einen Hintergrund für die Tabelle."
 
 #: C/evolution.xml:1844(para)
 msgid ""
-"To insert a picture for the background, click Browse and select the desired "
-"image."
+"To insert a picture for the background, click the filechooser button and "
+"select the desired image."
 msgstr ""
 "Um ein Bild als Hintergrund einzufügen, klicken Sie auf den Auswahldialog "
 "und wählen Sie die gewünschte Bilddatei."
 
 #: C/evolution.xml:1856(para)
-msgid "You can set the following options when sending mails in Evolution."
+msgid "You can set the following options when sending mail in Evolution."
 msgstr ""
 "Sie können folgende Optionen beim Verschicken von Nachrichten in Evolution "
-"einstellen:"
+"einstellen."
 
 #: C/evolution.xml:1858(title)
 msgid "Read Receipts:"
@@ -4664,7 +4691,7 @@ msgstr "Lesebestätigungen:"
 msgid ""
 "Evolution allows you to request a receipt for your sent messages to indicate "
 "when your message is being viewed by the recipient. Receipts are useful when "
-"sending e-mail that is time-sensitive. To request a receipt, click Insert "
+"sending email that is time-sensitive. To request a receipt, click Insert "
 "&gt; Request Read Receipt in the composer window."
 msgstr ""
 "Evolution ermöglicht das Anfordern einer Lesebestätigung für Ihre "
@@ -4717,12 +4744,8 @@ msgstr ""
 msgid "To change your default settings,"
 msgstr "Um die Vorgabe-Einstellungen zu ändern,"
 
-#: C/evolution.xml:1877(para)
-msgid "Select Edit &gt;Preferences to open Evolution Preferences window."
-msgstr "Wählen Sie Bearbeiten &gt; Einstellungen."
-
 #: C/evolution.xml:1880(para)
-msgid "Select the mail account you want to change the default settings."
+msgid "Select the mail account whose default settings you want to change."
 msgstr ""
 "Wählen Sie das E-Mail-Konto aus, dessen Vorgabe-Einstellungen Sie ändern "
 "möchten."
@@ -4744,7 +4767,8 @@ msgstr ""
 "Adressen an, an die immer eine Kopie bzw. Blindkopie geschickt werden soll."
 
 #: C/evolution.xml:1892(para)
-msgid "Select the desired option for send message receipts from the drop-down list."
+msgid ""
+"Select the desired option for send message receipts from the drop-down list."
 msgstr ""
 "Wählen Sie die gewünschte Option für Lesebestätigungen aus der Auswahlliste "
 "aus."
@@ -4769,7 +4793,8 @@ msgstr "Klicken Sie auf den Entwürfe-Knopf."
 
 #: C/evolution.xml:1904(para)
 msgid "Select the folder you want to save the drafts to."
-msgstr "Wählen Sie den Ordner aus, in dem Ihre Entwürfe gespeichert werden sollen."
+msgstr ""
+"Wählen Sie den Ordner aus, in dem Ihre Entwürfe gespeichert werden sollen."
 
 #: C/evolution.xml:1910(para) C/evolution.xml:1926(para)
 msgid "Click Revert button to revert back to previous settings."
@@ -4793,13 +4818,13 @@ msgstr ""
 
 #: C/evolution.xml:1934(para)
 msgid ""
-"When you receive an e-mail, you can forward it to other individuals or "
-"groups that might be interested. You can forward a message as an attachment "
-"to a new message (this is the default) or you can send it <link linkend="
-"\"inline\">in line</link> as a quoted portion of the message you are "
-"sending. Attachment forwarding is best if you want to send the full, "
-"unaltered message to someone else. Inline forwarding is best if you want to "
-"send portions of a message, or if you have a large number of comments on "
+"When you receive an email, you can forward it to other individuals or groups "
+"that might be interested. You can forward a message as an attachment to a "
+"new message (this is the default) or you can send it <link linkend=\"inline"
+"\">in line</link> as a quoted portion of the message you are sending. "
+"Attachment forwarding is best if you want to send the full, unaltered "
+"message to someone else. Inline forwarding is best if you want to send "
+"portions of a message, or if you have a large number of comments on "
 "different sections of the message you are forwarding. Remember to note from "
 "whom the message came, and whether you have removed or altered content."
 msgstr ""
@@ -4812,7 +4837,7 @@ msgstr ""
 "Sie nur Teile einer Nachricht weiterleiten möchten, oder wenn Sie eine "
 "Vielzahl an Kommentaren an verschiedenen Stellen der Nachricht verschicken "
 "möchten. Vergessen Sie nicht zu bemerken, von wem die Nachricht kam, und ob "
-"Sie den Inhalt gekürzt oder verändert haben. TODO"
+"Sie den Inhalt gekürzt oder verändert haben. "
 
 #: C/evolution.xml:1935(para)
 msgid "To forward a message you are reading:"
@@ -4841,12 +4866,10 @@ msgstr ""
 "geändert werden."
 
 #: C/evolution.xml:1946(para)
-msgid "Add your comments on the message in the composition frame, then click Send."
-msgstr ""
-"Fügen Sie Ihre Kommentare im Editor-Fenster hinzu und klicken Sie danach auf "
-"Abschicken.."
+msgid "Add your comments on the message in the composition frame"
+msgstr "Fügen Sie Ihre Kommentare im Editor-Fenster hinzu"
 
-#: C/evolution.xml:1949(para)
+#: C/evolution.xml:1950(para)
 msgid ""
 "Attachments to a message you are forwarding are forwarded only when you send "
 "the original message as an attachment. Inline messages do not forward any "
@@ -4856,7 +4879,7 @@ msgstr ""
 "wenn Sie die Originalnachricht beigelegt weiterleiten. Zitierte Nachrichten "
 "leiten keine Anhänge weiter."
 
-#: C/evolution.xml:1956(para)
+#: C/evolution.xml:1957(para)
 msgid ""
 "Don't forward chain letters. If you must, watch out for hoaxes and urban "
 "legends, and make sure the message doesn't have multiple layers of greater-"
@@ -4867,16 +4890,16 @@ msgstr ""
 "nicht mehrere Ebenen von größer-als-Zeichen (&gt;) enthält, welche auf "
 "mehrere Ebenen von gedanklosen Weiterleiten hinweisen."
 
-#: C/evolution.xml:1959(para)
+#: C/evolution.xml:1960(para)
 msgid ""
-"Always begin and close with a salutation. Say “please” and “thank you,” just "
-"like you do in real life. You can keep your pleasantries short, but be "
-"polite."
+"Always begin and close with a salutation. Say <quote>please</quote> and "
+"<quote>thank you,</quote> just like you do in real life. You can keep your "
+"pleasantries short, but be polite."
 msgstr ""
 "Seien Sie freundlich. Sagen Sie &ldquo;Bitte&rdquo; und &ldquo;Danke&rdquo; "
 "wie im wahren Leben."
 
-#: C/evolution.xml:1962(para)
+#: C/evolution.xml:1963(para)
 msgid ""
 "WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole "
 "message in capital letters. It hurts people's ears."
@@ -4884,7 +4907,7 @@ msgstr ""
 "IN GROSSBUCHSTABEN ZU SCHREIBEN BEDEUTET DASS SIE SCHREIEN! Schreiben Sie "
 "nicht eine gesamte Nachricht in Großbuchstaben, da dies schwer zu lesen ist."
 
-#: C/evolution.xml:1965(para)
+#: C/evolution.xml:1966(para)
 msgid ""
 "Check your spelling and use complete sentences. By default, Evolution puts a "
 "red line beneath words it doesn't recognize, as you type them."
@@ -4893,13 +4916,13 @@ msgstr ""
 "Evolution unterstreicht unbekannte Wörter in roter Farbe während Sie "
 "schreiben."
 
-#: C/evolution.xml:1968(para)
-msgid "Don't send nasty e-mails (flames). If you get one, don't write back."
+#: C/evolution.xml:1969(para)
+msgid "Don't send nasty emails (flames). If you get one, don't write back."
 msgstr ""
 "Senden Sie keine anstößigen E-Mails. Falls Sie eine solche E-Mail erhalten, "
 "ignorieren Sie diese."
 
-#: C/evolution.xml:1971(para)
+#: C/evolution.xml:1972(para)
 msgid ""
 "When you reply or forward, include enough of the previous message to provide "
 "context."
@@ -4908,37 +4931,37 @@ msgstr ""
 "Ausschnitt der vorherigen E-Mail mit, damit der Zusammenhang sofort "
 "verständlich ist."
 
-#: C/evolution.xml:1974(para)
+#: C/evolution.xml:1975(para)
 msgid "Don't send spam."
 msgstr "Verschicken Sie keine unerwünschten Nachrichten."
 
-#: C/evolution.xml:1982(para)
+#: C/evolution.xml:1983(para)
 msgid ""
 "If you create an event in the calendar component, you can then send "
-"invitations to the attendee list through the Evolution e-mail tool. The "
+"invitations to the attendee list through the Evolution email tool. The "
 "invitation card is sent as an attachment in iCal format."
 msgstr ""
 "Wenn Sie im Kalender ein Ereignis hinzufügen können Sie Einladungen an die "
 "Teilnehmerliste verschicken. Die Einladung wird als E-Mail-Anhang im iCal-"
 "Format verschickt."
 
-#: C/evolution.xml:1983(para)
+#: C/evolution.xml:1984(para)
 msgid ""
-"To send an invitation in GroupWise, right click on the calendar item and "
-"click Forward as iCalendar."
+"To send an invitation, right click on the calendar item and click Forward as "
+"iCalendar."
 msgstr ""
-"Um eine Einladung in GroupWise zu verschicken, klicken Sie mit der rechten "
-"Maustaste auf den Kalendereintrag und wählen Sie »Als iCalendar weiterleiten«."
+"Um eine Einladung zu verschicken, klicken Sie mit der rechten Maustaste auf "
+"den Kalendereintrag und wählen Sie »Als iCalendar weiterleiten«."
 
-#: C/evolution.xml:1984(para)
+#: C/evolution.xml:1985(para)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Wenn Sie eine Einladung erhalten haben Sie folgende Möglichkeiten:"
 
-#: C/evolution.xml:1986(title)
+#: C/evolution.xml:1987(title)
 msgid "Accept:"
 msgstr "Annehmen:"
 
-#: C/evolution.xml:1987(para)
+#: C/evolution.xml:1988(para)
 msgid ""
 "Indicates you will attend the meeting. When you click the OK button, the "
 "meeting is entered into your calendar."
@@ -4946,11 +4969,11 @@ msgstr ""
 "Sie nehmen die Einladung an und wollen an der Besprechung teilnehmen. Wenn "
 "Sie den OK-Button drücken wird der Termin zu Ihrem Kalender hinzugefügt."
 
-#: C/evolution.xml:1990(title)
+#: C/evolution.xml:1991(title)
 msgid "Tentatively Accept:"
 msgstr "Vorläufig:"
 
-#: C/evolution.xml:1991(para)
+#: C/evolution.xml:1992(para)
 msgid ""
 "Indicates you will probably attend the meeting. When you click the OK "
 "button, the meeting is entered into your calendar, but is marked as "
@@ -4960,15 +4983,15 @@ msgstr ""
 "teilnehmen. Wenn Sie den OK-Button drücken wird der Termin zu Ihrem Kalender "
 "hinzugefügt, aber als vorläufig markiert."
 
-#: C/evolution.xml:1994(title)
+#: C/evolution.xml:1995(title)
 msgid "Decline:"
 msgstr "Ablehnen:"
 
-#: C/evolution.xml:1995(para)
+#: C/evolution.xml:1996(para)
 msgid ""
 "Indicates you are unable to attend the meeting. The meeting is not entered "
 "into your calendar when you click OK, although your response is sent to the "
-"meeting host if you have selected the RSVP option."
+"meeting host if you have selected the Send reply to sender option."
 msgstr ""
 "Sie nehmen die Einladung nicht an und werden nicht an der Besprechung "
 "teilnehmen. Wenn Sie den OK-Button drücken wird der Termin nicht zu Ihrem "
@@ -4976,17 +4999,18 @@ msgstr ""
 "geschickt, falls die Option »Antwort an den Absender verschicken« ausgewählt "
 "ist."
 
-#: C/evolution.xml:1998(title)
-msgid "RSVP:"
-msgstr "Antwort an den Absender verschicken:"
+#: C/evolution.xml:1999(title)
+msgid "Send reply to sender:"
+msgstr "Antwort an Absender:"
 
-#: C/evolution.xml:1999(para)
-msgid "Select this option if you want your response sent to the meeting organizers."
+#: C/evolution.xml:2000(para)
+msgid ""
+"Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 "Wählen Sie diese Option aus, wenn Sie eine Antwort an den Organisator der "
 "Besprechung verschicken möchten."
 
-#: C/evolution.xml:2005(para)
+#: C/evolution.xml:2006(para)
 msgid ""
 "Because IMAP folders exist on the server, and opening them or checking them "
 "takes time, you need fine-grained control over the way that you use IMAP "
@@ -5002,11 +5026,11 @@ msgstr ""
 "oder ob nur bestimmte Ordner angezeigt werden sollen, und andere Ordner "
 "ausschließen."
 
-#: C/evolution.xml:2008(para)
+#: C/evolution.xml:2009(para)
 msgid "Select Folder &gt; Subscriptions."
 msgstr "Wählen Sie Ordner &gt; Abonnements in der Menüleiste aus."
 
-#: C/evolution.xml:2011(para)
+#: C/evolution.xml:2012(para)
 msgid ""
 "If you have accounts on multiple IMAP servers, select the server where you "
 "want to manage your subscriptions."
@@ -5014,15 +5038,15 @@ msgstr ""
 "Falls Sie Konten auf mehreren IMAP-Servern besitzen, wählen Sie den Server "
 "aus, für den Sie Ihre Abonnements einstellen möchten."
 
-#: C/evolution.xml:2012(para)
+#: C/evolution.xml:2013(para)
 msgid "Evolution displays a list of available files and folders."
 msgstr "Evolution zeigt Ihnen eine Liste der verfügbaren Dateien und Ordner an."
 
-#: C/evolution.xml:2015(para)
+#: C/evolution.xml:2016(para)
 msgid "Select a file or folder by clicking it."
 msgstr "Wählen Sie eine Datei oder einen Ordner aus, indem Sie darauf klicken."
 
-#: C/evolution.xml:2016(para)
+#: C/evolution.xml:2017(para)
 msgid ""
 "You should select at least the Inbox folder. Depending upon the way your "
 "IMAP server is configured, the list of available files might include non-"
@@ -5033,35 +5057,35 @@ msgstr ""
 "Nicht-E-Mail-Ordner enthalten. Falls dies der Fall ist, so ignorieren Sie "
 "diese."
 
-#: C/evolution.xml:2019(para)
-msgid "Click Subscribe to add a folder to the subscribed list."
+#: C/evolution.xml:2020(para)
+msgid "Enable the corresponding checkbox to add a folder to the subscribed list."
 msgstr ""
 "Wählen Sie die zu abonnierenden Ordner aus, indem Sie das Ankreuzfeld "
 "anwählen."
 
-#: C/evolution.xml:2022(para)
+#: C/evolution.xml:2023(para)
 msgid "When you have subscribed to the folders you want, close the window."
 msgstr ""
 "Wenn Sie die gewünschten Ordner abonniert haben, so schließen Sie das "
 "Fenster."
 
-#: C/evolution.xml:2029(para)
+#: C/evolution.xml:2030(para)
 msgid ""
-"To protect and encode your e-mail transmissions, Evolution offers two "
+"To protect and encode your email transmissions, Evolution offers two "
 "encryption methods:"
 msgstr ""
 "Um Ihren E-Mail-Versand und -Empfang zu schützen und zu verschlüsseln bietet "
 "Ihnen Evolution zwei Verschlüsselungsmethoden:"
 
-#: C/evolution.xml:2032(para)
+#: C/evolution.xml:2033(para)
 msgid "GPG Encryption"
 msgstr "GPG-Verschlüsselung"
 
-#: C/evolution.xml:2035(para) C/evolution.xml:2183(title)
+#: C/evolution.xml:2036(para) C/evolution.xml:2194(title)
 msgid "S/MIME Encryption"
 msgstr "S/MIME-Verschlüsselung"
 
-#: C/evolution.xml:2038(para)
+#: C/evolution.xml:2039(para)
 msgid ""
 "Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), "
 "an implementation of strong <link linkend=\"public-key-encryption\">Public "
@@ -5071,50 +5095,35 @@ msgstr ""
 "Privacy Guard (GPG) nutzt, eine Implementierung der starken <link linkend="
 "\"public-key-encryption\">Öffentlicher-Schlüssel-Verschlüsselung.</link>"
 
-#: C/evolution.xml:2039(para)
+#: C/evolution.xml:2040(para)
 msgid ""
-"GPG uses two keys: public and private. You can give your public key to "
-"anyone you want to receive encrypted messages, or put it on a public key "
-"server so that people can look it up before contacting you. Your private key "
-"lets you decrypt any message encrypted with your public key. Never give your "
-"private key to anyone."
+"In order to encrypt and decrypt emails using GPG, it is necessary to use two "
+"kinds of encryption keys: public and private. Private keys are used to "
+"encrypt messages and public keys to decrypt them. Private keys should not be "
+"shared with others, while public keys can be shared with those you want to "
+"send encrypted messages to. You may also place them on a public key server."
 msgstr ""
-"GPG benutzt zwei Schlüssel, einen öffentlichen und einen privaten. Sie "
-"können Ihren öffentlichen Schlüssel an jeden verteilen, der von Ihnen "
-"verschlüsselte Nachrichten erhalten soll, oder ihn auf einen öffentlichen "
-"Schlüssel-Server hochladen, so dass dieser von Personen abgerufen werden "
-"kann, bevor diese Sie kontaktieren. Ihr privater Schlüssel ermöglicht Ihnen "
-"das Entschlüsseln jeder Nachricht, die mit Ihrem öffentlichen Schlüssel "
-"verschlüsselt wurde. Geben Sie Ihren privaten Schlüssel niemals heraus."
 
-#: C/evolution.xml:2040(para)
+#: C/evolution.xml:2041(para)
 msgid ""
-"When you send a message that is encrypted, you must encrypt it using your "
-"intended recipient's public key. To receive an encrypted message, you must "
-"make sure that the sender has your public key in advance. For signing "
-"messages, you encrypt the signature with your private key, so only your "
-"public key can unlock it. When you send the message, the recipient gets your "
-"public key and unlocks the signature, verifying your identity."
-msgstr ""
-"Wenn Sie eine Nachricht verschicken die verschlüsselt ist, so müssen Sie "
-"diese mit dem öffentlichen Schlüssel des Empfängers verschlüsseln. Um eine "
-"verschlüsselte Nachricht zu erhalten müssen Sie sicherstellen, dass der "
-"Absender zuvor Ihren öffentlichen Schlüssel erhalten hat. Um Nachricht zu "
-"signieren verschlüsseln Sie die Signatur mit Ihrem privaten Schlüssel, so "
-"dass nur Ihr beim Empfänger vorhandener öffentlicher Schlüssel die Signatur "
-"verifizieren kann."
+"To send encrypted email, you must have your own private key on your keyring, "
+"and the person you are sending it to must have your public key in order to "
+"decrypt and read it. To decrypt and read someone else's encrypted email, you "
+"must first have a copy of their public key on your keyring."
+msgstr ""
 
-#: C/evolution.xml:2041(para)
+#: C/evolution.xml:2042(para)
 msgid ""
 "Evolution does not support older versions of PGP, such as OpenPGP and Inline "
 "PGP."
-msgstr "Evolution unterstützt nicht ältere PGP-Versionen wie OpenPGP oder Inline-PGP."
+msgstr ""
+"Evolution unterstützt nicht ältere PGP-Versionen wie OpenPGP oder Inline-PGP."
 
-#: C/evolution.xml:2042(para)
+#: C/evolution.xml:2043(para)
 msgid "You can use encryption in two different ways:"
 msgstr "Sie können Verschlüsselung auf zwei unterschiedliche Arten benutzen:"
 
-#: C/evolution.xml:2045(para)
+#: C/evolution.xml:2046(para)
 msgid ""
 "You can encrypt the entire message, so that nobody but the recipient can "
 "read it."
@@ -5122,7 +5131,7 @@ msgstr ""
 "Sie können die gesamte Nachricht verschlüsseln, so dass niemand aus dem "
 "Empfänger diese lesen kann."
 
-#: C/evolution.xml:2048(para)
+#: C/evolution.xml:2049(para)
 msgid ""
 "You can attach an encrypted signature to a plain text message, so that the "
 "recipient can read the message without decrypting it, and needs decrypting "
@@ -5132,27 +5141,28 @@ msgstr ""
 "so dass der Empfänger die Nachricht ohne Entschlüsseln lesen kann, und "
 "Entschlüsselung nur benötigt um die Identität des Absenders zu prüfen."
 
-#: C/evolution.xml:2051(para)
+#: C/evolution.xml:2052(para)
 msgid ""
 "For example, suppose that Kevin wants to send an encrypted message to his "
 "friend Rachel. He looks up her public key on a general key server, and then "
-"tells Evolution to encrypt the message. The message now reads “@#"
-"$23ui7yr87#@!48970fsd.” When the information gets to Rachel, she decrypts it "
-"using her private key, and it appears as plain text for her to read."
+"tells Evolution to encrypt the message. The message now reads <quote>@#"
+"$23ui7yr87#@!48970fsd.</quote> When the information gets to Rachel, she "
+"decrypts it using her private key, and it appears as plain text for her to "
+"read."
 msgstr ""
 "Nehmen wir zum Beispiel an, dass Karl eine verschlüsselte Nachricht an seine "
 "Freundin Helene schicken will. Er ruft ihren öffentlichen Schlüssel auf "
 "einem öffentlichen Schlüssel-Server ab und wählt in Evolution aus, dass die "
-"Nachricht verschlüsselt werden soll. Die Nachricht liest sich nun so: &ldquo;"
-"@#$23ui7yr87#@!48970fsd.&rdquo; Helene erhält die Nachricht und "
+"Nachricht verschlüsselt werden soll. Die Nachricht liest sich nun so: "
+"<quote>@#$23ui7yr87#@!48970fsd.</quote> Helene erhält die Nachricht und "
 "entschlüsselt diese mit ihrem privaten Schlüssel, wodurch die Nachricht als "
 "Klartext für sie lesbar dargestellt wird."
 
-#: C/evolution.xml:2054(title)
+#: C/evolution.xml:2055(title)
 msgid "Making a GPG Encryption Key"
 msgstr "Einen GPG-Verschlüsselungsschlüssel erstellen"
 
-#: C/evolution.xml:2055(para)
+#: C/evolution.xml:2056(para)
 msgid ""
 "Before you can get or send encrypted mail, you need to generate your public "
 "and private keys with GPG. This procedure covers version 1.2.4 of GPG. If "
@@ -5166,17 +5176,17 @@ msgstr ""
 "Ihre Version herausfinden, indem Sie <command>gpg --version</command> "
 "eingeben."
 
-#: C/evolution.xml:2058(para)
+#: C/evolution.xml:2059(para)
 msgid "Open a terminal and enter <command>gpg --gen-key</command>."
 msgstr ""
 "Öffnen Sie ein Kommandozeilen-Fenster und geben Sie <command>gpg --gen-key</"
 "command> ein."
 
-#: C/evolution.xml:2061(para)
+#: C/evolution.xml:2062(para)
 msgid "Select an algorithm, then press Enter."
 msgstr "Wählen Sie eine Algorithmus und drücken Sie die Eingabetaste."
 
-#: C/evolution.xml:2063(para)
+#: C/evolution.xml:2064(para)
 msgid ""
 "To accept the default algorithm of DSA and ElGamal, press Enter "
 "(recommended)."
@@ -5184,7 +5194,7 @@ msgstr ""
 "Um den Vorgabe-Algorithmus DSA und ElGamal zu nutzen, drücken Sie die "
 "Eingabetaste (empfohlen)."
 
-#: C/evolution.xml:2066(para)
+#: C/evolution.xml:2067(para)
 msgid ""
 "Select a key length, then press Enter. To accept the default, 1024 bits, "
 "press Enter."
@@ -5192,11 +5202,11 @@ msgstr ""
 "Wählen Sie eine Schlüssellänge und drücken Sie die Eingabetaste. Um die "
 "Voreinstellung (1024 bits) zu nutzen, drücken Sie die Eingabetaste."
 
-#: C/evolution.xml:2069(para)
+#: C/evolution.xml:2070(para)
 msgid "Enter how long your key should be valid for."
 msgstr "Geben Sie ein, wie lang Ihr Schlüssel gültig sein soll."
 
-#: C/evolution.xml:2071(para)
+#: C/evolution.xml:2072(para)
 msgid ""
 "To accept the default of no expiration, press Enter, then press Y when you "
 "are prompted to verify the selection."
@@ -5205,33 +5215,34 @@ msgstr ""
 "drücken Sie die Eingabetaste, dann Y wenn Sie danach gefragt werden, Ihre "
 "Auswahl zu bestätigen."
 
-#: C/evolution.xml:2074(para)
+#: C/evolution.xml:2075(para)
 msgid "Type your real name, then press Enter."
 msgstr "Geben Sie Ihren vollen Namen ein und drücken Sie die Eingabetaste"
 
-#: C/evolution.xml:2077(para)
-msgid "Type your e-mail address, then press Enter."
+#: C/evolution.xml:2078(para)
+msgid "Type your email address, then press Enter."
 msgstr "Geben Sie Ihre E-Mail-Adresse ein und drücken Sie die Eingabetaste."
 
-#: C/evolution.xml:2080(para)
+#: C/evolution.xml:2081(para)
 msgid "(Optional) Type a comment, then press Enter."
-msgstr "(Optional) Geben Sie einen Kommentar ein und drücken Sie die Eingabetaste."
+msgstr ""
+"(Optional) Geben Sie einen Kommentar ein und drücken Sie die Eingabetaste."
 
-#: C/evolution.xml:2083(para)
+#: C/evolution.xml:2084(para)
 msgid "Review your selected user ID. If it is correct, press O."
 msgstr ""
 "Prüfen Sie die ausgewählte Benutzerkennung. Falls diese korrekt ist, so "
 "drücken Sie O."
 
-#: C/evolution.xml:2086(para)
+#: C/evolution.xml:2087(para)
 msgid "Type a passphrase, then press Enter."
 msgstr "Geben Sie ein Passwort ein und drücken Sie die Eingabetaste"
 
-#: C/evolution.xml:2089(para)
+#: C/evolution.xml:2090(para)
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Bewegen Sie Ihre Maus zufällig, um die Schlüssel zu erstellen."
 
-#: C/evolution.xml:2092(para)
+#: C/evolution.xml:2093(para)
 msgid ""
 "After the keys are generated, you can view your key information by entering "
 "<command>gpg --list-keys</command>. You should see something similar to "
@@ -5247,7 +5258,7 @@ msgstr ""
 "pub 1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub "
 "1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </computeroutput>"
 
-#: C/evolution.xml:2093(para)
+#: C/evolution.xml:2094(para)
 msgid ""
 "GPG creates one list, or keyring, for your public keys and one for your "
 "private keys. All the public keys you know are stored in the file ~/.gnupg/"
@@ -5258,13 +5269,13 @@ msgstr ""
 "werden in der Datei ~/.gnupg/pubring.gpg gespeichert. Wenn Sie anderen Ihren "
 "Schlüssel geben möchten, so senden Sie ihnen diese Datei."
 
-#: C/evolution.xml:2094(para)
+#: C/evolution.xml:2095(para)
 msgid "If you want, you can upload your keys to a key server."
 msgstr ""
 "Falls Sie möchten, können Sie Ihre Schlüssel auf einen Schlüssel-Server "
 "hochladen."
 
-#: C/evolution.xml:2097(para)
+#: C/evolution.xml:2098(para)
 msgid ""
 "Check your public key ID with gpg--list-keys. It is the string after 1024D "
 "on the line beginning with pub. In the example above, it is 32j38dk2."
@@ -5273,7 +5284,7 @@ msgstr ""
 "handelt sich um den Text nach 1024D in der Zeile, welche mit pub beginnt. Im "
 "obigen Beispiel lautet die Kennung Ihres öffentliche Schlüssels 32j38dk2."
 
-#: C/evolution.xml:2100(para)
+#: C/evolution.xml:2101(para)
 msgid ""
 "Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Substitute your key ID for "
@@ -5284,7 +5295,7 @@ msgstr ""
 "Schlüsselkennung (Key ID) für <varname>32j38dk2</varname> ein. Sie benötigen "
 "Ihr Passwort, um diesen Befehl auszuführen."
 
-#: C/evolution.xml:2103(para)
+#: C/evolution.xml:2104(para)
 msgid ""
 "Key servers store your public keys for you so that your friends can decrypt "
 "your messages. If you choose not to use a key server, you can manually send "
@@ -5300,7 +5311,7 @@ msgstr ""
 "einmal zu veröffentlichen, so dass Menschen ihn von einem zentralen Ort "
 "herunterladen können."
 
-#: C/evolution.xml:2104(para)
+#: C/evolution.xml:2105(para)
 msgid ""
 "If you don't have a key to unlock or encrypt a message, you can set your "
 "encryption tool to look it up automatically. If it can't find the key, an "
@@ -5311,11 +5322,11 @@ msgstr ""
 "einstellen, dass dieser Schlüssel automatisch gesucht wird. Falls kein "
 "Schlüssel gefunden werden kann, wird eine Fehlermeldung angezeigt."
 
-#: C/evolution.xml:2108(title)
+#: C/evolution.xml:2109(title)
 msgid "Getting and Using GPG Public Keys"
 msgstr "Das Erhalten und Nutzen öffentlicher GPG-Schlüssel"
 
-#: C/evolution.xml:2109(para)
+#: C/evolution.xml:2110(para)
 msgid ""
 "To send an encrypted message, you need to use the recipient's public key in "
 "combination with your private key. Evolution handles the encryption, but you "
@@ -5327,7 +5338,7 @@ msgstr ""
 "selbst den öffentlichen Schlüssel des Empfängers abrufen und diesen zu Ihrem "
 "Schlüsselring hinzufügen."
 
-#: C/evolution.xml:2110(para)
+#: C/evolution.xml:2111(para)
 msgid ""
 "To get public keys from a public key server, enter the command<command> gpg "
 "--recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, "
@@ -5341,43 +5352,54 @@ msgstr ""
 "Nachfrage Ihr Passwort ein, und die Kennung wird automatisch zu Ihrem "
 "Schlüsselbund hinzugefügt."
 
-#: C/evolution.xml:2111(para)
+#: C/evolution.xml:2113(para)
+msgid ""
+"The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
+"to multiple hosts in various networks. The gpg utility tries to connect to "
+"one in the current network; and if that particular host is down, it fails "
+"with a time-out."
+msgstr ""
+
+#: C/evolution.xml:2116(para)
+msgid ""
+"To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal "
+"console and get the IP address of the hosts. You can ping each of them to "
+"find the one which is up and running. Now, you can replace wwwkeys.pgp.net "
+"in the gpg --recv-keys --keyserver wwwkeys.pgp.net keyid command with that "
+"explicit IP number as returned by the host utility."
+msgstr ""
+
+#: C/evolution.xml:2121(para)
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
-"enter the command <command>gpg <varname>--filename</varname></command> to "
-"add it to your keyring."
+"enter the command <command>gpg <varname>--import</varname></command> to add "
+"it to your keyring."
 msgstr ""
 "Falls Ihnen jemand einen öffentlichen Schlüssel direkt zuschickt, speichern "
 "Sie diesen als Textdatei und geben Sie den Befehl <command>gpg <varname>--"
-"dateiname</varname></command> ein (ersetzen Sie <varname>dateiname</varname> "
-"durch den Namen der Textdatei), um den Schlüssel zu Ihrem Schlüsselbund "
+"import</varname></command> ein, um den Schlüssel zu Ihrem Schlüsselbund "
 "hinzuzufügen."
 
-#: C/evolution.xml:2115(title)
+#: C/evolution.xml:2125(title)
 msgid "Setting up GPG Encryption"
 msgstr "GPG-Verschlüsselung einrichten"
 
-#: C/evolution.xml:2118(para) C/evolution.xml:5589(para)
-#: C/evolution.xml:5605(para) C/evolution.xml:6036(para)
-msgid "Click Edit &gt; Preferences, then click Mail Accounts."
-msgstr "Klicken Sie auf Bearbeiten &gt; Einstellungen, dann auf E-Mail-Konten."
-
-#: C/evolution.xml:2121(para)
+#: C/evolution.xml:2131(para) C/evolution.xml:2170(para)
 msgid "Select the account you want to use securely, then click Edit."
 msgstr "Wählen Sie das Konto aus und klicken Sie auf Bearbeiten."
 
-#: C/evolution.xml:2124(para) C/evolution.xml:2162(para)
+#: C/evolution.xml:2134(para) C/evolution.xml:2173(para)
 msgid "Click the Security tab."
 msgstr "Klicken Sie auf den Reiter Sicherheit."
 
-#: C/evolution.xml:2127(para)
+#: C/evolution.xml:2137(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
 msgstr "Fügen Sie Ihre Schlüsselkennung in das Feld PGP/GPG-Schlüsselkennung ein."
 
-#: C/evolution.xml:2136(para)
+#: C/evolution.xml:2146(para)
 msgid ""
 "Evolution requires that you know your key ID. If you don't remember it, you "
-"can find it by typing <command>gpg --list-keys</command> in a console "
+"can find it by typing <command>gpg --list-keys</command> in a terminal "
 "window. Your key ID is an eight-character string with random numbers and "
 "letters."
 msgstr ""
@@ -5386,47 +5408,39 @@ msgstr ""
 "keys</command> in einem Terminal-Fenster eingeben. Ihre Schlüsselkennung "
 "besteht aus Buchstaben und Zahlen mit insgesamt 8 Stellen."
 
-#: C/evolution.xml:2140(title)
+#: C/evolution.xml:2150(title)
 msgid "Encrypting Messages"
 msgstr "Nachrichten verschlüsseln"
 
-#: C/evolution.xml:2141(para)
+#: C/evolution.xml:2151(para)
 msgid "To encrypt a single message:"
 msgstr "Eine einzelne Nachricht verschlüsseln:"
 
-#: C/evolution.xml:2144(para)
+#: C/evolution.xml:2154(para)
 msgid "Open a Compose a Message window."
 msgstr "Öffnen Sie das Fenster »Nachricht verfassen«"
 
-#: C/evolution.xml:2147(para)
+#: C/evolution.xml:2157(para)
 msgid "Click Security &gt; PGP Encrypt."
 msgstr "Klicken Sie auf Sicherheit &gt; Mit PGP verschlüsseln."
 
-#: C/evolution.xml:2150(para)
-msgid "Compose your message, then click Send."
-msgstr "Schreiben Sie Ihre Nachricht und klicken Sie auf Abschicken."
+#: C/evolution.xml:2160(para)
+msgid "Compose your message."
+msgstr "Schreiben Sie Ihre Nachricht."
 
-#: C/evolution.xml:2153(para)
-msgid "You can set Evolution to always sign your e-mail messages:"
+#: C/evolution.xml:2164(para)
+msgid "You can set Evolution to always sign your email messages:"
 msgstr "Sie können einstellen, dass Ihre E-Mails immer signiert werden:"
 
-#: C/evolution.xml:2156(para)
-msgid "Click Edit &gt; Preferences, then select Mail Accounts."
-msgstr "Klicken Sie auf Bearbeiten &gt; Einstellungen, dann E-Mail-Konten."
-
-#: C/evolution.xml:2159(para)
-msgid "Select the mail account to encrypt, then click Edit."
-msgstr "Wählen Sie das E-Mail-Konto aus und klicken Sie auf Bearbeiten."
-
-#: C/evolution.xml:2165(para)
+#: C/evolution.xml:2176(para)
 msgid "Select Always Sign Outgoing Messages When Using This Account."
 msgstr "Wählen Sie Aus diesem Konto ausgehende Nachrichten immer signieren."
 
-#: C/evolution.xml:2177(title)
+#: C/evolution.xml:2188(title)
 msgid "Unencrypting a Received Message"
 msgstr "Eine empfangene Nachricht entschlüsseln"
 
-#: C/evolution.xml:2178(para)
+#: C/evolution.xml:2189(para)
 msgid ""
 "If you receive an encrypted message, you need to decrypt it before you read "
 "it. Remember, the sender must have your public key before they can send you "
@@ -5437,7 +5451,7 @@ msgstr ""
 "öffentlichen Schlüssel bevor er Ihnen eine verschlüsselte Nachricht schicken "
 "kann."
 
-#: C/evolution.xml:2179(para)
+#: C/evolution.xml:2190(para)
 msgid ""
 "When you view the message, Evolution prompts you for your PGP password. "
 "Enter it, and the unencrypted message is displayed."
@@ -5446,7 +5460,7 @@ msgstr ""
 "Ihrem PGP-Passwort. Nach Eingabe wird die unverschlüsselte Nachricht "
 "angezeigt."
 
-#: C/evolution.xml:2184(para)
+#: C/evolution.xml:2195(para)
 msgid ""
 "S/MIME encryption also uses a key-based approach, but it has some "
 "significant advantages in convenience and security. S/MIME uses "
@@ -5469,7 +5483,7 @@ msgstr ""
 "erhalten, erhält Ihr System automatisch den öffentlichen Teil des "
 "Zertifikates und entschlüsselt und prüft die Nachricht."
 
-#: C/evolution.xml:2185(para)
+#: C/evolution.xml:2196(para)
 msgid ""
 "S/MIME is used most often in corporate settings. In these cases, "
 "administrators supply certificates that they have purchased from a "
@@ -5486,13 +5500,12 @@ msgstr ""
 "jedem Falle stellt der Systemadministrator Ihnen Ihre Zertifikatsdatei "
 "bereit."
 
-#: C/evolution.xml:2186(para)
+#: C/evolution.xml:2197(para)
 msgid ""
 "If you want to use S/MIME independently, you can extract an identification "
-"certificate from your Mozilla* or Netscape* Web browser. See the Mozilla "
-"help <ulink url=\"http://www.mozilla.org/projects/security/pki/psm/help_21/"
-"using_certs_help.html\">Mozilla Help</ulink>for more information on security "
-"certificates."
+"certificate from your Mozilla* or Netscape* Web browser. See the <ulink url="
+"\"http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help."
+"html\">Mozilla Help</ulink>for more information on security certificates."
 msgstr ""
 "Falls Sie unabhängig S/MIME benutzen möchten, so können Sie ein Zertifikat "
 "zur Identifizierung aus Ihrem Mozilla*- oder Netscape*-Internetbrowser "
@@ -5500,27 +5513,28 @@ msgstr ""
 "pki/psm/help_21/using_certs_help.html\">Mozilla-Hilfe</link> für weitere "
 "Informationen zur Sicherheitszertifikaten."
 
-#: C/evolution.xml:2187(para)
+#: C/evolution.xml:2198(para)
 msgid "The certificate file is a password-protected file on your computer."
-msgstr "Die Zertifikat-Datei ist eine Passwort-geschützte Datei auf Ihrem Computer."
+msgstr ""
+"Die Zertifikat-Datei ist eine Passwort-geschützte Datei auf Ihrem Computer."
 
-#: C/evolution.xml:2190(title)
+#: C/evolution.xml:2201(title)
 msgid "Adding a Signing Certificate"
 msgstr "Hinzufügen eines Zertifikates zum Signieren"
 
-#: C/evolution.xml:2193(para)
-msgid "Click Edit &gt; Preferences, then click Certificate."
-msgstr "Klicken Sie auf Bearbeiten &gt; Einstellungen, dann Zertifikate."
+#: C/evolution.xml:2207(para)
+msgid "Click Certificates."
+msgstr "Klicken Sie auf »Zertifikate«."
 
-#: C/evolution.xml:2196(para) C/evolution.xml:2316(para)
+#: C/evolution.xml:2210(para) C/evolution.xml:2333(para)
 msgid "Click Import."
 msgstr "Klicken Sie auf Importieren."
 
-#: C/evolution.xml:2199(para)
+#: C/evolution.xml:2213(para)
 msgid "Select the file to import, then click Open."
 msgstr "Wählen Sie die zu importierende Datei aus und klicken Sie auf Öffnen."
 
-#: C/evolution.xml:2205(para)
+#: C/evolution.xml:2219(para)
 msgid ""
 "Similarly, you can add certificates that are sent to you independently of "
 "any authority by clicking the Contact Certificates tab and using the same "
@@ -5533,11 +5547,11 @@ msgstr ""
 "Funktion. Sie können auf die gleiche Weise auch neue Zertifikat-"
 "Ausgabestellen mit ihren eigenen Zertifikat-Dateien hinzufügen."
 
-#: C/evolution.xml:2209(title)
+#: C/evolution.xml:2223(title)
 msgid "Signing or Encrypting Every Message"
 msgstr "Jede Nachricht signieren oder verschlüsseln"
 
-#: C/evolution.xml:2210(para)
+#: C/evolution.xml:2224(para)
 msgid ""
 "After you have added your certificate, you can sign or encrypt a message by "
 "clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
@@ -5547,23 +5561,21 @@ msgstr ""
 "auf Sicherheit &gt; Mit S/MIME signieren oder Mit S/MIME verschlüsseln "
 "klicken."
 
-#: C/evolution.xml:2211(para)
+#: C/evolution.xml:2225(para)
 msgid "To have every message signed or encrypted:"
 msgstr "Um jede Nachricht zu signieren oder zu verschlüsseln:"
 
-#: C/evolution.xml:2214(para)
-msgid ""
-"Click Edit &gt; Preferences, then select the account to encrypt the messages "
-"in."
+#: C/evolution.xml:2231(para)
+msgid "Select the account to encrypt the messages in."
 msgstr ""
-"Klicken Sie auf Bearbeiten &gt; Einstellungen und wählen Sie das Konto aus, "
-"für welches Nachrichten immer signiert/verschlüsselt werden sollen."
+"Wählen Sie das E-Mail-Konto aus, für welches die Nachrichten verschlüsselt "
+"werden sollen."
 
-#: C/evolution.xml:2217(para)
+#: C/evolution.xml:2234(para)
 msgid "Click Edit, then click Security."
 msgstr "Klicken Sie auf Bearbeiten, dann auf Sicherheit."
 
-#: C/evolution.xml:2220(para)
+#: C/evolution.xml:2237(para)
 msgid ""
 "Click Select next to Signing Certificate and specify the path to your "
 "signing certificate."
@@ -5571,78 +5583,78 @@ msgstr ""
 "Klicken Sie auf den Auswählen-Knopf rechts neben »Signaturzertifikat« und "
 "geben Sie den Pfad zu Ihrem Signaturzertifikat an."
 
-#: C/evolution.xml:2222(para)
+#: C/evolution.xml:2239(para)
 msgid ""
 "Click Select next to Encryption Certificate and specify the path to your "
 "encryption certificate."
 msgstr ""
-"Klicken Sie auf den Auswählen-Knopf rechts neben "
-"»Verschlüsselungszertifikat« und geben Sie den Pfad zu Ihrem "
-"Verschlüsselungszertifikat an."
+"Klicken Sie auf den Auswählen-Knopf rechts neben »Verschlüsselungszertifikat« "
+"und geben Sie den Pfad zu Ihrem Verschlüsselungszertifikat an."
 
-#: C/evolution.xml:2225(para)
+#: C/evolution.xml:2242(para)
 msgid "Select the appropriate options."
 msgstr "Wählen Sie die gewünschten Optionen aus."
 
-#: C/evolution.xml:2241(para)
+#: C/evolution.xml:2258(para)
 msgid ""
-"Whether you only get a few e-mail messages a day, or you receive hundreds, "
-"you probably want to sort and organize them. Evolution™ has the tools to "
-"help you do it."
+"Whether you only get a few email messages a day, or you receive hundreds, "
+"you probably want to sort and organize them. <trademark>Evolution</"
+"trademark> has the tools to help you do it."
 msgstr ""
 "Egal, ob Sie nur einige wenige oder hunderte von E-Mails am Tag erhalten, "
 "möchten Sie diese gegebenenfalls sortieren und organisieren. "
-"Evolution&trade; besitzt einige Funktionen um hierbei behilflich zu sein."
+"<trademark>Evolution</trademark> besitzt einige Funktionen um hierbei "
+"behilflich zu sein."
 
-#: C/evolution.xml:2244(link) C/evolution.xml:2267(title)
-msgid "Importing Your Old E-Mail"
+#: C/evolution.xml:2261(link) C/evolution.xml:2284(title)
+msgid "Importing Your Old Email"
 msgstr "Alte E-Mails importieren"
 
-#: C/evolution.xml:2247(link) C/evolution.xml:2356(title)
+#: C/evolution.xml:2264(link) C/evolution.xml:2374(title)
 msgid "Sorting the Message List"
 msgstr "Die E-Mail-Liste sortieren"
 
-#: C/evolution.xml:2250(link) C/evolution.xml:2527(title)
+#: C/evolution.xml:2267(link) C/evolution.xml:2545(title)
 msgid "Getting Organized with Folders"
 msgstr "Mit Ordnern arbeiten"
 
-#: C/evolution.xml:2253(link) C/evolution.xml:2542(title)
+#: C/evolution.xml:2270(link) C/evolution.xml:2560(title)
 msgid "Searching for Messages"
 msgstr "Suchen nach Nachrichten"
 
-#: C/evolution.xml:2256(link) C/evolution.xml:2746(title)
+#: C/evolution.xml:2273(link) C/evolution.xml:2764(title)
 msgid "Create Rules to Automatically Organize Mail"
 msgstr "Regeln zum automatischen Einordnen von E-Mails"
 
-#: C/evolution.xml:2259(link) C/evolution.xml:2985(title)
+#: C/evolution.xml:2276(link) C/evolution.xml:3003(title)
 msgid "Using Search Folders"
 msgstr "Suchordner benutzen"
 
-#: C/evolution.xml:2262(link) C/evolution.xml:3118(title)
+#: C/evolution.xml:2279(link) C/evolution.xml:3136(title)
 msgid "Stopping Junk Mail (Spam)"
 msgstr "Filtern unerwünschter Nachrichten (Spam)"
 
-#: C/evolution.xml:2268(para)
+#: C/evolution.xml:2285(para)
 msgid ""
-"Evolution allows you to import old e-mail and contacts so that you don't "
-"need to worry about losing your old information."
+"Evolution allows you to import old email and contacts so that you don't need "
+"to worry about losing your old information."
 msgstr ""
 "Evolution ermöglicht Ihnen das Importieren alter E-Mail und Kontakte, so "
 "dass Sie sich keine Sorgen machen müssen, Informationen zu verlieren."
 
-#: C/evolution.xml:2271(title)
+#: C/evolution.xml:2288(title)
 msgid "Importing Single Files"
 msgstr "Einzelne Dateien importieren"
 
-#: C/evolution.xml:2272(para)
+#: C/evolution.xml:2289(para)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution kann Dateien der folgenden Typen importieren:"
 
-#: C/evolution.xml:2274(title)
+#: C/evolution.xml:2291(title)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd):"
 
-#: C/evolution.xml:2275(para)
+#: C/evolution.xml:2292(para)
 msgid ""
 "The address book format used by the GNOME, KDE, and many other contact "
 "management applications. You should be able to export to vCard format from "
@@ -5652,11 +5664,11 @@ msgstr ""
 "Adressbuchformat. Das Exportieren in das vCard-Format sollten in jedem "
 "Kontaktverwaltungsprogramm möglich sein."
 
-#: C/evolution.xml:2278(title)
-msgid "vCalender:"
+#: C/evolution.xml:2295(title)
+msgid "vCalendar:"
 msgstr "vCalendar:"
 
-#: C/evolution.xml:2279(para)
+#: C/evolution.xml:2296(para)
 msgid ""
 "A format for storing calender files, which is generally used by Evolution, "
 "Microsoft Outlook, Sunbird, and Korganizer."
@@ -5664,11 +5676,11 @@ msgstr ""
 "Ein Format zum Speichern von Kalenderdateien, welches von Evolution, "
 "Microsoft Outlook, Sunbird und KOrganizer genutzt wird."
 
-#: C/evolution.xml:2282(title)
+#: C/evolution.xml:2299(title)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar oder iCal (.ics):"
 
-#: C/evolution.xml:2283(para)
+#: C/evolution.xml:2300(para)
 msgid ""
 "A format for storing calendar files. iCalendar is used by Palm OS handhelds, "
 "Evolution, and Microsoft Outlook."
@@ -5676,23 +5688,23 @@ msgstr ""
 "Ein Format zum Speichern von Kalenderdateien, welches von Palm OS-Geräten, "
 "Evolution und Microsoft Outlook genutzt wird."
 
-#: C/evolution.xml:2286(title)
+#: C/evolution.xml:2303(title)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
-#: C/evolution.xml:2287(para)
-msgid "CSV or Tab files saved using Evolution, Microsoft Outlook and Mozilla."
+#: C/evolution.xml:2304(para)
+msgid "CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
 msgstr ""
 "CSV- oder Tabulator-Dateien, die von Evolution, Microsoft Outlook und "
 "Mozilla gespeichert werden können."
 
-#: C/evolution.xml:2290(title)
+#: C/evolution.xml:2307(title)
 msgid "Microsoft Outlook Express 4 (.mbx):"
 msgstr "Microsoft Outlook Express 4 (.mbx):"
 
-#: C/evolution.xml:2291(para)
+#: C/evolution.xml:2308(para)
 msgid ""
-"The e-mail file format used by Microsoft Outlook Express 4. For other "
+"The email file format used by Microsoft Outlook Express 4. For other "
 "versions of Microsoft Outlook and Outlook Express, see the workaround "
 "described in <link linkend=\"bsawgkk\">Step 1</link>."
 msgstr ""
@@ -5700,48 +5712,48 @@ msgstr ""
 "Versionen von Microsoft Outlook und Outlook Express siehe die in <link "
 "linkend=\"bsawgkk\">Schritt 1</link> beschriebene Abhilfe."
 
-#: C/evolution.xml:2294(title)
+#: C/evolution.xml:2311(title)
 msgid "LDAP Data Interchange Format (.LDIF):"
 msgstr "LDAP Data Interchange Format (.LDIF):"
 
-#: C/evolution.xml:2295(para)
+#: C/evolution.xml:2312(para)
 msgid "A standard data format for contact cards."
 msgstr "Ein Standard-Datenformat für Visitenkarten."
 
-#: C/evolution.xml:2298(title)
+#: C/evolution.xml:2315(title)
 msgid "Berkley Mailbox (.mbox or null extension):"
 msgstr "Berkley Mailbox (.mbox oder keine Dateiendung):"
 
-#: C/evolution.xml:2299(para)
+#: C/evolution.xml:2316(para)
 msgid ""
-"The e-mail format used by Mozilla, Netscape, Evolution, Eudora*, and many "
-"other e-mail clients."
+"The email format used by Mozilla, Netscape, Evolution, Eudora*, and many "
+"other email clients."
 msgstr ""
 "Das von Mozilla, Netscape, Evolution, Eudora* und vielen anderen E-Mail-"
 "Programmen benutzte E-Mail-Dateiformat."
 
-#: C/evolution.xml:2301(para)
-msgid "To import your old e-mail:"
+#: C/evolution.xml:2318(para)
+msgid "To import your old email:"
 msgstr "Um ihre alten E-Mails zu importieren:"
 
-#: C/evolution.xml:2304(para) C/evolution.xml:2326(para)
-#: C/evolution.xml:3430(para)
+#: C/evolution.xml:2321(para) C/evolution.xml:2343(para)
+#: C/evolution.xml:3446(para)
 msgid "Click File &gt; Import."
 msgstr "Klicken Sie auf Datei &gt; Importieren."
 
-#: C/evolution.xml:2310(para)
+#: C/evolution.xml:2327(para)
 msgid "Select Import a Single File, then click Forward."
 msgstr "Wählen Sie Eine einzelne Datei importieren aus, und klicken Sie auf Vor."
 
-#: C/evolution.xml:2313(para)
+#: C/evolution.xml:2330(para)
 msgid "Select the file to import, then click Forward."
 msgstr "Wählen Sie die zu importierende Datei aus, und klicken Sie auf Vor."
 
-#: C/evolution.xml:2322(title)
+#: C/evolution.xml:2339(title)
 msgid "Importing Multiple Files"
 msgstr "Mehrere Dateien importieren"
 
-#: C/evolution.xml:2323(para)
+#: C/evolution.xml:2340(para)
 msgid ""
 "Evolution automates the import process for several applications it can "
 "recognize."
@@ -5749,13 +5761,13 @@ msgstr ""
 "Evolution automatisiert das Importieren für verschiedene Programme, welches "
 "es erkennen kann."
 
-#: C/evolution.xml:2332(para)
+#: C/evolution.xml:2349(para)
 msgid "Select Import Data and Settings From Older Programs, then click Forward."
 msgstr ""
 "Wählen Sie Daten und Einstellungen aus älteren Programmen importieren aus "
 "und klicken Sie auf Vor."
 
-#: C/evolution.xml:2333(para)
+#: C/evolution.xml:2350(para)
 msgid ""
 "Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link "
 "linkend=\"bsawf2t\">Step 5</link> to import."
@@ -5763,7 +5775,7 @@ msgstr ""
 "Folgen Sie den Schritten <link linkend=\"bsawely\">Schritt 3</link> bis "
 "<link linkend=\"bsawf2t\">Schritt 5</link> für das Importieren."
 
-#: C/evolution.xml:2334(para)
+#: C/evolution.xml:2351(para)
 msgid ""
 "Evolution searches for old mail programs and, if possible, imports the data "
 "from them."
@@ -5771,24 +5783,19 @@ msgstr ""
 "Evolution sucht nach vorherigen E-Mail-Programmen und importiert die Daten, "
 "falls möglich."
 
-#: C/evolution.xml:2338(para)
+#: C/evolution.xml:2356(para)
 msgid ""
-"Microsoft Outlook and versions of Outlook Express after version 4 use "
-"proprietary formats that Evolution cannot read or import. One migration "
-"method that works well is to use the Outport application. See <ulink url="
-"\"http://outport.sourceforge.net\">outport.sourceforge.net</ulink> for "
-"additional information. You can also import data into another Windows mail "
-"client such as Mozilla."
+"One migration method that works well is to use the Outport application. See "
+"<ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</"
+"ulink> for additional information. You can also import data into another "
+"Windows mail client such as Mozilla."
 msgstr ""
-"Microsoft Outlook und Versionen von Outlook Express nach Version 4 benutzen "
-"proprietäre Formate welche von Evolution nicht gelesen und importiert werden "
-"können. Eine zuverlässige Methode der Migration ist die Nutzung des "
-"Programmes »Outport«. Siehe <ulink url=\"http://outport.sourceforge.net"
-"\">outport.sourceforge.net</ulink> für weitere Informationen. Sie können "
-"auch die Daten in ein anderes Windows-E-Mail-Programm wie Mozilla "
-"importieren."
+"Eine zuverlässige Methode der Migration ist die Nutzung des Programmes "
+"»Outport«. Siehe <ulink url=\"http://outport.sourceforge.net\">outport."
+"sourceforge.net</ulink> für weitere Informationen. Sie können auch die Daten "
+"in ein anderes Windows-E-Mail-Programm wie Mozilla importieren."
 
-#: C/evolution.xml:2341(para)
+#: C/evolution.xml:2359(para)
 msgid ""
 "While in Windows, import your .pst files into Mozilla Mail (or another mail "
 "program such as Netscape or Eudora that uses the standard mbox format)."
@@ -5797,30 +5804,19 @@ msgstr ""
 "anderes E-Mail-Programm wie Netscape oder Eudora, welches das Standard-Mbox-"
 "Format nutzt)."
 
-#: C/evolution.xml:2342(para)
-msgid ""
-"Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders "
-"from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports "
-"and undeletes the messages in your Trash folders."
-msgstr ""
-"Mozilla- und Netscape-Benutzer sollten Datei &gt; Komprimieren &gt; Alle "
-"Ordner im Programm Netscape oder Mozilla Mail auswählen. Andernfalls "
-"importiert Evolution jegliche Nachrichten in den Papierkörben und macht das "
-"Löschen rückgängig."
-
-#: C/evolution.xml:2345(para)
+#: C/evolution.xml:2363(para)
 msgid "Copy the files to the system or partition that Evolution is installed on."
 msgstr ""
 "Kopieren Sie die Dateien auf das System oder die Partition, auf der "
 "Evolution installiert ist."
 
-#: C/evolution.xml:2348(para)
+#: C/evolution.xml:2366(para)
 msgid "Use the Evolution import tool to import the files."
 msgstr ""
 "Benutzen Sie die Import-Funktion von Evolution, um die Dateien zu "
 "importieren."
 
-#: C/evolution.xml:2351(para)
+#: C/evolution.xml:2369(para)
 msgid ""
 "For POP mail, filters are applied as messages are downloaded. For IMAP mail, "
 "filters are applied to new messages when you open the Inbox folder. On "
@@ -5838,9 +5834,9 @@ msgstr ""
 "den gesamten Ordner aus indem Sie Steuerung+A drücken und wenden Sie dann "
 "die Filter an, indem Sie Steuerung+Y drücken."
 
-#: C/evolution.xml:2357(para)
+#: C/evolution.xml:2375(para)
 msgid ""
-"Evolution helps you work by letting you sort your e-mail. To sort by sender, "
+"Evolution helps you work by letting you sort your email. To sort by sender, "
 "subject, or date, click the bars with those labels at the top of the message "
 "list. The direction of the arrow next to the label indicates the direction "
 "of the sort. Click again, to sort them in reverse order. For example, click "
@@ -5855,30 +5851,29 @@ msgstr ""
 "Spaltennamen zeigt die Richtung der Sortierung an. Klicken Sie nochmals, um "
 "in die entgegengesetzte Richtung zu sortieren. Um zum Beispiel die "
 "Nachrichten im Ordner nach dem Datum (von alt nach neu) zu sortieren, "
-"klicken Sie auf »Datum«. Klicken Sie nochmals, und die E-Mails werden von "
-"neu nach alt sortiert. Klicken Sie mit der rechten Maustaste auf die "
-"Kopfzeilen, um Spalten hinzuzufügen oder aus der Ansicht zu entfernen."
+"klicken Sie auf »Datum«. Klicken Sie nochmals, und die E-Mails werden von neu "
+"nach alt sortiert. Klicken Sie mit der rechten Maustaste auf die Kopfzeilen, "
+"um Spalten hinzuzufügen oder aus der Ansicht zu entfernen."
 
-#: C/evolution.xml:2358(para)
+#: C/evolution.xml:2376(para)
 msgid ""
-"To look at the complete headers for a message, click View &gt; Message "
-"Display &gt; Show Full Headers. To see all message data, click View &gt; "
-"Message Display &gt; Show E-Mail Source."
+"To look at the complete headers for a message, click View &gt; All Message "
+"Headers. To see all message data, click View &gt; Message Source."
 msgstr ""
 "Um alle Kopfzeilen einer Nachricht zu sehen, klicken Sie in der Menüleiste "
 "auf Ansicht &gt; Alle Nachrichtenköpfe. Um alle Nachrichtendaten zu sehen, "
 "klicken Sie auf Ansicht &gt; Nachrichten-Quelltext."
 
-#: C/evolution.xml:2361(title)
-msgid "Sorting Mail In E-mail Threads"
+#: C/evolution.xml:2379(title)
+msgid "Sorting Mail In Email Threads"
 msgstr "E-Mails sortieren in E-Mail-Threads"
 
-#: C/evolution.xml:2362(para)
+#: C/evolution.xml:2380(para)
 msgid ""
-"You can also choose a threaded message view. Click View &gt; Threaded "
-"Message List to turn the threaded view on or off. When you select this "
-"option, Evolution groups the replies to a message with the original, so you "
-"can follow the thread of a conversation from one message to the next."
+"You can also choose a threaded message view. Click View &gt; Group By "
+"Threads to turn the threaded view on or off. When you select this option, "
+"Evolution groups the replies to a message with the original, so you can "
+"follow the thread of a conversation from one message to the next."
 msgstr ""
 "Sie können sich auch die Nachrichten nach Threads sortieren lassen. Klicken "
 "Sie auf Ansicht &gt; Nach Threads gruppieren um die Thread-Sortierung ein- "
@@ -5887,7 +5882,7 @@ msgstr ""
 "Verlauf einer E-Mail-Diskussion von einer Nachricht zur darauffolgenden "
 "einfacher verfolgen können."
 
-#: C/evolution.xml:2364(para)
+#: C/evolution.xml:2382(para)
 msgid ""
 "In a thread of conversation view, each new message is stacked below of the "
 "ones that arrived before it, so that the newest message is always the one "
@@ -5903,7 +5898,7 @@ msgstr ""
 "Nachricht angezeigt. Der Thread wird immer nach dem Datum der letzten "
 "(neuesten) Nachricht in diesem Thread sortiert."
 
-#: C/evolution.xml:2366(para)
+#: C/evolution.xml:2384(para)
 msgid ""
 "There is a gconf key to toggle between the collapsed or expanded state of "
 "mail thread. By default, it is collapsed and you can change this at /apps/"
@@ -5920,11 +5915,11 @@ msgstr ""
 "alle Threads in diesem Zustand. Dies ist eine erweiterte Option für "
 "fortgeschrittene Benutzer."
 
-#: C/evolution.xml:2371(title)
+#: C/evolution.xml:2389(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "E-Mails sortieren mit Spaltenköpfen"
 
-#: C/evolution.xml:2372(para)
+#: C/evolution.xml:2390(para)
 msgid ""
 "The message list normally has columns to indicate whether a message has been "
 "read, whether it has attachments, how important it is, and the sender, date, "
@@ -5937,15 +5932,15 @@ msgstr ""
 "ändern oder Spalten entfernen und hinzufügen, indem Sie die Spalten mit der "
 "Maus ziehen und loslassen (Drag and Drop)."
 
-#: C/evolution.xml:2376(title)
+#: C/evolution.xml:2394(title)
 msgid "Sorting Mail With Column Headers"
 msgstr "E-Mails sortieren mit Spaltenüberschriften"
 
-#: C/evolution.xml:2377(para)
+#: C/evolution.xml:2395(para)
 msgid ""
 "In addition to it, Evolution enables you to sort your messages by using Sort-"
-"by list.You can use any of the criteria given in the Sort-by list such as "
-"<emphasis>sender, location, to, from, size, </emphasis>and so forth to "
+"by list. You can use any of the criteria given in the Sort-by list such as "
+"<emphasis>sender, location, to, from, size</emphasis> and so forth to "
 "perform sorting. It returns the sorted email list that matches the criteria "
 "you have selected."
 msgstr ""
@@ -5955,142 +5950,142 @@ msgstr ""
 "Sortierung nutzen. Nach Treffen der Auswahl wird die E-Mail-Liste gemäß der "
 "gewählten Auswahl sortiert."
 
-#: C/evolution.xml:2378(para)
+#: C/evolution.xml:2396(para)
 msgid "To sort messages, perform the following procedure:"
 msgstr "Um E-Mails zu sortieren, befolgen Sie folgende Schritte:"
 
-#: C/evolution.xml:2381(para)
+#: C/evolution.xml:2399(para)
 msgid "Right click message header bar."
 msgstr "Klicken Sie mit der rechten Maustaste auf die Kopfzeile der E-Mail-Liste."
 
-#: C/evolution.xml:2384(para)
+#: C/evolution.xml:2402(para)
 msgid "Click Sort by to get a list of options."
 msgstr "Wählen Sie »Sortieren nach«, um eine Liste der Möglichkeiten zu erhalten."
 
-#: C/evolution.xml:2386(title)
+#: C/evolution.xml:2404(title)
 msgid "Sort by:"
 msgstr "Sortieren nach:"
 
-#: C/evolution.xml:2387(para)
+#: C/evolution.xml:2405(para)
 msgid "Sorts the message by different criteria as listed below:"
 msgstr "Sortiert Nachrichten nach folgenden verschiedenen Merkmalen:"
 
-#: C/evolution.xml:2391(para)
+#: C/evolution.xml:2409(para)
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: C/evolution.xml:2394(para) C/evolution.xml:2400(para)
+#: C/evolution.xml:2412(para) C/evolution.xml:2418(para)
 msgid "Sender"
 msgstr "Absender"
 
-#: C/evolution.xml:2397(para)
+#: C/evolution.xml:2415(para)
 msgid "Location"
 msgstr "Ort"
 
-#: C/evolution.xml:2403(para)
+#: C/evolution.xml:2421(para)
 msgid "Due By"
 msgstr "Fällig am"
 
-#: C/evolution.xml:2406(para)
+#: C/evolution.xml:2424(para)
 msgid "Follow Up Flag"
 msgstr "Folgenachricht-Markierung"
 
-#: C/evolution.xml:2409(para)
+#: C/evolution.xml:2427(para)
 msgid "Flag Status"
 msgstr "Markierungsstatus"
 
-#: C/evolution.xml:2412(para)
+#: C/evolution.xml:2430(para)
 msgid "Size"
 msgstr "Größe"
 
-#: C/evolution.xml:2415(para)
+#: C/evolution.xml:2433(para)
 msgid "To"
 msgstr "An"
 
-#: C/evolution.xml:2418(para)
+#: C/evolution.xml:2436(para)
 msgid "Received"
 msgstr "Erhalten"
 
-#: C/evolution.xml:2421(para)
+#: C/evolution.xml:2439(para)
 msgid "Date"
 msgstr "Datum"
 
-#: C/evolution.xml:2424(para)
+#: C/evolution.xml:2442(para)
 msgid "Subject"
 msgstr "Betreff"
 
-#: C/evolution.xml:2427(para)
+#: C/evolution.xml:2445(para)
 msgid "From"
 msgstr "Von"
 
-#: C/evolution.xml:2430(para)
+#: C/evolution.xml:2448(para)
 msgid "Attachment"
 msgstr "Anlage"
 
-#: C/evolution.xml:2433(para)
+#: C/evolution.xml:2451(para)
 msgid "Score"
 msgstr "Bewertung"
 
-#: C/evolution.xml:2436(para)
+#: C/evolution.xml:2454(para)
 msgid "Flagged"
 msgstr "Markiert"
 
-#: C/evolution.xml:2439(para) C/evolution.xml:3352(para)
-#: C/evolution.xml:4191(para) C/evolution.xml:4541(para)
-#: C/evolution.xml:4737(para)
+#: C/evolution.xml:2457(para) C/evolution.xml:3368(para)
+#: C/evolution.xml:4258(para) C/evolution.xml:4609(para)
+#: C/evolution.xml:4804(para)
 msgid "Status"
 msgstr "Status"
 
-#: C/evolution.xml:2442(para)
+#: C/evolution.xml:2460(para)
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: C/evolution.xml:2446(para)
+#: C/evolution.xml:2464(para)
 msgid ""
 "Clicking each sort criteria cycles take you through three possibilities. "
 "Sort by criteria in ascending or descending order or unsort the message. "
 "When you click any of the sort criteria reiteratively, Evolution sort the "
 "messages in a sequential order - ascending, descending and unsort. For "
 "example, when you click Recepients for the first time, Evolution sort the "
-"messages by recepients in ascending order and for the second time, sort in "
+"messages by recipients in ascending order and for the second time, sort in "
 "the reverse order. For the next click, messages will be displayed unsorted."
 msgstr ""
 "Jedes Mal, wenn Sie auf ein Suchkriterium klicken, wechselt Evolution "
 "zwischen drei verschiedenen Möglichkeiten: Aufsteigend sortieren, absteigend "
 "sortieren, nicht sortieren. Wenn Sie zum Beispiel das erste Mal auf "
-"»Empfänger« klicken, werden die Nachrichten in aufsteigender Reihenfolge "
-"nach Empfängern sortiert, beim zweiten Klicken in absteigender Reihenfolge, "
-"und beim dritten Mal unsortiert."
+"»Empfänger« klicken, werden die Nachrichten in aufsteigender Reihenfolge nach "
+"Empfängern sortiert, beim zweiten Klicken in absteigender Reihenfolge, und "
+"beim dritten Mal unsortiert."
 
-#: C/evolution.xml:2449(title)
+#: C/evolution.xml:2467(title)
 msgid "Sort Ascending:"
 msgstr "Aufsteigend sortieren:"
 
-#: C/evolution.xml:2450(para)
+#: C/evolution.xml:2468(para)
 msgid ""
-"Sorts the messages top to bottom and returns you the sorted e-mail list in "
+"Sorts the messages top to bottom and returns you the sorted message list in "
 "the order of oldest to the latest."
 msgstr ""
 "Sortiert Nachrichten von oben nach unten und stellt die E-Mail-Liste mit der "
 "ältesten Nachricht zuerst und der neuesten Nachricht zuletzt dar."
 
-#: C/evolution.xml:2453(title)
+#: C/evolution.xml:2471(title)
 msgid "Sort Descending:"
 msgstr "Absteigend sortieren:"
 
-#: C/evolution.xml:2454(para)
+#: C/evolution.xml:2472(para)
 msgid ""
-"Sort descending revers the order and returns you the sorted e-mail list in "
+"Sort descending revers the order and returns you the sorted message list in "
 "the order of newest to oldest."
 msgstr ""
 "Sortiert Nachrichten von unten nach oben und stellt die E-Mail-Liste mit der "
 "ältesten Nachricht zuletzt und der neuesten Nachricht zuerst dar."
 
-#: C/evolution.xml:2457(title)
+#: C/evolution.xml:2475(title)
 msgid "Unsort:"
 msgstr "Nicht sortieren:"
 
-#: C/evolution.xml:2458(para)
+#: C/evolution.xml:2476(para)
 msgid ""
 "Unsort removes sorting from this column, reverting to the order of messages "
 "as they were added to the folder."
@@ -6098,11 +6093,11 @@ msgstr ""
 "Nicht sortieren entfernt die Sortierung aus dieser Spalte und sortiert die "
 "Nachricht so, wie sie zu dem Ordner hinzugefügt wurden."
 
-#: C/evolution.xml:2461(title)
+#: C/evolution.xml:2479(title)
 msgid "Removing a Column:"
 msgstr "Eine Spalte entfernen:"
 
-#: C/evolution.xml:2462(para)
+#: C/evolution.xml:2480(para)
 msgid ""
 "Remove this column from the display. You can also remove columns by dragging "
 "the header off the list and letting it drop."
@@ -6111,11 +6106,11 @@ msgstr ""
 "indem Sie den Spaltenkopf mit der linken Maustaste aus der Liste entfernen "
 "und dann die Maustaste loslassen."
 
-#: C/evolution.xml:2465(title)
+#: C/evolution.xml:2483(title)
 msgid "Adding a Column:"
 msgstr "Eine Spalte hinzufügen:"
 
-#: C/evolution.xml:2466(para)
+#: C/evolution.xml:2484(para)
 msgid ""
 "When you select this item, a dialog box appears, listing the possible "
 "columns. Drag the column you want into a space between existing column "
@@ -6126,11 +6121,11 @@ msgstr ""
 "zwei existierenden Spaltenköpfen, an der die Spalte hinzugefügt werden soll. "
 "Ein roter Pfeil zeigt Ihnen, wo die Spalte hinzugefügt werden wird."
 
-#: C/evolution.xml:2469(title)
+#: C/evolution.xml:2487(title)
 msgid "Best Fit:"
 msgstr "Optimal"
 
-#: C/evolution.xml:2470(para)
+#: C/evolution.xml:2488(para)
 msgid ""
 "Automatically adjusts the widths of the columns for the most efficient use "
 "of space."
@@ -6138,11 +6133,11 @@ msgstr ""
 "Bestimmt automatisch die beste Spaltenbreite, um den vorhandenen Platz am "
 "besten zu nutzen."
 
-#: C/evolution.xml:2473(title)
+#: C/evolution.xml:2491(title)
 msgid "Customizing the Current View:"
 msgstr "Aktuelle Ansicht anpassen:"
 
-#: C/evolution.xml:2474(para)
+#: C/evolution.xml:2492(para)
 msgid ""
 "Choose this item to pick a more complex sort order for messages, or to "
 "choose which columns of information about your messages you want to display."
@@ -6151,21 +6146,21 @@ msgstr ""
 "vorzunehmen, oder um auszuwählen, welche Spalten und Felder angezeigt werden "
 "sollen."
 
-#: C/evolution.xml:2478(para)
-msgid "Select the search criteria."
-msgstr "Wählen Sie die Suchkriterien aus."
+#: C/evolution.xml:2496(para)
+msgid "Select the search criteria from the list."
+msgstr "Wählen Sie das Suchkriterium aus der Liste aus."
 
-#: C/evolution.xml:2479(para)
+#: C/evolution.xml:2497(para)
 msgid "You can view the messages in the desired order in the message list."
 msgstr ""
 "Sie können Nachrichten in der gewünschten Sortierung in der Nachrichtenliste "
 "betrachten."
 
-#: C/evolution.xml:2485(title)
+#: C/evolution.xml:2503(title)
 msgid "Using the Follow up Feature"
 msgstr "Die Folgenachricht-Funktion benutzen"
 
-#: C/evolution.xml:2486(para)
+#: C/evolution.xml:2504(para)
 msgid ""
 "To make sure you don't forget about a message, you can use the Follow up "
 "feature."
@@ -6173,45 +6168,45 @@ msgstr ""
 "Damit Sie keine wichtigen Nachrichten vergessen, können Sie die "
 "Folgenachricht-Funktion benutzen."
 
-#: C/evolution.xml:2489(para)
+#: C/evolution.xml:2507(para)
 msgid "Select one or more messages."
 msgstr "Wählen Sie eine oder mehrere Nachrichten aus."
 
-#: C/evolution.xml:2492(para)
+#: C/evolution.xml:2510(para)
 msgid "Right-click one of the messages."
 msgstr "Klicken Sie mit rechts auf diese Nachrichten."
 
-#: C/evolution.xml:2495(para)
+#: C/evolution.xml:2513(para)
 msgid "Click Mark for Follow Up."
 msgstr "Wählen Sie »Als Folgenachricht markieren«"
 
-#: C/evolution.xml:2498(para)
+#: C/evolution.xml:2516(para)
 msgid "You can also open the Flag to Follow Up window by"
 msgstr "Sie können das nun angezeigte Fenster auch öffnen, indem Sie"
 
-#: C/evolution.xml:2501(para)
+#: C/evolution.xml:2519(para)
 msgid "Select the messages."
 msgstr "Wählen Sie die Nachrichten aus."
 
-#: C/evolution.xml:2504(para)
+#: C/evolution.xml:2522(para)
 msgid "Select Message menu."
 msgstr "Wählen Sie »Nachricht« in der Menüleiste aus."
 
-#: C/evolution.xml:2507(para)
+#: C/evolution.xml:2525(para)
 msgid "Click Mark as."
 msgstr "Wählen Sie »Markieren als«."
 
-#: C/evolution.xml:2510(para)
+#: C/evolution.xml:2528(para)
 msgid "Select Follow Up or press Shift+Ctrl+G."
 msgstr "Wählen Sie »Folgenachricht« aus drücken Sie Umschalttaste+Steuerung+G."
 
-#: C/evolution.xml:2511(para)
+#: C/evolution.xml:2529(para)
 msgid "A dialog box opens to allow you to set the type of flag and the due date."
 msgstr ""
 "Es öffnet sich ein Fenster, in welchem sie den Typ der Folgenachricht und "
 "das Fälligkeitsdatum bestimmen können."
 
-#: C/evolution.xml:2515(para)
+#: C/evolution.xml:2533(para)
 msgid ""
 "The flag itself is the action you want to remind yourself about. Several are "
 "provided for you, such as Call, Forward, and Reply, but you can enter your "
@@ -6221,7 +6216,7 @@ msgstr ""
 "Es werden mehrere Aktionen bereitgestellt (wie Anrufen, Weiterleiten, "
 "Antworten), aber Sie können auch Ihre eigene Aktion eintragen."
 
-#: C/evolution.xml:2516(para)
+#: C/evolution.xml:2534(para)
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
 "entirely by right-clicking the message, then click either Flag Completed or "
@@ -6232,18 +6227,18 @@ msgstr ""
 "auf die Nachricht klicken und dann »Als abgeschlossen markieren« oder "
 "»Markierung löschen« wählen."
 
-#: C/evolution.xml:2517(para)
+#: C/evolution.xml:2535(para)
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
-"before the message headers. An overdue message might tell you “Overdue: Call "
-"by April 07, 2003, 5:00 PM.”"
+"before the message headers. An overdue message might tell you "
+"<quote>Overdue: Call by April 07, 2003, 5:00 PM.</quote>"
 msgstr ""
 "Wenn Sie eine markierte Nachricht betrachten, so wird der Status der "
 "Markierung oberhalb des Nachrichtenkopfes angezeigt. Eine überfällige "
-"Nachricht wird folgendermaßen angezeigt &ldquo;Überfällig: Anruf am 07. "
-"April, 5:00&ldquo;"
+"Nachricht wird folgendermaßen angezeigt <quote>Überfällig: Anruf am 07. "
+"April, 5:00</quote>"
 
-#: C/evolution.xml:2518(para)
+#: C/evolution.xml:2536(para)
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
 "might add a Flag Status column to your message list and sort that way. "
@@ -6258,15 +6253,15 @@ msgstr ""
 "Nach dem Markieren abgeschlossener Aufgaben enthält der Suchordner nur noch "
 "Nachrichten mit noch nicht überfälligen Terminen."
 
-#: C/evolution.xml:2520(title)
+#: C/evolution.xml:2538(title)
 msgid "Mark as Important Feature:"
 msgstr "Als wichtig markieren:"
 
-#: C/evolution.xml:2521(para)
+#: C/evolution.xml:2539(para)
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
 "them as important by right-clicking the message, then click Mark as "
-"Important or Select Message &gt; Mark as &gt;Important."
+"Important or Select Message &gt; Mark as &gt; Important from the menubar."
 msgstr ""
 "Falls Sie einen einfacheren Weg bevorzugen um sich selbst an Nachrichten zu "
 "erinnern, so können Sie diese als wichtig markieren, indem Sie mit der "
@@ -6274,7 +6269,7 @@ msgstr ""
 "wählen, oder indem Sie in der Menüleiste auf Nachricht &gt; Markieren als "
 "&gt; Wichtig auswählen."
 
-#: C/evolution.xml:2528(para)
+#: C/evolution.xml:2546(para)
 msgid ""
 "Evolution, like most other mail systems, stores mail in folders. You start "
 "out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can "
@@ -6288,11 +6283,11 @@ msgstr ""
 "Ordner &gt; Neu auswählen, oder indem Sie mit der rechten Maustaste in der "
 "Seitenleiste auf einen Ordner klicken und »Ordner anlegen« auswählen."
 
-#: C/evolution.xml:2529(para)
+#: C/evolution.xml:2547(para)
 msgid ""
 "When you click OK, your new folder appears in the folder view. You can then "
-"move the messages to it by dragging and dropping them, or right click &gt; "
-"Move to folder or press Shift+Ctrl+V."
+"move the messages to it by dragging and dropping them, or right click on the "
+"message and choose Move to folder, or press Shift+Ctrl+V."
 msgstr ""
 "Nachdem Sie OK geklickt haben erscheint der neue Ordner in der Seitenleiste. "
 "Sie können nun Nachrichten in diesen Ordner verschieben, indem Sie diese mit "
@@ -6300,17 +6295,17 @@ msgstr ""
 "eine Nachricht klicken und »In Ordner verschieben« auswählen, oder indem Sie "
 "Umschalttaste+Steuerung+V drücken."
 
-#: C/evolution.xml:2530(para)
+#: C/evolution.xml:2548(para)
 msgid ""
 "You can also drop the messages to a particular folder by selecting Message "
-"&gt; Move to folder or press Shift+Ctrl +V. This will open Select folder "
-"window, where you can drop your message to any of the folders listed."
+"&gt; Move to folder. This will open the Select folder window, where you can "
+"drop your message to any of the folders listed."
 msgstr ""
 "Sie können auch Nachrichten in einen Ordner verschieben, indem Sie in der "
 "Menüleiste Nachricht &gt; In Ordner verschieben auswählen. Sie erhalten nun "
 "das Dialogfenster »Ordner wählen«."
 
-#: C/evolution.xml:2532(para)
+#: C/evolution.xml:2550(para)
 msgid ""
 "If you want to create a new folder click New at the bottom left of the "
 "window. Specify the location and enter the label of the folder at the entry "
@@ -6323,28 +6318,29 @@ msgstr ""
 "verschieben, indem Sie den Ordner auswählen und unten rechts auf den "
 "Verschieben-Knopf klicken."
 
-#: C/evolution.xml:2533(para)
+#: C/evolution.xml:2551(para)
 msgid ""
 "If you create a filter with the filter assistant, you can have mail filed "
-"automatically. For that select Edit &gt; Message Filters to appear Message "
-"Filters window"
+"automatically. Select Edit &gt; Message Filters to bring up the Message "
+"Filters window."
 msgstr ""
 "Falls Sie einen Filter mit dem Filter-Assistenten erstellen, so werden E-"
 "Mails automatisch einsortiert. Wählen Sie in der Menüleiste Bearbeiten &gt; "
 "Nachrichtenfilter, damit das »Nachrichtenfilter«-Fenster angezeigt wird."
 
-#: C/evolution.xml:2535(para)
+#: C/evolution.xml:2553(para)
 msgid ""
-"Click the Add tab to appear Add Rule window from where you can set different "
-"criteria for filtering messages. For more information refer <link linkend="
-"\"usage-mail-org-filters-new\">Creating New Filter Rules</link>."
+"Click on the Add button to bring up the Add Rule window from where you can "
+"set different criteria for filtering messages. For additional information on "
+"filtering, see <link linkend=\"usage-mail-org-filters-new\">Creating New "
+"Filter Rules</link>."
 msgstr ""
 "Klicken Sie auf den Hinzufügen-Knopf, damit das »Regel hinzufügen«-Fenster "
 "angezeigt wird, in dem Sie verschiedene Kriterien für das Filtern von "
 "Nachrichten definieren können. Für weitere Informationen siehe <link linkend="
 "\"usage-mail-org-filters-new\">Neue Nachrichtenfilter erstellen</link>."
 
-#: C/evolution.xml:2537(para)
+#: C/evolution.xml:2555(para)
 msgid ""
 "The Inbox folder on most IMAP servers cannot contain both subfolders and "
 "messages. When you create additional folders on your IMAP mail server, "
@@ -6361,7 +6357,7 @@ msgstr ""
 "Nachrichten in Ihrem Eingangsordner zu lesen, bis Sie die Unterordner "
 "entfernt haben."
 
-#: C/evolution.xml:2543(para)
+#: C/evolution.xml:2561(para)
 msgid ""
 "Most email clients can search the message for you, but Evolution does it "
 "differently and efficiently giving you faster search result with Quick "
@@ -6372,13 +6368,13 @@ msgstr ""
 "Ergebnisse per schneller Suche, individueller Suche und erweiterter Suche "
 "präsentiert werden."
 
-#: C/evolution.xml:2545(title) C/evolution.xml:3292(title)
-#: C/evolution.xml:4122(title) C/evolution.xml:4430(title)
-#: C/evolution.xml:4674(title)
+#: C/evolution.xml:2563(title) C/evolution.xml:3308(title)
+#: C/evolution.xml:4190(title) C/evolution.xml:4498(title)
+#: C/evolution.xml:4742(title)
 msgid "Quick Search:"
 msgstr "Schnelle Suche:"
 
-#: C/evolution.xml:2546(para)
+#: C/evolution.xml:2564(para)
 msgid ""
 "Quick Search displays all the messages that match the in-built criteria you "
 "selected from the drop-down list at the top left side, just above the "
@@ -6388,78 +6384,88 @@ msgstr ""
 "Kriterien passen, welche Sie aus der Auswahlliste links oben, direkt über "
 "der Nachrichtenliste, auswählen können."
 
-#: C/evolution.xml:2548(para) C/evolution.xml:4125(para)
-msgid "To perform quick search, perform the following procedure:"
-msgstr "Führen Sie die folgenden Schritte aus, um eine schnelle Suche durchzuführen:"
+#: C/evolution.xml:2566(para)
+msgid "To perform a quick search, perform the following procedure:"
+msgstr ""
+"Führen Sie die folgenden Schritte aus, um eine schnelle Suche durchzuführen:"
 
-#: C/evolution.xml:2551(para)
-msgid "Click Show to expand the drop-down list."
-msgstr "Klicken Sie neben »Anzeigen« auf die Auswahlliste."
+#: C/evolution.xml:2569(para) C/evolution.xml:2648(para)
+#: C/evolution.xml:3271(para) C/evolution.xml:3314(para)
+#: C/evolution.xml:4142(para) C/evolution.xml:4458(para)
+#: C/evolution.xml:4694(para)
+msgid ""
+"Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
+"stock_search.png\"/> to expand the drop-down list."
+msgstr ""
+"Klicken Sie auf das Such-Symbol <inlinegraphic format=\"PNG\" fileref="
+"\"figures/stock_search.png\"/> um den Suchtypen auszuwählen."
 
-#: C/evolution.xml:2554(para)
-msgid "Select the search criteria from the list"
-msgstr "Wählen Sie das Suchkriterium aus der folgenden Liste aus:"
+#: C/evolution.xml:2572(para) C/evolution.xml:3317(para)
+#: C/evolution.xml:4198(para) C/evolution.xml:4540(para)
+#: C/evolution.xml:4750(para)
+msgid "Select the search criteria from the list:"
+msgstr "Wählen Sie das Suchkriterium aus der Liste aus:"
 
-#: C/evolution.xml:2557(para)
+#: C/evolution.xml:2575(para)
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: C/evolution.xml:2560(para)
+#: C/evolution.xml:2578(para)
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: C/evolution.xml:2563(para)
+#: C/evolution.xml:2581(para)
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: C/evolution.xml:2566(para) C/evolution.xml:2608(para)
+#: C/evolution.xml:2584(para) C/evolution.xml:2626(para)
 msgid "Important"
 msgstr "Wichtig"
 
-#: C/evolution.xml:2569(para) C/evolution.xml:2611(para)
+#: C/evolution.xml:2587(para) C/evolution.xml:2629(para)
 msgid "Work"
 msgstr "Geschäftlich"
 
-#: C/evolution.xml:2572(para) C/evolution.xml:2614(para)
-#: C/evolution.xml:3346(para) C/evolution.xml:4185(para)
-#: C/evolution.xml:4535(para) C/evolution.xml:4731(para)
-#: C/evolution.xml:5348(para)
+#: C/evolution.xml:2590(para) C/evolution.xml:2632(para)
+#: C/evolution.xml:3362(para) C/evolution.xml:4252(para)
+#: C/evolution.xml:4603(para) C/evolution.xml:4798(para)
+#: C/evolution.xml:5368(para)
 msgid "Personal"
 msgstr "Persönlich"
 
-#: C/evolution.xml:2575(para) C/evolution.xml:2617(para)
+#: C/evolution.xml:2593(para) C/evolution.xml:2635(para)
 msgid "To do"
 msgstr "Zu erledigen"
 
-#: C/evolution.xml:2578(para) C/evolution.xml:2620(para)
+#: C/evolution.xml:2596(para) C/evolution.xml:2638(para)
 msgid "Later"
 msgstr "Später"
 
-#: C/evolution.xml:2581(para)
+#: C/evolution.xml:2599(para)
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: C/evolution.xml:2584(para)
+#: C/evolution.xml:2602(para)
 msgid "Recent Messages"
 msgstr "Letzte Nachrichten"
 
-#: C/evolution.xml:2587(para)
+#: C/evolution.xml:2605(para)
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: C/evolution.xml:2590(para)
+#: C/evolution.xml:2608(para)
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: C/evolution.xml:2593(para)
+#: C/evolution.xml:2611(para)
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: C/evolution.xml:2596(para)
+#: C/evolution.xml:2614(para)
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: C/evolution.xml:2601(para)
+#: C/evolution.xml:2619(para)
 msgid ""
 "Evolution displays the messages matching the criteria present in the shown "
 "message list"
@@ -6467,10 +6473,10 @@ msgstr ""
 "Evolution zeigt Ihnen all jene Nachrichten in der Nachrichtenliste an, auf "
 "die die gewählten Kriterien zutreffen."
 
-#: C/evolution.xml:2605(para)
+#: C/evolution.xml:2623(para)
 msgid ""
 "The following labels need not necessarily be the same as the default names "
-"listed here.You can change the name of these labels by selecting Edit &gt; "
+"listed here. You can change the name of these labels by selecting Edit &gt; "
 "Preferences &gt; Mail Preferences &gt; Colors."
 msgstr ""
 "Die folgenden Beschriftungen stimmen gegebenenfalls nicht überein mit den "
@@ -6478,33 +6484,25 @@ msgstr ""
 "indem Sie in der Menüleiste Bearbeiten &gt; Einstellungen &gt; E-Mail-"
 "Einstellungen &gt; Farben aufrufen."
 
-#: C/evolution.xml:2625(title) C/evolution.xml:3250(title)
-#: C/evolution.xml:4068(title) C/evolution.xml:4385(title)
-#: C/evolution.xml:4620(title)
+#: C/evolution.xml:2643(title) C/evolution.xml:3266(title)
+#: C/evolution.xml:4137(title) C/evolution.xml:4453(title)
+#: C/evolution.xml:4689(title)
 msgid "Customized Search:"
 msgstr "Individuelle Suche:"
 
-#: C/evolution.xml:2626(para)
+#: C/evolution.xml:2644(para)
 msgid ""
-"Evolution allows you to perform customized search.To search for a message "
+"Evolution allows you to perform customized search. To search for a message "
 "use the following procedure:"
 msgstr ""
 "Evolution ermöglicht eine individuelle Suche. Führen Sie die folgenden "
 "Schritte durch, um nach einer Nachricht zu suchen:"
 
-#: C/evolution.xml:2630(para)
-msgid ""
-"Click search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"stock_search.png\"/> to specify the search type."
-msgstr ""
-"Klicken Sie auf das Such-Symbol <inlinegraphic format=\"PNG\" fileref="
-"\"figures/stock_search.png\"/> um den Suchtypen auszuwählen."
-
-#: C/evolution.xml:2632(title)
+#: C/evolution.xml:2650(title)
 msgid "Subject or Sender Contain:"
 msgstr "Betreff oder Absender enthält:"
 
-#: C/evolution.xml:2633(para)
+#: C/evolution.xml:2651(para)
 msgid ""
 "Finds messages that contain the search text in the subject or sender. It "
 "does not search in the message body."
@@ -6512,77 +6510,79 @@ msgstr ""
 "Findet Nachrichten, die den gesuchten Text im Betreff oder im Absender "
 "enthalten. Es wird nicht im Nachrichtenrumpf gesucht."
 
-#: C/evolution.xml:2636(title)
+#: C/evolution.xml:2654(title)
 msgid "Recipients Contain:"
 msgstr "Empfänger enthalten:"
 
-#: C/evolution.xml:2637(para)
+#: C/evolution.xml:2655(para)
 msgid "Finds messages with the search text in the To: and Cc: headers."
 msgstr ""
 "Findet Nachrichten, die den gesuchten Text in der An:- oder in der Kopie:-"
 "Zeile enthalten."
 
-#: C/evolution.xml:2640(title)
+#: C/evolution.xml:2658(title)
 msgid "Message Contains:"
 msgstr "Nachricht enthält:"
 
-#: C/evolution.xml:2641(para)
+#: C/evolution.xml:2659(para)
 msgid "Searches the message body and all headers for the specified text."
-msgstr "Durchsucht den Inhalt und alle Kopfzeilen der Nachricht nach dem angegebenen Text."
+msgstr ""
+"Durchsucht den Inhalt und alle Kopfzeilen der Nachricht nach dem angegebenen "
+"Text."
 
-#: C/evolution.xml:2644(title)
+#: C/evolution.xml:2662(title)
 msgid "Subject Contain:"
 msgstr "Betreff enthält:"
 
-#: C/evolution.xml:2645(para)
+#: C/evolution.xml:2663(para)
 msgid "Shows messages where the search text is in the subject line."
 msgstr "Zeigt Nachrichten an, die den gesuchten Text im Betreff enthalten."
 
-#: C/evolution.xml:2648(title)
+#: C/evolution.xml:2666(title)
 msgid "Sender Contain:"
 msgstr "Absender enthält:"
 
-#: C/evolution.xml:2649(para)
+#: C/evolution.xml:2667(para)
 msgid "Finds messages whose From: header contains a match for your search text."
 msgstr "Findet Nachrichten, die den gesuchten Text im Absender enthalten."
 
-#: C/evolution.xml:2652(title)
+#: C/evolution.xml:2670(title)
 msgid "Body Contains:"
 msgstr "Rumpf enthält:"
 
-#: C/evolution.xml:2653(para)
+#: C/evolution.xml:2671(para)
 msgid "Searches only in message text, not any other header."
 msgstr ""
 "Findet Nachrichten, die den gesuchten Text im Nachrichtenrumpf enthalten, "
 "aber nicht in einer Kopfzeile."
 
-#: C/evolution.xml:2657(para)
+#: C/evolution.xml:2675(para)
 msgid "Click the drop-down list to select the scope"
 msgstr "Klicken Sie in die Auswahlliste um den Suchumfang auszuwählen"
 
-#: C/evolution.xml:2660(para)
+#: C/evolution.xml:2678(para)
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: C/evolution.xml:2663(para)
+#: C/evolution.xml:2681(para)
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: C/evolution.xml:2666(para)
+#: C/evolution.xml:2684(para)
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: C/evolution.xml:2669(para)
+#: C/evolution.xml:2687(para)
 msgid "Current Message"
 msgstr "Derzeitige Nachricht"
 
-#: C/evolution.xml:2674(para)
+#: C/evolution.xml:2692(para)
 msgid "Type the search string in the search entry and press Enter."
 msgstr ""
 "Geben Sie im Suchfeld den Begriff ein, nachdem Sie suchen möchten, und "
 "drücken Sie die Eingabetaste."
 
-#: C/evolution.xml:2676(para)
+#: C/evolution.xml:2694(para)
 msgid ""
 "The folder list will be disabled while you perform search on All Accounts or "
 "Current Account."
@@ -6590,7 +6590,7 @@ msgstr ""
 "Die Ordnerliste ist inaktiv, während Sie in allen Konten oder im derzeitigen "
 "Konto suchen."
 
-#: C/evolution.xml:2680(para)
+#: C/evolution.xml:2698(para)
 msgid ""
 "Evolution shows your search results in the message list. You might want to "
 "create a search folder instead; see <link linkend=\"usage-mail-organize-"
@@ -6601,16 +6601,17 @@ msgstr ""
 "\"usage-mail-organize-vfolders\">Suchordner benutzen</link> für weitere "
 "Informationen."
 
-#: C/evolution.xml:2682(para)
+#: C/evolution.xml:2700(para) C/evolution.xml:3306(para)
 msgid ""
-"To clear your search click the Clear button or menu, or enter a blank "
+"To clear your search you can click the Clear icon in the search string "
+"field, or choose Search &gt; Clear from the menubar, or enter a blank "
 "search. You can also press Shift+Ctrl+Q to clear the search."
 msgstr ""
 "Um die Suche zu löschen, klicken Sie auf das kleine Symbol rechts im "
 "Suchfeld, führen Sie eine leere Suche durch, wählen Sie »Suchen &gt; "
 "Verwerfen« in der Menüleiste aus, oder drücken Sie Umschalttaste+Steuerung+Q."
 
-#: C/evolution.xml:2685(para)
+#: C/evolution.xml:2703(para)
 msgid ""
 "You can even perform a quick search on a customized search results as it "
 "just filters and displays the messages in the message list."
@@ -6619,28 +6620,33 @@ msgstr ""
 "individuellen Suche durchführen, da die schnelle Suche nur innerhalb der "
 "bereits in der Nachrichtenliste angezeigten Nachrichten durchgeführt wird."
 
-#: C/evolution.xml:2688(title) C/evolution.xml:4094(title)
-#: C/evolution.xml:4411(title) C/evolution.xml:4646(title)
+#: C/evolution.xml:2706(title) C/evolution.xml:4163(title)
+#: C/evolution.xml:4479(title) C/evolution.xml:4715(title)
 msgid "Advanced Search:"
 msgstr "Erweiterte Suche:"
 
-#: C/evolution.xml:2689(para)
-msgid "To perform advanced search,"
-msgstr "Um eine erweiterte Suche durchführen,"
+#: C/evolution.xml:2707(para) C/evolution.xml:4164(para)
+#: C/evolution.xml:4480(para) C/evolution.xml:4716(para)
+msgid "You can perform an advanced search based on any of the search types."
+msgstr ""
+"Sie können auch eine erweiterte Suche basierend auf den zuvor genannten "
+"Suchtypen durchführen (also eine Suche innerhalb des vorherigen "
+"Suchergebnisses)."
 
-#: C/evolution.xml:2693(para)
-msgid "Select Search menu"
+#: C/evolution.xml:2711(para) C/evolution.xml:4168(para)
+#: C/evolution.xml:4484(para)
+msgid "Select the Search menu."
 msgstr "Wählen Sie »Suchen« in der Menüleiste."
 
-#: C/evolution.xml:2696(para)
-msgid "Click Advanced Search to open Advanced Search dialogue box"
+#: C/evolution.xml:2714(para)
+msgid "Click Advanced Search to open Advanced Search dialog box."
 msgstr "Wählen Sie »Erweiterte Suche«."
 
-#: C/evolution.xml:2701(para)
+#: C/evolution.xml:2719(para)
 msgid "Enter the Search name."
 msgstr "Geben Sie einen Suchnamen ein."
 
-#: C/evolution.xml:2704(para)
+#: C/evolution.xml:2722(para)
 msgid ""
 "Click Add to add rules. For more information on rules, refer <link linkend="
 "\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A "
@@ -6650,15 +6656,15 @@ msgstr ""
 "über Filter siehe <link linkend=\"bsazsjd\">Schritt 4</link> unter <link "
 "linkend=\"vfolder-create\">Einen Suchordner erstellen</link>."
 
-#: C/evolution.xml:2710(para)
+#: C/evolution.xml:2728(para)
 msgid "Press Save to save your search results."
 msgstr "Wählen Sie »Speichern« um Ihre Suchergebnisse zu speichern."
 
-#: C/evolution.xml:2714(title)
+#: C/evolution.xml:2732(title)
 msgid "Save Search:"
 msgstr "Suche speichern:"
 
-#: C/evolution.xml:2715(para)
+#: C/evolution.xml:2733(para)
 msgid ""
 "To save your search results other than from advanced search, select Search "
 "&gt; Save Search. You can view the label of your search results listed under "
@@ -6668,31 +6674,31 @@ msgstr ""
 "in der Menüleiste aus. Sie können danach die Suche bequem aus dem Suchen-"
 "Menü in der Menüleiste auswählen."
 
-#: C/evolution.xml:2718(title)
+#: C/evolution.xml:2736(title)
 msgid "Edit Saved Searches:"
 msgstr "Gespeicherte Suchen bearbeiten:"
 
-#: C/evolution.xml:2719(para)
-msgid "To edit your saved searches"
-msgstr "Um ihre gespeicherten Suchen zu bearbeiten:"
+#: C/evolution.xml:2737(para)
+msgid "To edit your saved searches,"
+msgstr "Um ihre gespeicherten Suchen zu bearbeiten,"
 
-#: C/evolution.xml:2723(para)
-msgid "Select Search"
-msgstr "Klicken Sie auf Suchen in der Menüleiste."
+#: C/evolution.xml:2741(para)
+msgid "Select Search from the menu bar."
+msgstr "Wählen Sie »Suchen« in der Menüleiste."
 
-#: C/evolution.xml:2726(para)
-msgid "Click Edit Saved Searches to open Searches dialogue box."
+#: C/evolution.xml:2744(para)
+msgid "Click Edit Saved Searches to open the Searches dialog box."
 msgstr ""
 "Wählen Sie Gespeicherte Suchen bearbeiten aus. Das »Suchen«-Fenster öffnet "
 "sich."
 
-#: C/evolution.xml:2731(para)
-msgid "Click Edit tab to edit to open Edit Rule dialogue box"
+#: C/evolution.xml:2749(para)
+msgid "Click the Edit button to open the Edit Rule dialog box."
 msgstr ""
 "Klicken Sie auf den Bearbeiten-Knopf. Das »Regel bearbeiten«-Fenster öffnet "
 "sich."
 
-#: C/evolution.xml:2732(para)
+#: C/evolution.xml:2750(para)
 msgid ""
 "You can also add or remove Searches from the list by using the respective "
 "buttons available at the right."
@@ -6700,11 +6706,11 @@ msgstr ""
 "Sie können auch Suchen hinzufügen oder aus der Liste entfernen, indem Sie "
 "die jeweiligen Knöpfe benutzen."
 
-#: C/evolution.xml:2737(para)
-msgid "Edit the title or search criteria from the dialogue box."
+#: C/evolution.xml:2755(para)
+msgid "Edit the title or search criteria from the dialog box."
 msgstr "Ändern Sie den Suchnamen oder die gewünschten Suchkriterien."
 
-#: C/evolution.xml:2747(para)
+#: C/evolution.xml:2765(para)
 msgid ""
 "Filters work very much like the mail room in a large company. Their purpose "
 "is to bundle, sort, and distribute mail to the various folders. In addition, "
@@ -6720,29 +6726,29 @@ msgstr ""
 "einer Nachricht in mehrere Ordner kopieren, oder eine Kopie behalten und "
 "eine weitere Kopie an eine andere Person verschicken."
 
-#: C/evolution.xml:2750(title)
+#: C/evolution.xml:2768(title)
 msgid "Creating New Filter Rules"
 msgstr "Neue Nachrichtenfilter erstellen"
 
-#: C/evolution.xml:2753(para) C/evolution.xml:2957(para)
-#: C/evolution.xml:2972(para)
+#: C/evolution.xml:2771(para) C/evolution.xml:2975(para)
+#: C/evolution.xml:2990(para)
 msgid "Click Edit &gt; Message Filters."
 msgstr "Klicken Sie auf Bearbeiten &gt; Nachrichtenfilter"
 
-#: C/evolution.xml:2756(para) C/evolution.xml:3007(para)
-#: C/evolution.xml:4964(para) C/evolution.xml:5592(para)
+#: C/evolution.xml:2774(para) C/evolution.xml:3025(para)
+#: C/evolution.xml:5031(para) C/evolution.xml:5612(para)
 msgid "Click Add."
 msgstr "Klicken Sie auf Hinzufügen."
 
-#: C/evolution.xml:2759(para)
+#: C/evolution.xml:2777(para)
 msgid "Type a name for the filter in the Rule name field."
 msgstr "Geben Sie einen Suchnamen ein für die Regel."
 
-#: C/evolution.xml:2764(para)
-msgid "Define the criteria for the filter in the If section."
-msgstr "Bestimmen Sie dir Kriterien für den Filter."
+#: C/evolution.xml:2782(para)
+msgid "Define the criteria for the filter in the first section."
+msgstr "Bestimmen Sie die Kriterien für den Filter."
 
-#: C/evolution.xml:2765(para)
+#: C/evolution.xml:2783(para)
 msgid ""
 "For each of the filter criteria, you must first select which parts of the "
 "message you want to filter:"
@@ -6750,82 +6756,83 @@ msgstr ""
 "Für jedes Kriterium müssen Sie zunächst bestimmen, welche Bereiche der "
 "Nachricht gefiltert werden sollen:"
 
-#: C/evolution.xml:2767(title) C/evolution.xml:3017(title)
+#: C/evolution.xml:2785(title) C/evolution.xml:3035(title)
 msgid "Sender:"
 msgstr "Absender:"
 
-#: C/evolution.xml:2768(para)
-msgid "The sender's address."
-msgstr "Die E-Mail-Adresse und der Absendername des Absenders."
+#: C/evolution.xml:2786(para)
+msgid "The sender's email address or the name of the sender."
+msgstr "Die E-Mail-Adresse oder der Name des Absenders."
 
-#: C/evolution.xml:2771(title)
+#: C/evolution.xml:2789(title)
 msgid "Recipient:"
 msgstr "Empfänger:"
 
-#: C/evolution.xml:2772(para) C/evolution.xml:3022(para)
+#: C/evolution.xml:2790(para) C/evolution.xml:3040(para)
 msgid "The recipients of the message."
 msgstr "Die Empfänger der Nachricht."
 
-#: C/evolution.xml:2775(title) C/evolution.xml:3025(title)
+#: C/evolution.xml:2793(title) C/evolution.xml:3043(title)
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: C/evolution.xml:2776(para) C/evolution.xml:3026(para)
+#: C/evolution.xml:2794(para) C/evolution.xml:3044(para)
 msgid "The subject line of the message."
 msgstr "Die Betreffzeile der Nachricht."
 
-#: C/evolution.xml:2779(title)
+#: C/evolution.xml:2797(title)
 msgid "Specific Header:"
 msgstr "Bestimmte Kopfzeile:"
 
-#: C/evolution.xml:2780(para)
+#: C/evolution.xml:2798(para)
 msgid "Any header including custom ones."
 msgstr "Eine jegliche Kopfzeile."
 
-#: C/evolution.xml:2782(para)
+#: C/evolution.xml:2800(para)
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
 "second time. For example, if a message declares the Resent-From: header as "
-"“engineering@example.com” and then restates it as “marketing@example.com,” "
-"Evolution filters as though the second declaration did not occur. To filter "
-"on messages that use headers multiple times, use a regular expression."
+"<quote>engineering@example.com</quote> and then restates it as "
+"<quote>marketing@example.com,</quote> Evolution filters as though the second "
+"declaration did not occur. To filter on messages that use headers multiple "
+"times, use a regular expression."
 msgstr ""
 "Falls eine Nachricht die gleiche Kopfzeile mehr als einmal benutzt, so nutzt "
 "Evolution nur das erste Auftreten dieser Kopfzeile, selbst wenn die "
 "Nachricht im zweiten Header einen anderen Wert besitzt. Wenn zum Beispiel "
-"eine Nachricht die Kopfzeile Resent-From: als &ldquo;engineering@example."
-"com&rdquo; und dann nochmals als  &ldquo;marketing@example.com,&rdquo; "
+"eine Nachricht die Kopfzeile Resent-From: als <quote>engineering@example."
+"com</quote> und dann nochmals als <quote>marketing@example.com,</quote> "
 "definiert, so filtert Evolution als ob der zweite Wert nicht existiert. "
 "Benutzen Sie reguläre Ausdrücke, um Nachrichten die die gleichen Kopfzeilen "
 "mehr als einmal nutzen zu filtern."
 
-#: C/evolution.xml:2784(title) C/evolution.xml:3029(title)
+#: C/evolution.xml:2802(title) C/evolution.xml:3047(title)
 msgid "Message Body:"
 msgstr "Nachrichtenrumpf:"
 
-#: C/evolution.xml:2785(para) C/evolution.xml:3030(para)
+#: C/evolution.xml:2803(para) C/evolution.xml:3048(para)
 msgid "Searches in the actual text of the message."
 msgstr "Sucht im Nachrichtentext der Nachricht."
 
-#: C/evolution.xml:2788(title)
+#: C/evolution.xml:2806(title)
 msgid "Expression:"
 msgstr "Ausdruck:"
 
-#: C/evolution.xml:2789(para)
+#: C/evolution.xml:2807(para)
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
-"in the Scheme language, used to define filters in Evolution."
+"in the Scheme language used to define filters in Evolution."
 msgstr ""
 "(Nur für Programmierer) Vergleiche eine Nachricht mit einem in der "
 "Programmiersprache Scheme geschriebenen Ausdruck (Evolution definiert seine "
 "Filter in Scheme)."
 
-#: C/evolution.xml:2792(title) C/evolution.xml:3037(title)
+#: C/evolution.xml:2810(title) C/evolution.xml:3055(title)
 msgid "Date Sent:"
 msgstr "Verschickt-Datum:"
 
-#: C/evolution.xml:2793(para) C/evolution.xml:3038(para)
+#: C/evolution.xml:2811(para) C/evolution.xml:3056(para)
 msgid ""
 "Filters messages according to the date on which they were sent. First, "
 "choose the conditions you want a message to meet, such as before a given "
@@ -6844,11 +6851,11 @@ msgstr ""
 "einem relativen Zeitpunkt gefiltert werden, also zum Beispiel zwei oder vier "
 "Tage zuvor."
 
-#: C/evolution.xml:2796(title) C/evolution.xml:3041(title)
+#: C/evolution.xml:2814(title) C/evolution.xml:3059(title)
 msgid "Date Received:"
 msgstr "Empfangsdatum:"
 
-#: C/evolution.xml:2797(para) C/evolution.xml:3042(para)
+#: C/evolution.xml:2815(para) C/evolution.xml:3060(para)
 msgid ""
 "This works the same way as the Date Sent option, except that it compares the "
 "time you received the message with the dates you specify."
@@ -6857,24 +6864,24 @@ msgstr ""
 "dass hierbei der Zeitpunkt verglichen wird, an dem Sie die Nachricht "
 "erhalten haben."
 
-#: C/evolution.xml:2800(title) C/evolution.xml:3045(title)
+#: C/evolution.xml:2818(title) C/evolution.xml:3063(title)
 msgid "Label:"
 msgstr "Beschriftung:"
 
-#: C/evolution.xml:2801(para)
+#: C/evolution.xml:2819(para) C/evolution.xml:3064(para)
 msgid ""
 "Messages can have labels of Important, Work, Personal, To Do, or Later. You "
-"can set tables with other filters or by hand."
+"can set labels with other filters or manually."
 msgstr ""
 "Nachrichten können Beschriftungen wie Wichtig, Geschäftlich, Persönlich, Zu "
 "erledigen oder Später haben. Sie können Beschriftungen durch Filter oder per "
 "Hand anwenden."
 
-#: C/evolution.xml:2804(title) C/evolution.xml:3049(title)
+#: C/evolution.xml:2822(title) C/evolution.xml:3067(title)
 msgid "Score:"
 msgstr "Bewertung:"
 
-#: C/evolution.xml:2805(para) C/evolution.xml:3050(para)
+#: C/evolution.xml:2823(para) C/evolution.xml:3068(para)
 msgid ""
 "Sets the message score to any whole number greater than 0. You can have one "
 "filter set or change a message score, and then set up another filter to move "
@@ -6889,19 +6896,19 @@ msgstr ""
 "handelt sich nur um eine Nummer, die Sie Nachrichten zuweisen können, damit "
 "andere Filter diese weiterverarbeiten können."
 
-#: C/evolution.xml:2808(title) C/evolution.xml:3053(title)
+#: C/evolution.xml:2826(title) C/evolution.xml:3071(title)
 msgid "Size:"
 msgstr "Größe:"
 
-#: C/evolution.xml:2809(para) C/evolution.xml:3054(para)
+#: C/evolution.xml:2827(para) C/evolution.xml:3072(para)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Sortiert gemäß der Größe der Nachricht in Kilobyte."
 
-#: C/evolution.xml:2812(title) C/evolution.xml:3057(title)
+#: C/evolution.xml:2830(title) C/evolution.xml:3075(title)
 msgid "Status:"
 msgstr "Status:"
 
-#: C/evolution.xml:2813(para) C/evolution.xml:3058(para)
+#: C/evolution.xml:2831(para) C/evolution.xml:3076(para)
 msgid ""
 "Filters according to the status of a message. The status can be Replied To, "
 "Draft, Important, Read, or Junk."
@@ -6909,27 +6916,27 @@ msgstr ""
 "Filtert gemäß dem Status einer Nachricht, der Beantwortet, Entwurf, Wichtig, "
 "Gelesen, oder Unerwünscht sein kann."
 
-#: C/evolution.xml:2816(title)
+#: C/evolution.xml:2834(title)
 msgid "Flagged:"
 msgstr "Folgenachricht:"
 
-#: C/evolution.xml:2817(para) C/evolution.xml:3062(para)
+#: C/evolution.xml:2835(para) C/evolution.xml:3080(para)
 msgid "Checks whether the message is flagged for follow-up."
 msgstr "Prüft ob eine Nachricht eine Folgemarkierung besitzt."
 
-#: C/evolution.xml:2820(title) C/evolution.xml:3065(title)
+#: C/evolution.xml:2838(title) C/evolution.xml:3083(title)
 msgid "Attachments:"
 msgstr "Anlagen:"
 
-#: C/evolution.xml:2821(para) C/evolution.xml:3066(para)
-msgid "Creates a filter based on whether there is an attachment for the e-mail."
+#: C/evolution.xml:2839(para) C/evolution.xml:3084(para)
+msgid "Creates a filter based on whether there is an attachment for the email."
 msgstr "Filtert je nachdem, ob eine Nachricht einen Anhang besitzt."
 
-#: C/evolution.xml:2824(title)
+#: C/evolution.xml:2842(title)
 msgid "Mailing List"
 msgstr "Mailingliste"
 
-#: C/evolution.xml:2825(para) C/evolution.xml:3070(para)
+#: C/evolution.xml:2843(para) C/evolution.xml:3088(para)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -6943,11 +6950,11 @@ msgstr ""
 "stammen, die diese Kopfzeile nicht korrekt benutzen, werden von diesem "
 "Filter nicht erkannt."
 
-#: C/evolution.xml:2828(title)
+#: C/evolution.xml:2846(title)
 msgid "Regex Match:"
 msgstr "Regex-Treffer:"
 
-#: C/evolution.xml:2829(para)
+#: C/evolution.xml:2847(para)
 msgid ""
 "If you know your way around a <link linkend=\"regular-expression\">regex</"
 "link>, or regular expression, this option allows you to search for complex "
@@ -6965,11 +6972,11 @@ msgstr ""
 "darüber, wie reguläre Ausdrücke genutzt werden können, siehe die Manpage für "
 "das grep-Kommando."
 
-#: C/evolution.xml:2832(title)
+#: C/evolution.xml:2850(title)
 msgid "Source Account:"
 msgstr "Quellkonto:"
 
-#: C/evolution.xml:2833(para)
+#: C/evolution.xml:2851(para)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
@@ -6977,11 +6984,11 @@ msgstr ""
 "Filtert Nachrichten gemäß dem Server, von dem sie stammen. Dies ist "
 "nützlich, falls Sie mehrere POP-Konten besitzen."
 
-#: C/evolution.xml:2836(title) C/evolution.xml:2920(title)
+#: C/evolution.xml:2854(title) C/evolution.xml:2938(title)
 msgid "Pipe to Program:"
 msgstr "An Programm weiterleiten:"
 
-#: C/evolution.xml:2837(para)
+#: C/evolution.xml:2855(para)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
@@ -6993,59 +7000,52 @@ msgstr ""
 "ganzzahligen Wert als Rückgabewert liefern. Dies kann zum Beispiel zum "
 "Filtern unerwünschter Nachrichten oder für einen Virusscanner genutzt werden."
 
-#: C/evolution.xml:2840(title)
+#: C/evolution.xml:2858(title)
 msgid "Junk Test:"
 msgstr "Unerwünscht-Test:"
 
-#: C/evolution.xml:2841(para)
+#: C/evolution.xml:2859(para)
 msgid "Filters based on the results of the junk mail test."
 msgstr "Filtert gemäß den Ergebnissen des Unerwünscht (Spam)-Tests."
 
-#: C/evolution.xml:2844(title)
+#: C/evolution.xml:2862(title)
 msgid "Select the Criteria for the Condition:"
 msgstr "Wählen Sie die Kriterien für die Bedingung:"
 
-#: C/evolution.xml:2845(para)
+#: C/evolution.xml:2863(para)
 msgid ""
-"If you want multiple criteria for this filter, click Add Criterion and "
-"repeat step 4."
+"If you want multiple criteria for this filter, click Add and repeat step 4."
 msgstr ""
 "Falls Sie mehrere Kriterien für diesen Filter erzeugen möchten, so klicken "
 "Sie auf Hinzufügen und wiederholen Sie Schritt 4."
 
-#: C/evolution.xml:2848(title)
+#: C/evolution.xml:2866(title)
 msgid "Select the Actions for the Filter in the Then Section:"
 msgstr "Wählen Sie die Aktionen für den Filter unter »Dann« aus:"
 
-#: C/evolution.xml:2849(para)
+#: C/evolution.xml:2867(para)
 msgid "Select any of the following options."
 msgstr "Wählen Sie eine der folgenden Optionen."
 
-#: C/evolution.xml:2854(title)
+#: C/evolution.xml:2872(title)
 msgid "Move to Folder:"
 msgstr "In Ordner verschieben:"
 
-#: C/evolution.xml:2855(para)
-msgid ""
-"Moves the message into a folder you specify. Click Here to select the "
-"destination folder."
-msgstr ""
-"Verschiebt eine Nachrichten in einer anderen Ordner, den Sie auswählen "
-"können."
+#: C/evolution.xml:2873(para)
+msgid "Moves the message into a folder you specify."
+msgstr "Verschiebt die Nachricht in einen Ordner ihrer Wahl."
 
-#: C/evolution.xml:2860(title)
+#: C/evolution.xml:2878(title)
 msgid "Copy to Folder:"
 msgstr "In Ordner kopieren:"
 
-#: C/evolution.xml:2861(para)
-msgid ""
-"Puts a copy of the message into a folder you specify. Click Here to select "
-"the destination folder."
+#: C/evolution.xml:2879(para)
+msgid "Puts a copy of the message into a folder you specify."
 msgstr ""
 "Erzeugt eine Kopie einer Nachricht in einer anderen Ordner, den Sie "
 "auswählen können."
 
-#: C/evolution.xml:2867(para)
+#: C/evolution.xml:2885(para)
 msgid ""
 "Marks the message for deletion. The message can be undeleted until you "
 "expunge or empty the trash."
@@ -7054,45 +7054,48 @@ msgstr ""
 "werden, solange sie nicht den betroffenen Ordner gesäubert oder den Müll "
 "geleert haben."
 
-#: C/evolution.xml:2872(title)
+#: C/evolution.xml:2890(title)
 msgid "Stop Processing:"
 msgstr "Verarbeitung stoppen:"
 
-#: C/evolution.xml:2873(para)
-msgid "Select this if you want to have all other filters ignore this message."
+#: C/evolution.xml:2891(para)
+msgid ""
+"Select this if you want to all other filters ignore this message. Note that "
+"only filters listed after this particular rule will be ignored."
 msgstr ""
 "Wählen Sie dies aus, falls alle darauffolgenden Filter nicht mehr auf die "
 "Nachricht angewendet werden sollen."
 
-#: C/evolution.xml:2878(title)
+#: C/evolution.xml:2896(title)
 msgid "Assign Color:"
 msgstr "Farbe zuweisen:"
 
-#: C/evolution.xml:2879(para)
+#: C/evolution.xml:2897(para)
 msgid "Marks the message with a color of your choice."
 msgstr "Markiert die Nachricht mit einer Farbe ihrer Wahl."
 
-#: C/evolution.xml:2884(title)
+#: C/evolution.xml:2902(title)
 msgid "Assign Score:"
 msgstr "Bewertung zuweisen:"
 
-#: C/evolution.xml:2885(para)
+#: C/evolution.xml:2903(para)
 msgid "Assigns the message a numeric score."
 msgstr "Teilt der Nachricht eine Zahlenbewertung zu."
 
-#: C/evolution.xml:2890(title)
+#: C/evolution.xml:2908(title)
 msgid "Adjust Score:"
 msgstr "Bewertung anpassen:"
 
-#: C/evolution.xml:2891(para)
+#: C/evolution.xml:2909(para)
 msgid "Changes the numeric score by the amount you set."
-msgstr "Ändert die Zahlenbewertung einer Nachricht um den von Ihnen bestimmten Wert."
+msgstr ""
+"Ändert die Zahlenbewertung einer Nachricht um den von Ihnen bestimmten Wert."
 
-#: C/evolution.xml:2896(title)
+#: C/evolution.xml:2914(title)
 msgid "Set Status:"
 msgstr "Status setzen:"
 
-#: C/evolution.xml:2897(para)
+#: C/evolution.xml:2915(para)
 msgid ""
 "Sets the status of the message. The status can be Replied To, Draft, "
 "Important, Read, or Junk."
@@ -7100,11 +7103,11 @@ msgstr ""
 "Setzt den Status einer Nachricht. Der Status kann Beantwortet, Entwurf, "
 "Wichtig, Gelesen, oder Unerwünscht sein."
 
-#: C/evolution.xml:2902(title)
+#: C/evolution.xml:2920(title)
 msgid "Unset Status:"
 msgstr "Status nicht setzen:"
 
-#: C/evolution.xml:2903(para)
+#: C/evolution.xml:2921(para)
 msgid ""
 "If the message has a status value, unsets it. If a status value is not set, "
 "it does nothing."
@@ -7112,26 +7115,26 @@ msgstr ""
 "Entfernt einen vorhandenen Status einer Nachricht. Falls kein Status gesetzt "
 "ist, so geschieht nichts."
 
-#: C/evolution.xml:2908(title)
+#: C/evolution.xml:2926(title)
 msgid "Beep:"
 msgstr "Warnton:"
 
-#: C/evolution.xml:2909(para)
+#: C/evolution.xml:2927(para)
 msgid "Makes the system beep."
 msgstr "Läßt den Computer einen Warnton ausgeben."
 
-#: C/evolution.xml:2914(title)
+#: C/evolution.xml:2932(title)
 msgid "Play Sound:"
 msgstr "Klang abspielen:"
 
-#: C/evolution.xml:2915(para)
+#: C/evolution.xml:2933(para)
 msgid "Select a sound file for Evolution to play."
 msgstr "Wählen Sie eine Klangdatei, die von Evolution gespielt werden soll."
 
-#: C/evolution.xml:2921(para)
+#: C/evolution.xml:2939(para)
 msgid ""
 "Sends the message to a program of your choice. No return value is expected. "
-"This feature can be used to create automatic Web postings from e-mail "
+"This feature can be used to create automatic Web postings from email "
 "messages or to perform additional message post processing not supported by "
 "Evolution."
 msgstr ""
@@ -7141,33 +7144,34 @@ msgstr ""
 "Weiterverarbeitung der E-Mail durchzuführen, die von Evolution selbst in "
 "dieser Form nicht unterstützt wird."
 
-#: C/evolution.xml:2926(title)
+#: C/evolution.xml:2944(title)
 msgid "Run Program:"
 msgstr "Programm ausführen:"
 
-#: C/evolution.xml:2927(para)
+#: C/evolution.xml:2945(para)
 msgid "Evolution runs an application."
 msgstr "Läßt Evolution eine Anwendung ausführen."
 
-#: C/evolution.xml:2933(para)
-msgid "Click Add Action if you need multiple actions and click OK."
+#: C/evolution.xml:2951(para)
+msgid "Click Add if you need multiple actions and click OK."
 msgstr ""
 "Wählen Sie Hinzufügen, wenn Sie mehrere Aktionen benötigen, und klicken Sie "
 "auf OK."
 
-#: C/evolution.xml:2939(para)
+#: C/evolution.xml:2957(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
 msgstr "Es gibt einen schnellen Weg, um Filter oder Suchordner zu erstellen:"
 
-#: C/evolution.xml:2942(para)
-msgid "Right-click the message in the e-mail list."
-msgstr "Klicken Sie mit der rechten Maustaste auf die Nachricht in der E-Mail-Liste."
+#: C/evolution.xml:2960(para)
+msgid "Right-click the message in the message list."
+msgstr ""
+"Klicken Sie mit der rechten Maustaste auf die Nachricht in der E-Mail-Liste."
 
-#: C/evolution.xml:2945(para)
-msgid "Select one of the items under the Create Rule from the Message submenu."
+#: C/evolution.xml:2963(para)
+msgid "Select one of the items under the Create Rule From Message submenu."
 msgstr "Wählen Sie eine der Optionen unter »Regel aus Nachricht anlegen« aus."
 
-#: C/evolution.xml:2946(para)
+#: C/evolution.xml:2964(para)
 msgid ""
 "Creating a rule based on a message opens the filter creation tool with some "
 "of the information about the message already filled in for your convenience."
@@ -7176,7 +7180,7 @@ msgstr ""
 "in welchem einige Informationen bereits der Einfachheit halber eingetragen "
 "sind."
 
-#: C/evolution.xml:2949(para)
+#: C/evolution.xml:2967(para)
 msgid ""
 "If you have several filters that match a single message, they are all "
 "applied to the message in order, unless one of the filters has the Stop "
@@ -7189,7 +7193,7 @@ msgstr ""
 "benutzen, so wird die Nachricht nicht mehr von darauffolgenden Filtern "
 "verarbeitet."
 
-#: C/evolution.xml:2950(para)
+#: C/evolution.xml:2968(para)
 msgid ""
 "When you first open the Filters dialog box, you are shown the list of "
 "filters sorted in the order in which they will be applied. You can move them "
@@ -7200,31 +7204,32 @@ msgstr ""
 "Filter in der Reihenfolge hoch- und herunterbewegen, indem Sie die »Hoch«- "
 "und »Runter«-Knöpfe benutzen."
 
-#: C/evolution.xml:2954(title)
+#: C/evolution.xml:2972(title)
 msgid "Editing Filters"
 msgstr "Filter bearbeiten"
 
-#: C/evolution.xml:2960(para)
+#: C/evolution.xml:2978(para)
 msgid "Select the filter to edit, then click Edit."
 msgstr "Wählen Sie den zu bearbeitenden Filter und klicken Sie auf Bearbeiten."
 
-#: C/evolution.xml:2963(para)
+#: C/evolution.xml:2981(para)
 msgid "Make the desired corrections, then click OK twice."
-msgstr "Führen Sie die gewünschten Änderungen durch und klicken Sie zweimal auf OK."
+msgstr ""
+"Führen Sie die gewünschten Änderungen durch und klicken Sie zweimal auf OK."
 
-#: C/evolution.xml:2969(title)
+#: C/evolution.xml:2987(title)
 msgid "Deleting Filters"
 msgstr "Filter löschen"
 
-#: C/evolution.xml:2975(para)
+#: C/evolution.xml:2993(para)
 msgid "Select the filter to remove, then click Remove."
 msgstr "Wählen Sie den zu löschenden Filter aus und klicken Sie auf Entfernen."
 
-#: C/evolution.xml:2986(para)
+#: C/evolution.xml:3004(para)
 msgid ""
 "If filters aren't flexible enough, or you find yourself performing the same "
 "search again and again, consider a search folder. Search folders are an "
-"advanced way of viewing your e-mail messages within Evolution. If you get a "
+"advanced way of viewing your email messages within Evolution. If you get a "
 "lot of mail or often forget where you put messages, search folders can help "
 "you keep things organized."
 msgstr ""
@@ -7233,9 +7238,9 @@ msgstr ""
 "Verfahren, um bestimmte E-Mails in Evolution einfacher und schneller "
 "angezeigt zu bekommen. Falls Sie viele E-Mails erhalten oder oft vergessen, "
 "wo sich eine bestimmte E-Mail befindet, können Ihnen Suchfilter bei der "
-"Organisation Ihrer Arbeit dabei behilflich sein"
+"Organisation Ihrer Arbeit dabei behilflich sein."
 
-#: C/evolution.xml:2987(para)
+#: C/evolution.xml:3005(para)
 msgid ""
 "A search folder is really a hybrid of all the other organizational tools: it "
 "looks like a folder, it acts like a search, and you set it up like a filter. "
@@ -7251,7 +7256,7 @@ msgstr ""
 "befinden. Die in einem Suchordner angezeigten Nachrichten werden bestimmt "
 "durch eine Anzahl von Kriterien, die Sie zuvor ausgewählt haben."
 
-#: C/evolution.xml:2988(para)
+#: C/evolution.xml:3006(para)
 msgid ""
 "As messages that meet the search folder criteria arrive or are deleted, "
 "Evolution automatically adjusts the search folder contents. When you delete "
@@ -7264,7 +7269,7 @@ msgstr ""
 "löschen, so wird diese aus dem normalen Ordner gelöscht, in dem sich die "
 "Nachricht befindet, und wird nicht mehr im jeweiligen Suchordner angezeigt."
 
-#: C/evolution.xml:2989(para)
+#: C/evolution.xml:3007(para)
 msgid ""
 "The Unmatched Search Folder is the opposite of other search folders: it "
 "displays all messages that do not appear in other search folders."
@@ -7273,9 +7278,9 @@ msgstr ""
 "Suchordner: Er zeigt all jene Nachrichten an, die in keinem anderen "
 "Suchordner angezeigt werden."
 
-#: C/evolution.xml:2990(para)
+#: C/evolution.xml:3008(para)
 msgid ""
-"If you use remote e-mail storage like IMAP or Microsoft Exchange, and have "
+"If you use remote email storage like IMAP or Microsoft Exchange, and have "
 "created search folders to search through them, the Unmatched Search Folder "
 "also searches the remote folders. If you do not create any search folders "
 "that search remote mail stores, the Unmatched Search Folder does not search "
@@ -7288,17 +7293,18 @@ msgstr ""
 "(nicht-lokale) E-Mails durchsuchen sollen, so sind diese auch nicht im "
 "»Nicht einsortiert«-Suchordner enthalten."
 
-#: C/evolution.xml:2991(para)
+#: C/evolution.xml:3009(para)
 msgid ""
 "As an example of using folders, searches, and search folders, consider the "
-"following: To organize his mailbox, Jim sets up a search folder for e-mail "
+"following: To organize his mailbox, Jim sets up a search folder for email "
 "from his friend and co-worker Anna. He has another search folder for "
 "messages that have novell.com in the address and Evolution in the subject "
 "line, so he can keep a record of what people from work send him about "
 "Evolution. If Anna sends him a message about anything other than Evolution, "
-"it only shows up in the “Anna” search folder. When Anna sends him mail about "
-"the user interface for Evolution, he can see the message both in the “Anna” "
-"search folder and in the “Internal Evolution Discussion” search folder."
+"it only shows up in the <quote>Anna</quote> search folder. When Anna sends "
+"him mail about the user interface for Evolution, he can see the message both "
+"in the <quote>Anna</quote> search folder and in the <quote>Internal "
+"Evolution Discussion</quote> search folder."
 msgstr ""
 "Ein Beispiel für die Nutzung von Ordnern, Suchen, und Suchordnern: Um seine "
 "E-Mails zu organisieren erstellt Berthold einen Suchordner für E-Mails "
@@ -7306,17 +7312,17 @@ msgstr ""
 "Nachrichten die »novell.com« in der Adresse und »Evolution« in der "
 "Betreffzeile haben, damit er einfach sehen kann, was ihm Leute von der "
 "Arbeit über Evolution schicken. Wenn Marianne ihm eine Nachricht über etwas "
-"anderes als Evolution schickt, so wird diese Nachricht im &ldquo;"
-"Marianne&rdquo;-Suchordner angezeigt. Wenn ihm Marianne eine Nachricht über "
-"die Benutzeroberfläche von Evolution schickt, so wird diese Nachricht sowohl "
-"im &ldquo;Anna&rdquo;-Suchordner als auch im &ldquo;Interne Evolution-"
-"Diskussion&rdquo;-Suchordner angezeigt."
+"anderes als Evolution schickt, so wird diese Nachricht im <quote>Marianne</"
+"quote>-Suchordner angezeigt. Wenn ihm Marianne eine Nachricht über die "
+"Benutzeroberfläche von Evolution schickt, so wird diese Nachricht sowohl im "
+"<quote>Anna</quote>-Suchordner als auch im <quote>Interne Evolution-"
+"Diskussion</quote>-Suchordner angezeigt."
 
-#: C/evolution.xml:2994(title)
+#: C/evolution.xml:3012(title)
 msgid "Creating A Search Folder"
 msgstr "Einen Suchordner erstellen"
 
-#: C/evolution.xml:2997(para)
+#: C/evolution.xml:3015(para)
 msgid ""
 "Click Message &gt; Create Rule, then select a search folder based on "
 "Subject, Sender, Recipient, or Mailing List."
@@ -7325,11 +7331,11 @@ msgstr ""
 "dann einen Suhordner basierend auf Betreff, Absender, Empfänger oder "
 "Mailingliste aus."
 
-#: C/evolution.xml:2999(para)
+#: C/evolution.xml:3017(para)
 msgid "Select Search menu &gt; Create Search Folder From Search."
 msgstr "Wählen Sie in der Menüleiste Suchen &gt; Suchordner aus Suche anlegen."
 
-#: C/evolution.xml:3001(para)
+#: C/evolution.xml:3019(para)
 msgid ""
 "Perform this operation from the search results. Create a search folder from "
 "search is enabled only when you already have performed a search."
@@ -7338,15 +7344,15 @@ msgstr ""
 "Suchordners aus den Suchergebnissen ist nur möglich, wenn Sie bereits eine "
 "Suche durchgeführt haben."
 
-#: C/evolution.xml:3004(para)
+#: C/evolution.xml:3022(para)
 msgid "Select Edit &gt; Search Folder"
 msgstr "Wählen Sie in der Menüleiste Bearbeiten &gt; Suchordner"
 
-#: C/evolution.xml:3012(para)
+#: C/evolution.xml:3030(para)
 msgid "Type the name of the search folder in the Search name field."
 msgstr "Geben Sie einen Namen für den Suchordner im Feld »Suchname« ein."
 
-#: C/evolution.xml:3015(para)
+#: C/evolution.xml:3033(para)
 msgid ""
 "Select your search criteria. For each criterion, you must first select which "
 "of the following parts of the message you want the search to examine. The "
@@ -7357,63 +7363,53 @@ msgstr ""
 "soll. Die Kriterien sind fast gleich mit den Kriterien, die für Filter "
 "angeboten werden."
 
-#: C/evolution.xml:3018(para)
+#: C/evolution.xml:3036(para)
 msgid "Sender's address."
 msgstr "Absender."
 
-#: C/evolution.xml:3021(title)
+#: C/evolution.xml:3039(title)
 msgid "Recipients:"
 msgstr "Empfänger:"
 
-#: C/evolution.xml:3033(title)
-msgid "Expression:(For programmers only)"
+#: C/evolution.xml:3051(title)
+msgid "Expression (For programmers only):"
 msgstr "Regex-Treffer (nur für Programmierer):"
 
-#: C/evolution.xml:3034(para)
+#: C/evolution.xml:3052(para)
 msgid ""
 "Match a message according to an expression you write in the Scheme language "
 "used to define filters in Evolution."
 msgstr ""
-"Vergleiche eine Nachricht mit einem in der "
-"Programmiersprache Scheme geschriebenen Ausdruck (Evolution definiert seine "
-"Filter in Scheme)."
+"Vergleiche eine Nachricht mit einem in der Programmiersprache Scheme "
+"geschriebenen Ausdruck (Evolution definiert seine Filter in Scheme)."
 
-#: C/evolution.xml:3046(para)
-msgid ""
-"Messages can have labels of Important, Work, Personal, To Do, or Later. You "
-"can set labels with other filters or manually."
-msgstr ""
-"Nachrichten können Beschriftungen wie Wichtig, Geschäftlich, Persönlich, Zu "
-"erledigen oder Später haben. Sie können Beschriftungen durch Filter oder per "
-"Hand anwenden."
-
-#: C/evolution.xml:3061(title)
+#: C/evolution.xml:3079(title)
 msgid "Follow Up:"
 msgstr "Folgenachricht-Markierung"
 
-#: C/evolution.xml:3069(title)
+#: C/evolution.xml:3087(title)
 msgid "Mailing List:"
 msgstr "Mailingliste:"
 
-#: C/evolution.xml:3073(title)
+#: C/evolution.xml:3091(title)
 msgid "Match all:"
 msgstr "Falls alle Kriterien zutreffen:"
 
-#: C/evolution.xml:3074(para)
+#: C/evolution.xml:3092(para)
 msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Prüft, ob alle ausgewählten Kriterien auf die Nachricht zutreffen."
 
-#: C/evolution.xml:3078(para)
-msgid "Select the folders where this search folder will search. Your options are:"
+#: C/evolution.xml:3096(para)
+msgid "Select which folders will be used for the search folder. Your options are:"
 msgstr ""
 "Wählen Sie, welche Ordner für den Suchordner genutzt werden sollen. "
 "Verfügbar sind:"
 
-#: C/evolution.xml:3080(title)
+#: C/evolution.xml:3098(title)
 msgid "All local folders:"
 msgstr "Alle lokalen Ordner:"
 
-#: C/evolution.xml:3081(para)
+#: C/evolution.xml:3099(para)
 msgid ""
 "Uses all local folders for the search folder source in addition to "
 "individual folders that are selected."
@@ -7421,11 +7417,11 @@ msgstr ""
 "Benutzt alle lokalen Ordner als Suchordner-Quellen, zusätzlich zu den "
 "ausgewählten individuellen Ordnern."
 
-#: C/evolution.xml:3084(title)
+#: C/evolution.xml:3102(title)
 msgid "All active remote folders:"
 msgstr "Alle aktiven entfernten Ordner"
 
-#: C/evolution.xml:3085(para)
+#: C/evolution.xml:3103(para)
 msgid ""
 "Remote folders are considered active if you are connected to the server; you "
 "must be connected to your mail server for the search folder to include any "
@@ -7437,11 +7433,11 @@ msgstr ""
 "der Suchordner auch Nachrichten aus den entfernten Ordner beinhaltet, "
 "zusätzlich zu den ausgewählten individuellen Ordnern."
 
-#: C/evolution.xml:3088(title)
+#: C/evolution.xml:3106(title)
 msgid "All local and active remote folders:"
 msgstr "Alle lokalen und aktiven entfernten Ordner:"
 
-#: C/evolution.xml:3089(para)
+#: C/evolution.xml:3107(para)
 msgid ""
 "Uses all local and active remote folders for the search folder source in "
 "addition to individual folders that are selected."
@@ -7449,29 +7445,29 @@ msgstr ""
 "Benutzt alle lokalen und aktiven nicht-loaklen Ordner als Suchordner-"
 "Quellen, zusätzlich zu den ausgewählten individuellen Ordnern."
 
-#: C/evolution.xml:3092(title)
+#: C/evolution.xml:3110(title)
 msgid "Specific folders only:"
 msgstr "Bestimmte Ordner:"
 
-#: C/evolution.xml:3093(para)
+#: C/evolution.xml:3111(para)
 msgid "Uses individual folders for the search folder source."
 msgstr "Benutzt nur individuellen Ordner als Suchordner-Quellen."
 
-#: C/evolution.xml:3095(para)
+#: C/evolution.xml:3113(para)
 msgid "If you select Specific folders only,"
 msgstr "Falls Sie nur Bestimmte Ordner gewählt haben,"
 
-#: C/evolution.xml:3098(para)
+#: C/evolution.xml:3116(para)
 msgid "click Add button to open the Select folder window."
 msgstr ""
 "Klicken Sie auf den Hinzufügen-Knopf, um das Fenster zur Ordnerauswahl zu "
 "öffnen."
 
-#: C/evolution.xml:3105(para)
+#: C/evolution.xml:3123(para)
 msgid "Select the folder and press Add button."
 msgstr "Wählen Sie den Ordner und klicken Sie auf Hinzufügen."
 
-#: C/evolution.xml:3108(para)
+#: C/evolution.xml:3126(para)
 msgid ""
 "You can view the folder added to the list in the entry box at the bottom of "
 "the New Search Folder window."
@@ -7479,10 +7475,10 @@ msgstr ""
 "Der zur Liste hinzugefügte Ordner wird im Eingabefeld unten im Fenster "
 "angezeigt."
 
-#: C/evolution.xml:3119(para)
+#: C/evolution.xml:3137(para)
 msgid ""
-"Evolution can check for junk mail for you. Evolution uses SpamAssassin* and/ "
-"or Bogofilter* with trainable Bayesian filters to perform the spam check. "
+"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
+"or Bogofilter with trainable Bayesian filters to perform the spam check. "
 "When the software detects mail that appears to be junk mail, it will flag it "
 "and hide it from your view. Messages that are flagged as junk mail are "
 "displayed only in the Junk folder."
@@ -7494,12 +7490,12 @@ msgstr ""
 "nicht im jeweiligen normalen E-Mail-Ordner, sondern einzig im Unerwünscht-"
 "Ordner angezeigt."
 
-#: C/evolution.xml:3120(para)
+#: C/evolution.xml:3138(para)
 msgid ""
 "The junk mail filter can learn which kinds of mail are legitimate and which "
 "are not if you train it. When you first start using junk mail blocking, "
 "check the Junk folder to be sure that legitimate mail doesn't get flagged as "
-"junk mail. If good mail, is incorrectly flagged, remove it from the Junk "
+"junk mail. If good mail is incorrectly flagged, remove it from the Junk "
 "folder by right-clicking it and selecting Mark as Not Junk or press Shift"
 "+Ctrl+J. If Evolution misses junk mail, right-click the message, then click "
 "Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize "
@@ -7517,7 +7513,7 @@ msgstr ""
 "mehr Sie korrigieren, desto besser kann der Filter ähnliche Nachrichten in "
 "der Zukunft erkennen und zuverlässiger arbeiten."
 
-#: C/evolution.xml:3121(para)
+#: C/evolution.xml:3139(para)
 msgid ""
 "Every filter needs to learn at the least 100 spam and 100 ham to start "
 "working. For that, you must mark each message manually by clicking the "
@@ -7525,23 +7521,28 @@ msgid ""
 "The <emphasis>Junk</emphasis> button learns a message as spam."
 msgstr ""
 "Jeder Filter muss zunächst 100 unerwünschte Nachrichten (»Spam«) und 100 "
-"erwünschte Nachrichten (»Ham«) lernen, um zu funktionieren. Hierzu müssen "
-"Sie erwünschte Nachrichten markieren und den »Erwünscht«-Knopf in der "
+"erwünschte Nachrichten (»Ham«) lernen, um zu funktionieren. Hierzu müssen Sie "
+"erwünschte Nachrichten markieren und den »Erwünscht«-Knopf in der "
 "Werkzeugleiste klicken. Der »Unerwünscht«-Knopf markiert eine unerwünschte "
 "Nachricht als Spam."
 
-#: C/evolution.xml:3122(para)
+#: C/evolution.xml:3140(para)
 msgid ""
 "To change your junk mail filtering preferences, click Edit &gt; Preferences, "
-"then click Mail Preferences. For more information on this see, <link linkend="
-"\"mail-prefs-junk\">Junk Mail Preferences</link>."
+"then click Mail Preferences."
 msgstr ""
-"Um die Einstellungen für Unerwünschte E-Mails zu ändern, klicken Sie auf "
-"Bearbeiten &gt; Einstellungen, dann auf E-Mail-Einstellungen. Für weitere "
-"Optionen siehe <link linkend=\"mail-prefs-junk\">Unerwünscht-Einstellungen</"
-"link>."
+"Um die Einstellungen zu unerwünschter E-Mail zu ändern, klicken Sie auf "
+"Bearbeiten &gt; Einstellungen, dann auf E-Mail-Einstellungen."
 
-#: C/evolution.xml:3123(para)
+#: C/evolution.xml:3141(para) C/evolution.xml:5665(para)
+msgid ""
+"For additional information on junk content, see <link linkend=\"mail-prefs-"
+"junk\">Junk Mail Preferences</link>."
+msgstr ""
+"Für weitere Informationen über fas Filtern unerwünschter Nachrichten siehe "
+"<link linkend=\"mail-prefs-junk\">Unerwünscht-Einstellungen</link>."
+
+#: C/evolution.xml:3142(para)
 msgid ""
 "For additional junk mail settings, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -7549,12 +7550,12 @@ msgstr ""
 "Für weitere Informationen zu den Unerwünscht-Einstellungen siehe <link "
 "linkend=\"more-mail-options\">E-Mail-Empfangsoptionen</link>."
 
-#: C/evolution.xml:3125(para)
+#: C/evolution.xml:3144(para)
 msgid ""
-"SpamAssassin* is an application that scan through the mail box to find junk "
-"mails. Evolution uses SpamAssassin as the default spam-filtering "
-"application. For more information, see<ulink url=\"http://spamassassin."
-"apache.org/\"> The Apache SpamAssassin Project</ulink>."
+"SpamAssassin is an application that scan through the mail box to find junk "
+"mail. Evolution uses SpamAssassin as the default spam-filtering application. "
+"For more information, see<ulink url=\"http://spamassassin.apache.org/\"> The "
+"Apache SpamAssassin Project</ulink>."
 msgstr ""
 "SpamAssassin* ist eine Anwendung, welche Ihre Nachrichtenordner durchsucht "
 "und unerwünschte Nachrichten findet. Evolution nutzt standardmäßig "
@@ -7562,11 +7563,11 @@ msgstr ""
 "weitere Informationen siehe die Webseite des <ulink url=\"http://"
 "spamassassin.apache.org/\">Apache SpamAssassin-Projekts</ulink>."
 
-#: C/evolution.xml:3126(para)
+#: C/evolution.xml:3145(para)
 msgid ""
-"Bogofilter* is a mail filter that classifies mail as spam or ham (non-spam) "
-"by a statistical analysis of the message’s header and content (body). It is "
-"able to learn from the user’s classifications and corrections. For more "
+"Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) "
+"by a statistical analysis of the message's header and content (body). It is "
+"able to learn from the user's classifications and corrections. For more "
 "information on Bogofilter, see <ulink url=\"http://bogofilter.sourceforge."
 "net/\">The Bogofilter site</ulink>."
 msgstr ""
@@ -7577,42 +7578,42 @@ msgstr ""
 "Informationen über Bogofilter siehe die <ulink url=\"http://bogofilter."
 "sourceforge.net/\">Bogofilter-Webseite</ulink>."
 
-#: C/evolution.xml:3133(para)
+#: C/evolution.xml:3152(para)
 msgid ""
-"This section shows you how to use the Evolution™ contacts tool to organize "
-"any amount of contact information, share addresses over a network, and save "
-"time with everyday tasks."
+"This section shows you how to use the <trademark>Evolution</trademark> "
+"contacts tool to organize any amount of contact information, share addresses "
+"over a network, and save time with everyday tasks."
 msgstr ""
-"Dieses Kapitel beschreibt die Nutzung der Evolution&trade;-Kontaktfunktion, "
-"mit der Sie Ihre Kontakte organisieren können und Adressinformationen über "
-"ein Netzwerk freigeben können."
+"Dieses Kapitel beschreibt die Nutzung der <trademark>Evolution</trademark>-"
+"Kontaktfunktion, mit der Sie Ihre Kontakte organisieren können und "
+"Adressinformationen über ein Netzwerk freigeben können."
 
-#: C/evolution.xml:3136(link) C/evolution.xml:3153(title)
+#: C/evolution.xml:3155(link) C/evolution.xml:3172(title)
 msgid "Contacts and Cards"
 msgstr "Kontakte und Adresskarten"
 
-#: C/evolution.xml:3139(link) C/evolution.xml:3248(title)
+#: C/evolution.xml:3158(link) C/evolution.xml:3264(title)
 msgid "Searching for Contacts"
 msgstr "Nach Kontakten suchen"
 
-#: C/evolution.xml:3142(link) C/evolution.xml:3399(title)
+#: C/evolution.xml:3161(link) C/evolution.xml:3415(title)
 msgid "Organizing your Contacts"
 msgstr "Verwaltung Ihrer Kontakte"
 
-#: C/evolution.xml:3145(link) C/evolution.xml:3515(title)
+#: C/evolution.xml:3164(link) C/evolution.xml:3531(title)
 msgid "LDAP: Shared Address Books on a Network"
 msgstr "LDAP: Adressbücher im Netzwerk"
 
-#: C/evolution.xml:3148(link) C/evolution.xml:3538(title)
+#: C/evolution.xml:3167(link) C/evolution.xml:3554(title)
 msgid "Send Me a Card: Adding New Cards Quickly"
 msgstr "Adresskarten schnell zu den Kontakten hinzufügen"
 
-#: C/evolution.xml:3154(para)
+#: C/evolution.xml:3173(para)
 msgid ""
 "Contacts are the individuals you have chosen to add to your address book so "
-"you can keep track of information about them and send e-mail to them. In "
-"Evolution, an individual contact is called a card.For more information on "
-"organizing your contact list see <link linkend=\"usage-contact-organize"
+"you can keep track of information about them and send email to them. In "
+"Evolution, an individual contact is called a card. For more information on "
+"organizing your contacts see <link linkend=\"usage-contact-organize"
 "\">Organizing your Contacts</link>. To learn about configuring the contacts "
 "tool, refer <link linkend=\"config-prefs-contact\">Contact Management</link>."
 msgstr ""
@@ -7623,11 +7624,11 @@ msgstr ""
 "Kontaktfunktion zu treffen siehe <link linkend=\"config-prefs-contact"
 "\">Verwaltung von Kontakten</link>."
 
-#: C/evolution.xml:3157(title)
+#: C/evolution.xml:3176(title)
 msgid "The Contact Editor"
 msgstr "Der Kontakt-Editor"
 
-#: C/evolution.xml:3158(para)
+#: C/evolution.xml:3177(para)
 msgid ""
 "If you want to add or change cards, use the contact editor. You can edit "
 "email address, telephone numbers, mailer addresses and all other contact "
@@ -7637,23 +7638,23 @@ msgstr ""
 "Editor hierfür. Sie können E-Mail-Adressen, Telefonnummern, Postadressen und "
 "jegliche weiteren Kontaktinformationen eines Kontaktes bearbeiten."
 
-#: C/evolution.xml:3159(para)
+#: C/evolution.xml:3178(para)
 msgid "The contact editor window has three tabs:"
 msgstr "Das Kontakt-Editor-Fenster hat drei Reiter:"
 
-#: C/evolution.xml:3161(title)
-msgid "Contacts:"
+#: C/evolution.xml:3180(title)
+msgid "Contact:"
 msgstr "Kontakt:"
 
-#: C/evolution.xml:3162(para)
+#: C/evolution.xml:3181(para)
 msgid "Contains basic contact information."
 msgstr "Enthält die grundlegenden Informationen zu einem Kontakt."
 
-#: C/evolution.xml:3165(title)
+#: C/evolution.xml:3184(title)
 msgid "Personal Information:"
 msgstr "Persönliche Informationen:"
 
-#: C/evolution.xml:3166(para)
+#: C/evolution.xml:3185(para)
 msgid ""
 "Contains a more specific description of the person, including URLs for "
 "calendar and free/busy information."
@@ -7661,19 +7662,19 @@ msgstr ""
 "Enthält eine weitergehende Beschreibung der Person, inklusive Adressen für "
 "Kalender und Verfügbarkeitsinformationen."
 
-#: C/evolution.xml:3169(title)
+#: C/evolution.xml:3188(title)
 msgid "Mailing Address:"
 msgstr "Postadresse:"
 
-#: C/evolution.xml:3170(para)
+#: C/evolution.xml:3189(para)
 msgid "Contains the individual's mailing address."
 msgstr "Enthält die Postadressen des Kontakts."
 
-#: C/evolution.xml:3172(para)
+#: C/evolution.xml:3191(para)
 msgid ""
 "You can also use Action Menu to find Forward Contact, which opens a new "
 "message with the card already attached, and Send Message to Contact, which "
-"opens a new message to the contact's e-mail address."
+"opens a new message to the contact's email address."
 msgstr ""
 "Sie können auch aus der Menüleiste Aktionen &gt; Kontakt weiterleiten "
 "auswählen, woraufhin der E-Mail-Editor geöffnet wird und die jeweilige "
@@ -7681,18 +7682,10 @@ msgstr ""
 "schicken, woraufhin der E-Mail-Editor geöffnet wird und als Empfänger "
 "bereits die E-Mail-Adresse des Kontakts eingegeben ist."
 
-#: C/evolution.xml:3173(para)
-msgid ""
-"From the Contact Editor toolbar, you can save and close, print, close, or "
-"delete the contact."
-msgstr ""
-"In der Werkzeugleiste des Kontakt-Editors können Sie einen Kontakt "
-"speichern, schließen, drucken und löschen."
-
-#: C/evolution.xml:3174(para)
+#: C/evolution.xml:3192(para)
 msgid ""
-"You can add card from within an e-mail message or calendar appointment. In "
-"an open e-mail, right-click any e-mail address or message, and click Add to "
+"You can add a card from within an email message or calendar appointment. In "
+"an open email, right-click any email address or message, and click Add to "
 "Address Book or select Add Sender to Address Book from the Message menu."
 msgstr ""
 "Sie können einen Kontakt aus einer E-Mail oder einem Kalendereintrag "
@@ -7701,7 +7694,7 @@ msgstr ""
 "hinzufügen«, oder wählen Sie im »Nachricht«-Menü »Absender zum Adressbuch "
 "hinzufügen« aus."
 
-#: C/evolution.xml:3175(para)
+#: C/evolution.xml:3193(para)
 msgid ""
 "Most of the items in the contact editor simply display the information you "
 "enter, but some of them have additional features:"
@@ -7709,24 +7702,25 @@ msgstr ""
 "Die meisten Elemente im Kontakt-Editor zeigen einfach die eingegebenen "
 "Informationen an, sondern besitzen zusätzlichen Funktionen:"
 
-#: C/evolution.xml:3177(title)
+#: C/evolution.xml:3195(title)
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: C/evolution.xml:3178(para)
+#: C/evolution.xml:3196(para)
 msgid ""
 "Specify the name of your contact here. You can type a name into the Full "
 "Name field, but you can also click the Full Name button to bring up a small "
-"dialog box with text boxes for first and last names, titles like “Mr.” or "
-"“Her Excellency,” and suffixes like “Jr.” The Full Name field also interacts "
-"with the File Under box to help you organize your contacts and to handle "
-"multi-word surnames.To see how it works, type a name in the Full Name field. "
-"As an example, we'll use Miguel de Icaza. You'll notice that the File Under "
-"field also fills in, but in reverse: Icaza, Miguel de. If you had entered "
-"John Q. Doe, the contacts editor would have correctly guessed that the entry "
-"should be filed under “Doe, John Q.” However, Miguel's surname, “de Icaza”, "
-"has two words, and to sort it correctly you must enter de Icaza, Miguel in "
-"the File As entry."
+"dialog box with text boxes for first and last names, titles like <quote>Mr.</"
+"quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</"
+"quote> The Full Name field also interacts with the File Under box to help "
+"you organize your contacts and to handle multi-word surnames. To see how it "
+"works, type a name in the Full Name field. As an example, we will use Miguel "
+"de Icaza. You will notice that the File Under field also fills in, but in "
+"reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts "
+"editor would have correctly guessed that the entry should be filed under "
+"<quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</"
+"quote> has two words, and to sort it correctly you must enter de Icaza, "
+"Miguel in the File As entry."
 msgstr ""
 "Geben Sie hier den Namen des Kontakts ein. Sie können direkt einen Namen in "
 "das Feld »Voller Name« eingeben, oder Sie können auf den »Voller Name«-Knopf "
@@ -7740,11 +7734,11 @@ msgstr ""
 "aus zwei Wörtern, und damit dieser korrekt einsoritert wird müssen Sie »de "
 "Icaza, Miguel« in das »Einsortieren als«-Feld eingeben."
 
-#: C/evolution.xml:3181(title)
+#: C/evolution.xml:3199(title)
 msgid "Where:"
 msgstr "In:"
 
-#: C/evolution.xml:3182(para)
+#: C/evolution.xml:3200(para)
 msgid ""
 "Select one of your address books as the location for this contact. You might "
 "not be able to write to all available address books, especially those on a "
@@ -7754,11 +7748,11 @@ msgstr ""
 "werden soll. Gegebenenfalls haben Sie keine Schreibrechte für alle Ihre "
 "Adressbücher, speziell wenn sich diese in einem Netzwerk befinden."
 
-#: C/evolution.xml:3185(title)
+#: C/evolution.xml:3203(title)
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: C/evolution.xml:3186(para)
+#: C/evolution.xml:3204(para)
 msgid ""
 "Click the Categories button to select categories for this card. If you "
 "assign contact categories, you can then search for contacts using those "
@@ -7770,11 +7764,11 @@ msgstr ""
 "Kontakten suchen. Für weitere Informationen zu Kontaktkategorien siehe <link "
 "linkend=\"usage-contact-organize\">Verwaltung Ihrer Kontakte</link>."
 
-#: C/evolution.xml:3189(title)
+#: C/evolution.xml:3207(title)
 msgid "Free/Busy and Calendar URLs:"
 msgstr "Verfügbarkeits- und Kalender-Adressen:"
 
-#: C/evolution.xml:3190(para)
+#: C/evolution.xml:3208(para)
 msgid ""
 "Click the Personal Information tab to enter Web addresses for the contact. "
 "If the contact publishes Free/Busy or calendar data online, using a server "
@@ -7789,83 +7783,73 @@ msgstr ""
 "angeben. Danach können Sie die Kalender dieser Person einsehen wenn Sie "
 "einen Termin im Kalender erstellen."
 
-#: C/evolution.xml:3195(title)
+#: C/evolution.xml:3213(title)
 msgid "Creating and Editing Contacts"
 msgstr "Kontakte erzeugen und bearbeiten"
 
-#: C/evolution.xml:3196(para)
+#: C/evolution.xml:3214(para)
 msgid "Follow the steps given below to create a new card."
 msgstr "Die folgenden Schritte beschreiben das Erzeugen eines neuen Kontakts:"
 
-#: C/evolution.xml:3199(para)
-msgid "Click the down arrow key next to the New button in the toolbar"
-msgstr ""
-"Klicken Sie auf den nach unten zeigenden Pfeil rechts neben dem »Neu«-Knopf "
-"in der Werkzeugleiste."
-
-#: C/evolution.xml:3202(para)
-msgid ""
-"Select Contacts from the drop-down list or press Shift+Ctrl+C to appear "
-"Contact Editor."
-msgstr ""
-"Wählen Sie »Kontakt« aus der Auswahlliste aus, oder drücken Sie Umschalttaste"
-"+Steuerung+C, um das Kontakt-Editor-Fenster zu erhalten."
+#: C/evolution.xml:3217(para)
+msgid "Click File &gt; New &gt; Contact."
+msgstr "Klicken Sie auf Datei &gt; Neu &gt; Kontakt in der Menüleiste."
 
-#: C/evolution.xml:3205(para)
+#: C/evolution.xml:3220(para)
 msgid "Enter the contact information to the entry boxes provided."
 msgstr ""
 "Geben Sie die gewünschten Kontaktinformationen in die bereitgestellten "
 "Felder ein."
 
-#: C/evolution.xml:3211(para)
+#: C/evolution.xml:3226(para)
 msgid "If you want to change a card that already exists,"
 msgstr ""
 "Wenn Sie Kontaktinformationen eines bereits bestehenden Kontakts ändern "
 "möchten,"
 
-#: C/evolution.xml:3214(para)
-msgid "Press Contact tool from the Switcher to appear the Contact list."
+#: C/evolution.xml:3229(para)
+msgid ""
+"Go to the Contacts window by selecting View &gt; Window &gt; Contacts from "
+"the menubar."
 msgstr ""
-"Wählen Sie das Kontakte-Fenster aus, indem Sie auf den »Kontakte«-Knopf "
-"unten links in der Seitenleiste klicken."
+"Gehen Sie in die Kontakte-Ansicht, indem Sie in der Menüleiste »Ansicht &gt; "
+"Fenster &gt; Kontakte« auswählen."
 
-#: C/evolution.xml:3217(para)
+#: C/evolution.xml:3232(para)
 msgid "Double click on the card you want to edit."
 msgstr ""
 "Klicken Sie doppelt mit der linken Maustaste auf den Kontakt, den Sie "
 "bearbeiten möchten."
 
-#: C/evolution.xml:3220(para)
-msgid "Edit from the Contact Editor window."
+#: C/evolution.xml:3235(para) C/evolution.xml:3255(para)
+msgid "Edit the information in the Contact Editor window."
 msgstr "Bearbeiten Sie nun die Kontaktinformationen im Kontakt-Editor-Fenster."
 
-#: C/evolution.xml:3226(para)
-msgid "You can also edit the contact information from the message list."
+#: C/evolution.xml:3241(para)
+msgid "You can also edit the contact information from the preview pane."
 msgstr ""
 "Sie können auch die Kontaktinformationen aus der Nachrichtenvorschau einer E-"
 "Mail heraus bearbeiten."
 
-#: C/evolution.xml:3229(para)
-msgid "Right click on the address from Message Header"
+#: C/evolution.xml:3244(para)
+msgid "Right click on the address from Message Header."
 msgstr ""
 "Klicken Sie mit der rechten Maustaste auf die E-Mail-Adresse in der "
 "Kopfzeile der Nachricht."
 
-#: C/evolution.xml:3232(para)
-msgid "Select Add to Address Book to appear Contact Quick-Add window"
+#: C/evolution.xml:3247(para)
+msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
 msgstr "Wählen Sie aus dem Menü »Zum Adressbuch hinzufügen« aus."
 
-#: C/evolution.xml:3237(para)
-msgid "Press Edit Full tab at the bottom left to appear Contact Editor window"
+#: C/evolution.xml:3252(para)
+msgid ""
+"Press the Edit Full button at the bottom left to bring up the Contact Editor "
+"window."
 msgstr ""
 "Klicken Sie unten auf den »Voll bearbeiten«-Knopf, um das Kontakt-Editor-"
 "Fenster zu erhalten."
 
-#: C/evolution.xml:3240(para)
-msgid "Edit the required information from Contact Editor and press OK."
-msgstr "Geben Sie die gewünschten Informationen ein und klicken Sie auf OK."
-
-#: C/evolution.xml:3251(para)
+#: C/evolution.xml:3267(para)
 msgid ""
 "Evolution enables you to find the contact address quickly by using "
 "Customized Search. To find the contact address you are looking for, use the "
@@ -7874,69 +7858,48 @@ msgstr ""
 "Führen Sie die folgenden Schritte aus, um Kontaktadressen schnell "
 "aufzufinden:"
 
-#: C/evolution.xml:3255(para)
-msgid ""
-"Click <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/> "
-"to expand the drop-down list."
-msgstr ""
-"Klicken Sie auf das Such-Symbol <inlinegraphic format=\"PNG\" fileref="
-"\"figures/stock_search.png\"/> um den Suchtypen auszuwählen."
-
-#: C/evolution.xml:3258(para)
+#: C/evolution.xml:3274(para) C/evolution.xml:4145(para)
+#: C/evolution.xml:4461(para) C/evolution.xml:4697(para)
 msgid "Specify the search criteria from any of the following:"
 msgstr "Wählen Sie das Suchkriterium aus der folgenden Liste aus:"
 
-#: C/evolution.xml:3261(para)
+#: C/evolution.xml:3277(para)
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: C/evolution.xml:3264(para)
+#: C/evolution.xml:3280(para)
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
-#: C/evolution.xml:3267(para)
+#: C/evolution.xml:3283(para)
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
-#: C/evolution.xml:3272(para)
+#: C/evolution.xml:3288(para)
 msgid "Press Enter to begin the search"
 msgstr "Drücken Sie die Eingabetaste, um die Suche zu starten"
 
-#: C/evolution.xml:3275(para)
+#: C/evolution.xml:3291(para)
 msgid ""
 "For a more complex search, select Search Advanced and select criteria that "
 "describe your desired contact:"
 msgstr ""
-"Für eine komplexere Suche, wählen Sie aus der Auswahlliste »Erweiterte "
-"Suche« aus und führen Sie die folgenden Schritte durch:"
+"Für eine komplexere Suche, wählen Sie aus der Auswahlliste »Erweiterte Suche« "
+"aus und führen Sie die folgenden Schritte durch:"
 
-#: C/evolution.xml:3278(para)
+#: C/evolution.xml:3294(para)
 msgid "Name the rule in the Rule Name field."
 msgstr "Geben Sie einen Namen in das Feld »Suchname« ein."
 
-#: C/evolution.xml:3281(para)
+#: C/evolution.xml:3297(para)
 msgid "Set up your criteria in the Find items field."
 msgstr "Wählen Sie ein Kriterium im Feld »Objekte suchen« aus."
 
-#: C/evolution.xml:3284(para)
+#: C/evolution.xml:3300(para)
 msgid "Select Add to add additional criteria."
 msgstr "Klicken Sie auf »Hinzufügen«, um weitere Kriterien einzugeben."
 
-#: C/evolution.xml:3287(para)
-msgid "Click Search."
-msgstr "Klicken Sie auf OK."
-
-#: C/evolution.xml:3290(para)
-msgid ""
-"To show all your contacts, Click Clear in the search bar or search with an "
-"empty query."
-msgstr ""
-"Um alle Kontakte angezeigt zu bekommen, klicken Sie auf das kleine Symbol "
-"rechts im Suchfeld, führen Sie eine leere Suche durch, wählen Sie »Suchen "
-"&gt; Verwerfen« in der Menüleiste aus, oder drücken Sie Umschalttaste"
-"+Steuerung+Q."
-
-#: C/evolution.xml:3293(para)
+#: C/evolution.xml:3309(para)
 msgid ""
 "Displays all the contacts that match the built-in criteria you have selected "
 "from the drop-down list at the top left side, just above the Display pane."
@@ -7945,174 +7908,168 @@ msgstr ""
 "Sie aus der Auswahlliste links oben, direkt über dem Kontakt-Anzeigefeld, "
 "auswählen können."
 
-#: C/evolution.xml:3295(para)
+#: C/evolution.xml:3311(para)
 msgid "To perform quick search, use the following procedure:"
-msgstr "Um eine schnelle Suche durchzuführen, führen Sie die folgenden Schritte aus:"
-
-#: C/evolution.xml:3298(para)
-msgid "Click show to expand the drop-down list."
-msgstr "Klicken Sie neben »Anzeigen« auf die Auswahlliste."
-
-#: C/evolution.xml:3301(para)
-msgid "Select the search criteria from any of the following:"
-msgstr "Wählen Sie das Suchkriterium aus der folgenden Liste aus:"
+msgstr ""
+"Um eine schnelle Suche durchzuführen, führen Sie die folgenden Schritte aus:"
 
-#: C/evolution.xml:3304(para) C/evolution.xml:4146(para)
-#: C/evolution.xml:4496(para) C/evolution.xml:4692(para)
+#: C/evolution.xml:3320(para) C/evolution.xml:4213(para)
+#: C/evolution.xml:4564(para) C/evolution.xml:4759(para)
 msgid "Anniversary"
 msgstr "Jahrestag"
 
-#: C/evolution.xml:3307(para) C/evolution.xml:4149(para)
-#: C/evolution.xml:4499(para) C/evolution.xml:4695(para)
+#: C/evolution.xml:3323(para) C/evolution.xml:4216(para)
+#: C/evolution.xml:4567(para) C/evolution.xml:4762(para)
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: C/evolution.xml:3310(para) C/evolution.xml:4152(para)
-#: C/evolution.xml:4502(para) C/evolution.xml:4698(para)
+#: C/evolution.xml:3326(para) C/evolution.xml:4219(para)
+#: C/evolution.xml:4570(para) C/evolution.xml:4765(para)
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: C/evolution.xml:3313(para) C/evolution.xml:4155(para)
-#: C/evolution.xml:4505(para) C/evolution.xml:4701(para)
+#: C/evolution.xml:3329(para) C/evolution.xml:4222(para)
+#: C/evolution.xml:4573(para) C/evolution.xml:4768(para)
 msgid "Competition"
 msgstr "Konkurrenz"
 
-#: C/evolution.xml:3316(para) C/evolution.xml:4704(para)
+#: C/evolution.xml:3332(para) C/evolution.xml:4771(para)
 msgid "Favorites"
 msgstr "Favoriten"
 
-#: C/evolution.xml:3319(para) C/evolution.xml:4161(para)
-#: C/evolution.xml:4511(para) C/evolution.xml:4707(para)
+#: C/evolution.xml:3335(para) C/evolution.xml:4228(para)
+#: C/evolution.xml:4579(para) C/evolution.xml:4774(para)
 msgid "Gifts"
 msgstr "Geschenke"
 
-#: C/evolution.xml:3322(para) C/evolution.xml:4164(para)
-#: C/evolution.xml:4514(para) C/evolution.xml:4710(para)
+#: C/evolution.xml:3338(para) C/evolution.xml:4231(para)
+#: C/evolution.xml:4582(para) C/evolution.xml:4777(para)
 msgid "Goals/Objectives"
 msgstr "Ziele/Zielsetzungen"
 
-#: C/evolution.xml:3325(para)
+#: C/evolution.xml:3341(para) C/evolution.xml:4234(para)
 msgid "Holiday"
 msgstr "Urlaub"
 
-#: C/evolution.xml:3328(para) C/evolution.xml:4170(para)
-#: C/evolution.xml:4520(para) C/evolution.xml:4716(para)
+#: C/evolution.xml:3344(para) C/evolution.xml:4237(para)
+#: C/evolution.xml:4588(para) C/evolution.xml:4783(para)
 msgid "Holiday Cards"
 msgstr "Urlaubskarten"
 
-#: C/evolution.xml:3331(para)
+#: C/evolution.xml:3347(para)
 msgid "Hot Contacts"
 msgstr "Heiße Kontakte"
 
-#: C/evolution.xml:3334(para) C/evolution.xml:4173(para)
-#: C/evolution.xml:4523(para) C/evolution.xml:4719(para)
+#: C/evolution.xml:3350(para) C/evolution.xml:4240(para)
+#: C/evolution.xml:4591(para) C/evolution.xml:4786(para)
 msgid "Ideas"
 msgstr "Ideen"
 
-#: C/evolution.xml:3337(para) C/evolution.xml:4176(para)
-#: C/evolution.xml:4526(para) C/evolution.xml:4722(para)
+#: C/evolution.xml:3353(para) C/evolution.xml:4243(para)
+#: C/evolution.xml:4594(para) C/evolution.xml:4789(para)
 msgid "International"
 msgstr "International"
 
-#: C/evolution.xml:3340(para)
+#: C/evolution.xml:3356(para) C/evolution.xml:4246(para)
 msgid "Key Customer"
 msgstr "Schlüssel-Kunde"
 
-#: C/evolution.xml:3343(para) C/evolution.xml:4182(para)
-#: C/evolution.xml:4532(para) C/evolution.xml:4728(para)
+#: C/evolution.xml:3359(para) C/evolution.xml:4249(para)
+#: C/evolution.xml:4600(para) C/evolution.xml:4795(para)
 msgid "Miscellaneous"
 msgstr "Allgemeines"
 
-#: C/evolution.xml:3349(para) C/evolution.xml:4188(para)
-#: C/evolution.xml:4538(para) C/evolution.xml:4734(para)
+#: C/evolution.xml:3365(para) C/evolution.xml:4255(para)
+#: C/evolution.xml:4606(para) C/evolution.xml:4801(para)
 msgid "Phone Calls"
 msgstr "Anrufe"
 
-#: C/evolution.xml:3355(para) C/evolution.xml:4194(para)
-#: C/evolution.xml:4544(para) C/evolution.xml:4740(para)
+#: C/evolution.xml:3371(para) C/evolution.xml:4261(para)
+#: C/evolution.xml:4612(para) C/evolution.xml:4807(para)
 msgid "Strategies"
 msgstr "Strategien"
 
-#: C/evolution.xml:3358(para) C/evolution.xml:4197(para)
-#: C/evolution.xml:4547(para) C/evolution.xml:4743(para)
+#: C/evolution.xml:3374(para) C/evolution.xml:4264(para)
+#: C/evolution.xml:4615(para) C/evolution.xml:4810(para)
 msgid "Suppliers"
 msgstr "Lieferanten"
 
-#: C/evolution.xml:3361(para)
-msgid "Time &amp;Expenses"
+#: C/evolution.xml:3377(para) C/evolution.xml:4267(para)
+#: C/evolution.xml:4618(para) C/evolution.xml:4813(para)
+msgid "Time &amp; Expenses"
 msgstr "Zeit und Ausgaben"
 
-#: C/evolution.xml:3364(para) C/evolution.xml:4203(para)
-#: C/evolution.xml:4553(para) C/evolution.xml:4749(para)
+#: C/evolution.xml:3380(para) C/evolution.xml:4270(para)
+#: C/evolution.xml:4621(para) C/evolution.xml:4816(para)
 msgid "VIP"
 msgstr "VIP"
 
-#: C/evolution.xml:3367(para) C/evolution.xml:4206(para)
-#: C/evolution.xml:4556(para) C/evolution.xml:4752(para)
+#: C/evolution.xml:3383(para) C/evolution.xml:4273(para)
+#: C/evolution.xml:4624(para) C/evolution.xml:4819(para)
 msgid "Waiting"
 msgstr "Wartend"
 
-#: C/evolution.xml:3370(para)
-msgid "Weather:Cloudy"
+#: C/evolution.xml:3386(para)
+msgid "Weather: Cloudy"
 msgstr "Wetter: Wolkig"
 
-#: C/evolution.xml:3373(para)
-msgid "Weather:Fog"
+#: C/evolution.xml:3389(para)
+msgid "Weather: Fog"
 msgstr "Wetter: Nebel"
 
-#: C/evolution.xml:3376(para)
-msgid "Weather:Partly Cloudy"
+#: C/evolution.xml:3392(para)
+msgid "Weather: Partly Cloudy"
 msgstr "Wetter: Teilweise bewölkt"
 
-#: C/evolution.xml:3379(para)
-msgid "Weather:Rain"
+#: C/evolution.xml:3395(para)
+msgid "Weather: Rain"
 msgstr "Wetter: Regen"
 
-#: C/evolution.xml:3382(para)
-msgid "Weather:Snow"
+#: C/evolution.xml:3398(para)
+msgid "Weather: Snow"
 msgstr "Wetter: Schnee"
 
-#: C/evolution.xml:3385(para)
-msgid "Weather:Sunny"
+#: C/evolution.xml:3401(para)
+msgid "Weather: Sunny"
 msgstr "Wetter: Sonnig"
 
-#: C/evolution.xml:3388(para)
-msgid "Weather:Thunderstorms"
+#: C/evolution.xml:3404(para)
+msgid "Weather: Thunderstorms"
 msgstr "Wetter: Gewitter"
 
-#: C/evolution.xml:3393(para)
+#: C/evolution.xml:3409(para)
 msgid "Evolution displays the desired contacts."
 msgstr "Evolution zeigt die gewünschten Kontakte an."
 
-#: C/evolution.xml:3400(para)
+#: C/evolution.xml:3416(para)
 msgid ""
-"Evolution allows you to organize your contact list. You can create several "
-"individual address books, or contact groups. Within a given address book, "
-"you can have several categories of contacts."
+"Evolution allows you to organize your contacts. You can create several "
+"individual address books, or contact lists. Within a given address book, you "
+"can have several categories of contacts."
 msgstr ""
 "Um Ihre Kontakte zu verwalten, können Sie mehrere verschiedene Adressbücher "
 "erzeugen, oder auch Kontaktlisten in einem Adressbuch erstellen. Innerhalb "
 "eines Adressbuchs können Sie verschiedene Kategorien für Kontakte benutzen."
 
-#: C/evolution.xml:3403(link) C/evolution.xml:3417(title)
+#: C/evolution.xml:3419(link) C/evolution.xml:3433(title)
 msgid "Contacts Groups"
 msgstr "Mehrere Adressbücher"
 
-#: C/evolution.xml:3406(link) C/evolution.xml:3439(title)
+#: C/evolution.xml:3422(link) C/evolution.xml:3455(title)
 msgid "Creating a List of Contacts"
 msgstr "Erstellen einer Kontaktliste"
 
-#: C/evolution.xml:3409(link) C/evolution.xml:3471(title)
+#: C/evolution.xml:3425(link) C/evolution.xml:3487(title)
 msgid "Grouping with Categories"
 msgstr "Kategorien benutzen"
 
-#: C/evolution.xml:3412(link) C/evolution.xml:3532(title)
+#: C/evolution.xml:3428(link) C/evolution.xml:3548(title)
 msgid "Configuring Evolution to use LDAP"
 msgstr "LDAP-Server benutzen"
 
-#: C/evolution.xml:3418(para)
+#: C/evolution.xml:3434(para)
 msgid ""
-"Contacts Groups are nothing but Address Books.The simplest way to organize "
+"Contacts Groups are nothing but Address Books. The simplest way to organize "
 "contacts is to create additional address books. You can create a new one by "
 "clicking File &gt; New &gt; Address Book. For contacts groups on your "
 "computer, you only need to provide a name. For contacts on the network, you "
@@ -8125,22 +8082,23 @@ msgstr ""
 "einzugeben, Adressbücher in einem Netzwerk benötigen zusätzliche "
 "Informationen für den Zugriff auf den Server."
 
-#: C/evolution.xml:3419(para)
+#: C/evolution.xml:3435(para)
 msgid ""
 "To move a card from one group to another, just drag it from the main display "
-"of contacts. You cannot change the contents of most network contact groups."
+"of contacts and drop it to a different group. You cannot change the contents "
+"of most network contact groups."
 msgstr ""
 "Um einen Kontakt von einem Adressbuch in ein anderes zu verschieben, ziehen "
 "Sie den Kontakt mit der Maus aus dem Anzeigefeld auf das gewünschte "
 "Adressbuch in der Seitenleiste. Beachten Sie, dass sich in den meisten "
 "Netzwerk-Adressbüchern keine Inhalte ändern lassen."
 
-#: C/evolution.xml:3421(para)
+#: C/evolution.xml:3437(para)
 msgid ""
 "Contacts groups are not the same as contact lists. A contact group is like a "
 "folder or address book full of contacts. A contact list is a single contact "
-"that contains other contacts, and is most often used to e-mail several "
-"people at once."
+"that contains other contacts, and is most often used to email several people "
+"at once."
 msgstr ""
 "Adressbücher sind nicht dasselbe wie Kontaktlisten. Ein Adressbuch verhält "
 "sich wie ein Ordner und beinhaltet verschiedene Einträge. Eine Kontaktliste "
@@ -8148,11 +8106,11 @@ msgstr ""
 "und wird oftmals genutzt, um eine E-Mail an mehrere Personen gleichzeitig zu "
 "schreiben."
 
-#: C/evolution.xml:3426(title)
+#: C/evolution.xml:3442(title)
 msgid "Importing Contacts"
 msgstr "Kontakte importieren"
 
-#: C/evolution.xml:3427(para)
+#: C/evolution.xml:3443(para)
 msgid ""
 "You can import contacts from other contact management tools with the Import "
 "tool."
@@ -8160,11 +8118,11 @@ msgstr ""
 "Sie können Kontakte aus anderen Kontaktverwaltungsprogrammen mit der "
 "Importieren-Funktion importieren."
 
-#: C/evolution.xml:3432(para)
+#: C/evolution.xml:3448(para)
 msgid "Mail yourself a contact as vCard attachment."
 msgstr "Schicken Sie sich selbst einen Kontakt als vCard-Anhang."
 
-#: C/evolution.xml:3433(para)
+#: C/evolution.xml:3449(para)
 msgid ""
 "Currently VCF and LDIF are supported. CSV and TAB format files are supported "
 "from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
@@ -8172,13 +8130,13 @@ msgstr ""
 "Momentan werden vCard und LDIF unterstützt. CSV- und Tabulator-Dateien "
 "werden unterstützt von Microsoft Outlook, Thunderbird, Mozilla und Evolution."
 
-#: C/evolution.xml:3440(para)
+#: C/evolution.xml:3456(para)
 msgid ""
 "A contact list is a set of contacts with a single nickname that you create. "
-"When you send e-mail to the nickname, it is sent to every member of the "
-"list. This differs from a network mailing list in that it exists only on "
-"your computer as a convenience to you, rather than as an actual e-mail "
-"address managed by a mailing list application on a server."
+"When you send email to the nickname, it is sent to every member of the list. "
+"This differs from a network mailing list in that it exists only on your "
+"computer as a convenience to you, rather than as an actual email address "
+"managed by a mailing list application on a server."
 msgstr ""
 "Eine Kontaktliste ist eine Anzahl von Kontakten, die von Ihnen einen "
 "Spitznamen erhält. Wenn Sie eine E-Mail an diesen Spitznamen schicken, so "
@@ -8187,85 +8145,85 @@ msgstr ""
 "nur auf Ihrem Computer zu Ihrer Bequemlichkeit existiert, und nicht wie eine "
 "echte Mailingliste von einer Software auf einem Server verwaltet wird."
 
-#: C/evolution.xml:3441(para)
+#: C/evolution.xml:3457(para)
 msgid ""
 "For example, you could create one card for each family member, then add "
-"those cards to a contact list called “Family.” Then, instead of entering "
-"each person's e-mail address individually, you can send e-mail to “Family” "
-"and the message would go to all of them."
+"those cards to a contact list called <quote>Family.</quote> Then, instead of "
+"entering each person's email address individually, you can send email to "
+"<quote>Family</quote> and the message would go to all of them."
 msgstr ""
 "Sie können zum Beispiel in Evolution einen Kontakt für jedes "
 "Familienmitglied erstellen und dann all diese Kontakte zu einer Kontaktliste "
-"hinzufügen, die Sie &ldquo;Famile&rdquo; nennen. Danach können Sie, anstelle "
-"jede E-Mail-Adresse der Familienmitglieder einzeln einzugeben, einfach eine "
-"E-Mail an &ldquo;Familie&rdquo; schreiben und die E-Mail wird automatisch an "
-"alle einzelnen Familienmitglieder versendet."
+"hinzufügen, die Sie <quote>Famile</quote> nennen. Danach können Sie, "
+"anstelle jede E-Mail-Adresse der Familienmitglieder einzeln einzugeben, "
+"einfach eine E-Mail an <quote>Familie</quote> schreiben und die E-Mail wird "
+"automatisch an alle einzelnen Familienmitglieder versendet."
 
-#: C/evolution.xml:3442(para)
+#: C/evolution.xml:3458(para)
 msgid "To create a list of contacts:"
 msgstr "Eine neue Kontaktliste anlegen:"
 
-#: C/evolution.xml:3445(para)
+#: C/evolution.xml:3461(para)
 msgid "Open the list creation dialog box by clicking the New List button."
 msgstr ""
 "Klicken Sie auf den »Neu«-Knopf in der Werkzeugleiste und wählen Sie "
 "»Kontaktliste«."
 
-#: C/evolution.xml:3447(para)
+#: C/evolution.xml:3463(para)
 msgid "Click File &gt; New &gt; Contact List."
 msgstr "Klicken Sie auf Datei &gt; Neu &gt; Kontaktliste in der Menüleiste."
 
-#: C/evolution.xml:3450(para)
+#: C/evolution.xml:3466(para)
 msgid "Specify a name for the list."
 msgstr "Geben Sie einen Namen für die Liste ein."
 
-#: C/evolution.xml:3453(para)
-msgid "Specify the names or e-mail addresses of contacts."
+#: C/evolution.xml:3469(para)
+msgid "Specify the names or email addresses of contacts."
 msgstr "Geben Sie die Namen oder E-Mail-Adressen der Kontakte an."
 
-#: C/evolution.xml:3455(para)
+#: C/evolution.xml:3471(para)
 msgid "Drag contacts from the main window into the list."
 msgstr "Ziehen Sie mit der Maus Kontakte aus dem Hauptfenster in die Liste."
 
-#: C/evolution.xml:3458(para)
+#: C/evolution.xml:3474(para)
 msgid ""
-"Choose whether you want to hide the e-mail addresses when you send a message "
+"Choose whether you want to hide the email addresses when you send a message "
 "to the list."
 msgstr ""
 "Wählen Sie, ob die einzelnen E-Mail-Adressen der Empfänger angezeigt werden "
 "sollen, wenn Sie eine Nachricht an die Kontaktliste senden."
 
-#: C/evolution.xml:3459(para)
+#: C/evolution.xml:3475(para)
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
-"addresses hidden. This is the same thing as using the “Bcc:” feature "
-"discussed in <link linkend=\"usage-mail-getnsend-send-to-types\">Specifying "
-"Additional Recipients for E-Mail</link>."
+"addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
+"feature discussed in <link linkend=\"usage-mail-getnsend-send-to-types"
+"\">Specifying Additional Recipients for Email</link>."
 msgstr ""
 "Falls es sich nicht um eine sehr kleine Liste handelt, wird empfohlen, die "
 "Adressen nicht anzeigen zu lassen. Hierbei handelt es sich um dieselbe "
 "Funktion wie die unter <link linkend=\"usage-mail-getnsend-send-to-types"
-"\">Weitere Empfänger zu einer E-Mail hinzufügen</link> beschriebene &ldquo;"
-"Blindkopie&rdquo;-Funktion."
+"\">Weitere Empfänger zu einer E-Mail hinzufügen</link> beschriebene "
+"<quote>Blindkopie</quote>-Funktion."
 
-#: C/evolution.xml:3462(para)
+#: C/evolution.xml:3478(para)
 msgid "When you are finished, click OK."
 msgstr "Wenn Sie dies beendet haben, klicken Sie auf OK."
 
-#: C/evolution.xml:3465(para)
+#: C/evolution.xml:3481(para)
 msgid ""
 "The list appears as a contact card, which you can use as you would any other "
-"card, including mailing the list to another person and sending e-mail to the "
+"card, including mailing the list to another person and sending email to the "
 "list."
 msgstr ""
 "Die Kontaktliste wird als weiterer Kontakt dargestellt, den Sie wie jeden "
 "anderen Kontakt auch benutzen können. Sie können die Liste also auch an eine "
-"andere Person weiterleiten und E-Mails an die Liste schreiben,"
+"andere Person weiterleiten und E-Mails an die Liste schreiben."
 
-#: C/evolution.xml:3466(para)
+#: C/evolution.xml:3482(para)
 msgid ""
-"To mail the list, open a new e-mail and type the name you chose for the "
-"list. Evolution addresses the message to the entire list when you send the "
+"To mail the list, open a new email and type the name you chose for the list. "
+"Evolution addresses the message to the entire list when you send the "
 "message. You can also right-click the list's address card in the contacts "
 "tool and select Send Message to List."
 msgstr ""
@@ -8275,43 +8233,45 @@ msgstr ""
 "auch mit der rechten Maustaste im Kontakte-Fenster auf die Adresskarte der "
 "Kontaktliste klicken und »Nachricht an Liste schicken« auswählen."
 
-#: C/evolution.xml:3467(para)
+#: C/evolution.xml:3483(para)
 msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
-msgstr "Evolution kann keine Kontaktlisten auf Microsoft-Exchange-Servern speichern."
+msgstr ""
+"Evolution kann keine Kontaktlisten auf Microsoft-Exchange-Servern speichern."
 
-#: C/evolution.xml:3472(para)
+#: C/evolution.xml:3488(para)
 msgid ""
 "Another way to group cards is to mark them as belonging to different "
 "categories. You can mark a card as being in several categories or no "
-"category at all. For example, you put a friend's card in the “Business” "
-"category because he works with you, the “Friends” category because he's a "
-"friend, and the “Frequent” category because you call him often."
+"category at all. For example, you put a friend's card in the "
+"<guilabel>Business</guilabel> category because he works with you and the "
+"<guilabel>Friends</guilabel> category because he's a friend."
 msgstr ""
 "Eine andere Art Kontakte zu gruppieren ist es, diese als verschiedenen "
 "Kategorien zugehörig zu markieren. Sie können einem Kontakt mehrere oder gar "
 "keine Kategorien zuweisen. Sie können einen Kontakt zum Beispiel in die "
-"&ldquo;Geschäftlich&rdquo;-Kategorie einordnen, da er mit Ihnen arbeitet, "
-"und in die &ldquo;Persönlich&rdquo;-Kategorie da er ein Freund ist."
+"<guilabel>Geschäftlich</guilabel>-Kategorie einordnen, da er mit Ihnen "
+"arbeitet, und in die <guilabel>Persönlich</guilabel>-Kategorie da er ein "
+"Freund ist."
 
-#: C/evolution.xml:3473(para)
+#: C/evolution.xml:3489(para)
 msgid "To mark a card as belonging to a category,"
 msgstr "Um einen Kontakt als zu einer Kategorie zugehörig zu markieren,"
 
-#: C/evolution.xml:3476(para)
+#: C/evolution.xml:3492(para)
 msgid "Double click the card to appear the Contact Editor window"
 msgstr ""
 "Klicken Sie doppelt auf den Kontakt, damit das Kontakt-Editor-Fenster "
 "geöffnet wird"
 
-#: C/evolution.xml:3479(para)
+#: C/evolution.xml:3495(para)
 msgid "Click the Categories button at the left."
 msgstr "Klicken Sie auf den »Kategorien«-Knopf."
 
-#: C/evolution.xml:3480(para)
-msgid "You can view the Categories dialogue box as given below."
+#: C/evolution.xml:3496(para)
+msgid "You can view the Categories dialog box as given below."
 msgstr "Das Kategorien-Fenster wird wie unten dargestellt angezeigt."
 
-#: C/evolution.xml:3492(para)
+#: C/evolution.xml:3508(para)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
@@ -8319,42 +8279,38 @@ msgstr ""
 "Wählen Sie die Kategorie aus der Liste aus. Sie können soviele Kategorien "
 "aussuchen, wie Sie möchten."
 
-#: C/evolution.xml:3495(para)
+#: C/evolution.xml:3511(para)
 msgid ""
 "If the master list of categories doesn't suit you, you can add your own "
-"categories. To add new category,"
+"categories. To add a new category,"
 msgstr ""
 "Falls die vorgegebene Liste an Kategorien Ihnen nicht zusagt, so können Sie "
 "weitere Kategorien hinzufügen. Um eine neue Kategorie hinzuzufügen,"
 
-#: C/evolution.xml:3498(para)
-msgid "Enter the new category in the entry box at the top"
+#: C/evolution.xml:3514(para)
+msgid "Enter the new category in the entry box at the top."
 msgstr "Geben Sie den Namen der Kategorie in das Textfeld oben ein."
 
-#: C/evolution.xml:3502(para)
+#: C/evolution.xml:3518(para)
 msgid ""
 "You can view the category name appeared in the field next to Categories "
-"button in the Contact Editor"
+"button in the Contact Editor."
 msgstr ""
 "Sie können sehen, dass der Kategoriename im Textfeld rechts neben dem "
 "»Kategorien«-Knopf im Kontakt-Editor erscheint."
 
-#: C/evolution.xml:3505(para)
-msgid "Press OK at the right bottom of the Contact Editor window."
-msgstr "Klicken Sie auf OK im Kontakt-Editor-Fenster."
-
-#: C/evolution.xml:3509(para)
+#: C/evolution.xml:3525(para)
 msgid ""
 "You can edit or set the color and icon for each categories available under "
 "categories list. To achieve that click Edit button at the bottom of the "
-"Categories window. Press delete button to delete the items from the list."
+"Categories window. Press the Delete button to delete the items from the list."
 msgstr ""
 "Sie können in der Kategorienliste jeder Kategorie eine Farbe und ein kleines "
 "Bildsymbol (Icon) zuweisen, indem Sie auf »Bearbeiten« unten im Kategorien-"
 "Fenster klicken. Klicken Sie auf »Löschen«, wenn Sie Kategorien aus der Liste "
 "entfernen möchten."
 
-#: C/evolution.xml:3516(para)
+#: C/evolution.xml:3532(para)
 msgid ""
 "The <link linkend=\"ldap\">LDAP</link> protocol was created to let users "
 "share contact information over a network by sharing access to a central "
@@ -8367,13 +8323,13 @@ msgstr ""
 "Firmen nutzen ein LDAP-Adressbuch für alle Ihre Mitarbeiter oder für "
 "Kundenkontakte."
 
-#: C/evolution.xml:3517(para)
+#: C/evolution.xml:3533(para)
 msgid ""
-"To learn how to add a remote LDAP directory to your available contact "
-"folders, see <link linkend=\"config-prefs-contact\">Contact Management</"
-"link>. Remote groups of contacts appear under the On LDAP Servers item in "
-"the switcher. They work like a local folder of contact cards, with the "
-"following exceptions:"
+"To learn how to add a remote LDAP directory to your available address books, "
+"see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote "
+"groups of contacts appear under the On LDAP Servers item in the switcher. "
+"They work like a local folder of contact cards, with the following "
+"exceptions:"
 msgstr ""
 "Um ein LDAP-Verzeichnis zu Ihren verfügbaren Adressbüchern hinzuzufügen "
 "siehe <link linkend=\"config-prefs-contact\">Verwaltung von Kontakten</"
@@ -8381,12 +8337,12 @@ msgstr ""
 "Überschrift »Auf LDAP-Servern« angezeigt. Diese verhalten sich wie lokale "
 "Adressbücher, mit folgenden Ausnahmen:"
 
-#: C/evolution.xml:3520(para)
+#: C/evolution.xml:3536(para)
 msgid ""
 "Network folders are only available when you are connected to the network. If "
 "you use a laptop or have a modem connection, you might want to copy or cache "
 "some of the network directory. You do this by dragging and dropping your "
-"desired contacts into the local contacts list."
+"desired contacts into the local address books."
 msgstr ""
 "Netzwerkordner sind nur verfügbar, wenn Sie mit dem Netzwerk verbunden sind. "
 "Falls Sie einen Laptop oder eine Modem-Verbindung benutzen, möchten Sie "
@@ -8394,7 +8350,7 @@ msgstr ""
 "Sie hierzu die gewünschten Kontakte mit der Maus (Drag and Drop) in eines "
 "Ihrer lokalen Adressbücher."
 
-#: C/evolution.xml:3521(para)
+#: C/evolution.xml:3537(para)
 msgid ""
 "You can also mark the network folder for offline usage. To mark the folder, "
 "right-click the folder, then click Properties. Select Copy Folder Content "
@@ -8405,7 +8361,7 @@ msgstr ""
 "Eigenschaften, und wählen Sie »Den Ordnerinhalt lokal zum Arbeiten im "
 "Offline-Modus kopieren«."
 
-#: C/evolution.xml:3524(para)
+#: C/evolution.xml:3540(para)
 msgid ""
 "To prevent excess network traffic, Evolution does not normally load data "
 "from the LDAP server upon opening."
@@ -8413,7 +8369,7 @@ msgstr ""
 "Um erhöhten Netzwerkverkehr zu vermeiden, lädt Evolution beim Start "
 "normalerweise nicht automatisch Daten vom LDAP-Server."
 
-#: C/evolution.xml:3527(para)
+#: C/evolution.xml:3543(para)
 msgid ""
 "Depending on your server settings, you might not be able to edit all the "
 "fields in a contact stored on an LDAP server. Some servers prohibit some or "
@@ -8427,7 +8383,7 @@ msgstr ""
 "die von Evolution unterstützt werden. Reden Sie mit Ihrem "
 "Systemadministrator, falls Sie andere Einstellungen benötigen."
 
-#: C/evolution.xml:3533(para)
+#: C/evolution.xml:3549(para)
 msgid ""
 "For information about setting up Evolution to use LDAP, refer to <link "
 "linkend=\"config-prefs-contact\">Contact Management</link>."
@@ -8435,13 +8391,13 @@ msgstr ""
 "Für weitere Informationen zur Nutzung von LDAP in Evolution siehe <link "
 "linkend=\"config-prefs-contact\">Verwaltung von Kontakten</link>."
 
-#: C/evolution.xml:3539(para)
+#: C/evolution.xml:3555(para)
 msgid ""
 "When you get information about a person in the mail or in a calendar entry, "
-"you can add it to an address card. To do so, right-click any e-mail address "
-"or e-mail message, and click Add to Address Book on the menu that appears. "
-"If the sender already exists, the Editor tab opens and you can edit the "
-"detail. Evolution can also add cards from a hand-held device during HotSync* "
+"you can add it to an address card. To do so, right-click any email address "
+"or email message, and click Add to Address Book on the menu that appears. If "
+"the sender already exists, the Editor tab opens and you can edit the detail. "
+"Evolution can also add cards from a hand-held device during HotSync* "
 "operation. For more information, see <link linkend=\"config-sync"
 "\">Synchronizing Your Handheld Device</link>."
 msgstr ""
@@ -8455,63 +8411,63 @@ msgstr ""
 "Informationen siehe <link linkend=\"config-sync\">Mit tragbaren Geräten "
 "synchronisieren</link>."
 
-#: C/evolution.xml:3545(para)
+#: C/evolution.xml:3561(para)
 msgid ""
-"This section shows you how to use the Evolution™ Calendar to manage your "
-"schedule alone or in conjunction with peers. To learn about importing "
-"calendar data, see <link linkend=\"importing-mail\">Importing Single Files</"
-"link>, which covers the Import tool."
+"This section shows you how to use the <trademark>Evolution</trademark> "
+"Calendar to manage your schedule alone or in conjunction with peers. To "
+"learn about importing calendar data, see <link linkend=\"importing-mail"
+"\">Importing Single Files</link>, which covers the Import tool."
 msgstr ""
-"Dieses Kapitel erklärt die Nutzung des Evolution&trade;-Kalenders und wie "
-"Sie Ihre Termine alleine oder im Team planen können. Um mehr darüber zu "
-"erfahren, wie Sie Kalenderdaten importieren können, siehe <link linkend="
-"\"importing-mail\">Einzelne Dateien importieren</link>."
+"Dieses Kapitel erklärt die Nutzung des <trademark>Evolution</trademark>-"
+"Kalenders und wie Sie Ihre Termine alleine oder im Team planen können. Um "
+"mehr darüber zu erfahren, wie Sie Kalenderdaten importieren können, siehe "
+"<link linkend=\"importing-mail\">Einzelne Dateien importieren</link>."
 
-#: C/evolution.xml:3548(link) C/evolution.xml:3580(title)
+#: C/evolution.xml:3564(link) C/evolution.xml:3596(title)
 msgid "Ways of Looking at your Calendar"
 msgstr "Möglichkeiten, den Kalender zu betrachten"
 
-#: C/evolution.xml:3551(link) C/evolution.xml:3690(title)
+#: C/evolution.xml:3567(link) C/evolution.xml:3754(title)
 msgid "Scheduling With the Evolution Calendar"
 msgstr "Terminplanung mit dem Evolution-Kalender"
 
-#: C/evolution.xml:3554(link) C/evolution.xml:4066(title)
+#: C/evolution.xml:3570(link) C/evolution.xml:4134(title)
 msgid "Searching for Calendar Items"
 msgstr "Nach Kalendereinträgen suchen"
 
-#: C/evolution.xml:3557(link) C/evolution.xml:4215(title)
+#: C/evolution.xml:3573(link) C/evolution.xml:4282(title)
 msgid "Printing Displayed Items"
 msgstr "Dargestellte Einträge drucken"
 
-#: C/evolution.xml:3560(link) C/evolution.xml:4220(title)
+#: C/evolution.xml:3576(link) C/evolution.xml:4287(title)
 msgid "Deleting Old Appointments and Meetings"
 msgstr "Alte Kalendereinträge löschen"
 
-#: C/evolution.xml:3563(link) C/evolution.xml:4225(title)
+#: C/evolution.xml:3579(link) C/evolution.xml:4292(title)
 msgid "Delegating Meetings"
 msgstr "Besprechungen delegieren"
 
-#: C/evolution.xml:3566(link) C/evolution.xml:4245(title)
+#: C/evolution.xml:3582(link) C/evolution.xml:4312(title)
 msgid "Multiple Calendars, Web Calendars, and CalDAV"
 msgstr "Mehrere Kalender, Web-Kalender, und CalDAV"
 
-#: C/evolution.xml:3569(link) C/evolution.xml:4252(title)
+#: C/evolution.xml:3585(link) C/evolution.xml:4319(title)
 msgid "The Task List"
 msgstr "Die Aufgabenliste"
 
-#: C/evolution.xml:3572(link) C/evolution.xml:4566(title)
+#: C/evolution.xml:3588(link) C/evolution.xml:4634(title)
 msgid "Memos"
 msgstr "Notizen"
 
-#: C/evolution.xml:3575(link) C/evolution.xml:4762(title)
+#: C/evolution.xml:3591(link) C/evolution.xml:4829(title)
 msgid "Configuring Time Zones"
 msgstr "Einrichten von Zeitzonen"
 
-#: C/evolution.xml:3581(para)
+#: C/evolution.xml:3597(para)
 msgid ""
 "In Evolution, you can keep multiple calendars and overlay them one over the "
 "next. For example, you might have a schedule of events for work, one for "
-"home, and one for your favorite sports team. The switcher lists those "
+"home, and one for your favorite sports team. The side bar lists those "
 "calendars, and you can select or deselect the boxes next to them to show and "
 "hide the appointments in your calendar view. By hiding and showing different "
 "sets of appointments, you can be sure to avoid conflicts, while keeping a "
@@ -8527,79 +8483,80 @@ msgstr ""
 "anzeigen lassen können, können Sie Terminkonflikte vermeiden und vermeiden "
 "zuviel Durcheinander in der Kalenderansicht."
 
-#: C/evolution.xml:3582(para)
+#: C/evolution.xml:3598(para)
 msgid "Appointments for each calendar appear as a different color."
 msgstr "Die Termine jeden Kalenders erscheinen in einer anderen Farbe."
 
-#: C/evolution.xml:3583(para)
+#: C/evolution.xml:3599(para)
 msgid ""
 "The toolbar offers you five different buttons that can show you different "
 "views of your calendar."
-msgstr "Die Werkzeugleiste bietet Ihnen fünf Knöpfe, um über verschiedene Ansichten Ihren Kalender zu betrachten."
+msgstr ""
+"Die Werkzeugleiste bietet Ihnen fünf Knöpfe, um über verschiedene Ansichten "
+"Ihren Kalender zu betrachten."
 
-#: C/evolution.xml:3591(para)
+#: C/evolution.xml:3607(para)
 msgid "Calendar View"
 msgstr "Kalenderansicht"
 
-#: C/evolution.xml:3594(para)
+#: C/evolution.xml:3610(para)
 msgid "Shortcut Keys"
 msgstr "Tastenkombination"
 
-#: C/evolution.xml:3601(para)
+#: C/evolution.xml:3617(para)
 msgid "Day"
 msgstr "Tagesansicht"
 
-#: C/evolution.xml:3604(para)
+#: C/evolution.xml:3620(para)
 msgid "control+y"
 msgstr "Steuerung+Y"
 
-#: C/evolution.xml:3609(para)
+#: C/evolution.xml:3625(para)
 msgid "Work Week"
 msgstr "Arbeitswochenansicht"
 
-#: C/evolution.xml:3612(para)
+#: C/evolution.xml:3628(para)
 msgid "control+j"
 msgstr "Steuerung+J"
 
-#: C/evolution.xml:3617(para)
+#: C/evolution.xml:3633(para)
 msgid "Week"
 msgstr "Wochenansicht"
 
-#: C/evolution.xml:3620(para)
+#: C/evolution.xml:3636(para)
 msgid "control+k"
 msgstr "Steuerung+K"
 
-#: C/evolution.xml:3625(para)
+#: C/evolution.xml:3641(para)
 msgid "Month"
 msgstr "Monatsansicht"
 
-#: C/evolution.xml:3628(para)
+#: C/evolution.xml:3644(para)
 msgid "control+m"
 msgstr "Steuerung+M"
 
-#: C/evolution.xml:3633(para)
+#: C/evolution.xml:3649(para)
 msgid "List"
 msgstr "Listenansicht"
 
-#: C/evolution.xml:3636(para)
+#: C/evolution.xml:3652(para)
 msgid "control+l"
 msgstr "Steuerung+L"
 
-#: C/evolution.xml:3642(para)
+#: C/evolution.xml:3658(para)
 msgid ""
-"You can also select an arbitrary range of days in the small calendar just "
-"above the switcher at the left. To do this, select the days that you want to "
-"view in your calendar."
+"You can also select an arbitrary range of days in the small calendar in the "
+"side bar. To do this, select the days that you want to view in your calendar."
 msgstr ""
 "Sie können auch eine freigewählte Anzahl an Tagen im kleinen Kalender in der "
 "Seitenleiste links auswählen. Wählen Sie hierzu die Tage aus, die in Ihrer "
 "Kalenderansicht angezeigt werden sollen."
 
-#: C/evolution.xml:3644(para)
+#: C/evolution.xml:3660(para)
 msgid ""
-"The Prev and Next buttons move you forward and back in your calendar pages. "
-"If you are using a week or month view, you can move by week or month. To "
-"return to today's listing, click the Today button in the toolbar."
+"The Previous and Next buttons move you forward and back in your calendar "
+"pages. If you are using a week or month view, you can move by week or month. "
+"To return to today's listing, click the Today button in the toolbar."
 msgstr ""
 "Mit den »Vorherige«- und »Weiter«-Knöpfen in der Werkzeugleiste können Sie "
 "sich vorwärts und rückwärts in den Kalenderseiten bewegen. Falls Sie die "
@@ -8607,7 +8564,7 @@ msgstr ""
 "Woche oder einen Monat. Um auf die heutige Seite zurückzukehren, klicken Sie "
 "auf den »Heute«-Knopf in der Werkzeugleiste."
 
-#: C/evolution.xml:3645(para)
+#: C/evolution.xml:3661(para)
 msgid ""
 "To visit calendar entries for a specific date, click Go To and select the "
 "date in the dialog box that appears."
@@ -8616,11 +8573,11 @@ msgstr ""
 "Sie auf den »Gehe zu«-Knopf in der Werkzeugleiste und wählen Sie dann das "
 "gewünschte Datum aus."
 
-#: C/evolution.xml:3648(title)
+#: C/evolution.xml:3664(title)
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
 
-#: C/evolution.xml:3649(para)
+#: C/evolution.xml:3665(para)
 msgid ""
 "Evolution allows you to edit the label of your calendar, assign color, and "
 "copy content for offline use. To set your calendar properties"
@@ -8629,31 +8586,31 @@ msgstr ""
 "Kalenderinhalt lokal zur Arbeit im Offline-Modus kopieren. Um die "
 "Eigenschaften einzustellen"
 
-#: C/evolution.xml:3652(para)
-msgid "Select the calendar from the folder view at the left."
-msgstr "Wählen Sie den Kalender."
+#: C/evolution.xml:3668(para)
+msgid "Select the calendar from the side bar at the left."
+msgstr "Wählen Sie den Kalender aus der Seitenleiste links."
 
-#: C/evolution.xml:3655(para)
-msgid "Right click."
-msgstr "Klicken Sie mit der rechten Maustaste auf den Kalender."
+#: C/evolution.xml:3671(para)
+msgid "Right click on the calendar."
+msgstr "Klicken Sie mit rechts auf den Kalender."
 
-#: C/evolution.xml:3658(para)
-msgid "Select Properties to open Calendar Properties dialogue box."
+#: C/evolution.xml:3674(para)
+msgid "Select Properties to open Calendar Properties dialog box."
 msgstr "Wählen Sie Eigenschaften aus."
 
-#: C/evolution.xml:3670(para)
+#: C/evolution.xml:3686(para)
 msgid "Edit the label from Name field."
 msgstr "Ändern Sie den Namen im Name-Feld."
 
-#: C/evolution.xml:3673(para)
-msgid "To assign a color for the calendar, click the Color tab."
+#: C/evolution.xml:3689(para)
+msgid "To assign a color for the calendar, click the Color button."
 msgstr "Um einem Kalender eine Farbe zuzuweisen, klicken Sie auf den Farb-Knopf."
 
-#: C/evolution.xml:3676(para)
+#: C/evolution.xml:3692(para)
 msgid "Select the color and click OK."
 msgstr "Wählen Sie die gewünschte Farbe und klicken Sie auf OK."
 
-#: C/evolution.xml:3679(para)
+#: C/evolution.xml:3695(para)
 msgid ""
 "To mark your calendar content for offline use, click Copy calendar contents "
 "locally for offline operations."
@@ -8661,7 +8618,7 @@ msgstr ""
 "Um den Kalender für Offline-Benutzung zu markieren, wählen Sie »Den "
 "Kalenderinhalt lokal zur Arbeit im Offline-Modus kopieren« aus."
 
-#: C/evolution.xml:3681(para)
+#: C/evolution.xml:3697(para)
 msgid ""
 "Right click on the calendar at the left and select Mark Calendar for offline "
 "use. For more information on working offline refer <link linkend=\"usage-"
@@ -8672,7 +8629,7 @@ msgstr ""
 "Offline-Arbeiten siehe <link linkend=\"usage-mail-getnsend-offline\">Offline "
 "arbeiten</link>."
 
-#: C/evolution.xml:3683(para)
+#: C/evolution.xml:3699(para)
 msgid ""
 "To export or share or to store a calendar locally in iCal format, right "
 "click on the calendar in the calendar view at the left and select Save to "
@@ -8683,7 +8640,7 @@ msgstr ""
 "Maustaste auf den gewünschten Kalender in der Seitenleiste links und wählen "
 "Sie »Auf Datenträger speichern«."
 
-#: C/evolution.xml:3685(para)
+#: C/evolution.xml:3701(para)
 msgid ""
 "Click Mark as default folder if you want to mark this folder as your default "
 "calendar folder."
@@ -8691,7 +8648,88 @@ msgstr ""
 "Wählen Sie »Als Vorgabeordner markieren« wenn dieser Ordner als Vorgabe-"
 "Kalenderordner genutzt werden soll."
 
-#: C/evolution.xml:3691(para)
+#: C/evolution.xml:3705(title)
+msgid "Google Calendar"
+msgstr "Google-Kalender"
+
+#: C/evolution.xml:3706(para)
+msgid ""
+"Evolution allows you to access your Google calendar. You can view the Google "
+"calendar offline or create, modify, and delete the calendar items online."
+msgstr ""
+"Evolution ermöglicht Ihnen den Zugriff auf Ihren Google-Kalender. Sie können "
+"Ihren Google-Kalender offline betrachten und online Kalendereinträge "
+"erstellen, bearbeiten und löschen."
+
+#: C/evolution.xml:3707(para)
+msgid "To integrate the Google calendar to Evolution:"
+msgstr "Um Ihren Google-Kalender in Evolution zu nutzen:"
+
+#: C/evolution.xml:3710(para)
+msgid "Click New, then select Calendar to open the New Calendar dialog."
+msgstr "Klicken Sie auf Neu &gt; Kalender."
+
+#: C/evolution.xml:3713(para)
+msgid "Select Google from the Type drop-down list."
+msgstr "Wählen Sie in der »Art«-Auswahlliste Google aus."
+
+#: C/evolution.xml:3718(para)
+msgid "Specify the following:"
+msgstr "Geben Sie folgendes an:"
+
+#: C/evolution.xml:3722(title)
+msgid "Name:"
+msgstr "Name:"
+
+#: C/evolution.xml:3723(para)
+msgid "Specify a name for the Google calendar"
+msgstr "Geben Sie einen Namen für den Google-Kalender ein"
+
+#: C/evolution.xml:3728(title)
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: C/evolution.xml:3729(para)
+msgid "Specify your username for your Google account"
+msgstr "Geben Sie den Benutzernamen für Ihr Google-Konto ein."
+
+#: C/evolution.xml:3735(para)
+msgid "Set the time to automatically refresh the calendar."
+msgstr ""
+"Setzen Sie eine Zeit für die Häufigkeit der Aktualisierung, welche bestimmt, "
+"wie oft Evolution nach Änderungen im Kalender schauen soll."
+
+#: C/evolution.xml:3738(para)
+msgid ""
+"Select Use SSL to enable SSL for communication between Evolution and the "
+"Google server."
+msgstr ""
+"Wählen Sie »SSL verwenden« um eine sichere verschlüsselte Verbindung zwischen "
+"Evolution und dem Google-Server zu erzeugen."
+
+#: C/evolution.xml:3741(para)
+msgid ""
+"If you want to set a color label for the calendar, click the Color tab, "
+"select the desired color, then click OK."
+msgstr ""
+"Um einem Kalender eine Farbe zuzuweisen, klicken Sie auf den Farb-Knopf, "
+"wählen Sie die gewünschte Farbe, und klicken Sie auf OK."
+
+#: C/evolution.xml:3744(para)
+msgid ""
+"If you want to view the calendar items offline, select Copy calendar content "
+"locally for offline operation check box."
+msgstr ""
+"Um den Kalender für Offline-Benutzung zu markieren, wählen Sie »Den "
+"Kalenderinhalt lokal zur Arbeit im Offline-Modus kopieren« aus."
+
+#: C/evolution.xml:3745(para)
+msgid "If you select this option, you cannot modify or create the calendar items."
+msgstr ""
+"Falls Sie diese Option wählen können Sie Kalendereinträge weder erzeugen "
+"noch bearbeiten."
+
+#: C/evolution.xml:3755(para)
 msgid ""
 "There are two types of events you can schedule with Evolution: appointments "
 "and meetings. An appointment is an event you schedule for yourself only, and "
@@ -8706,102 +8744,105 @@ msgstr ""
 "Besprechungen nutzen, um die Verfügbarkeit der eingeladenen Teilnehmer zu "
 "prüfen."
 
-#: C/evolution.xml:3694(link) C/evolution.xml:3717(title)
+#: C/evolution.xml:3758(link) C/evolution.xml:3781(title)
 msgid "Appointments"
 msgstr "Termine"
 
-#: C/evolution.xml:3697(link) C/evolution.xml:3890(title)
+#: C/evolution.xml:3761(link) C/evolution.xml:3953(title)
 msgid "Sending a Meeting Invitation"
 msgstr "Eine Besprechungseinladung verschicken"
 
-#: C/evolution.xml:3700(link) C/evolution.xml:3974(title)
+#: C/evolution.xml:3764(link) C/evolution.xml:4042(title)
 msgid "Accepting and Replying to a Meeting Request"
 msgstr "Eine Besprechungseinladung annehmen und beantworten"
 
-#: C/evolution.xml:3703(link) C/evolution.xml:3992(title)
+#: C/evolution.xml:3767(link) C/evolution.xml:4060(title)
 msgid "Reading Responses to Meeting Requests"
 msgstr "Antworten auf Besprechungseinladungen lesen"
 
-#: C/evolution.xml:3706(link) C/evolution.xml:3997(title)
+#: C/evolution.xml:3770(link) C/evolution.xml:4065(title)
 msgid "Using the Free/Busy View"
 msgstr "Die Verfügbarkeitsansicht benutzen"
 
-#: C/evolution.xml:3709(link) C/evolution.xml:4026(title)
+#: C/evolution.xml:3773(link) C/evolution.xml:4094(title)
 msgid "Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Kalender- und Verfügbarkeitsinformationen veröffentlichen ohne einen "
 "GroupWare-Server"
 
-#: C/evolution.xml:3712(link) C/evolution.xml:4059(title)
+#: C/evolution.xml:3776(link) C/evolution.xml:4127(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Verfügbarkeitsinformationen abrufen ohne einen GroupWare-Server"
 
-#: C/evolution.xml:3718(para)
+#: C/evolution.xml:3782(para)
 msgid "In Evolution, an appointment is an event you schedule for yourself."
-msgstr "In Evolution ist ein Termin ein Ereignis, das Sie nur für sich selbst planen."
+msgstr ""
+"In Evolution ist ein Termin ein Ereignis, das Sie nur für sich selbst planen."
 
-#: C/evolution.xml:3721(link) C/evolution.xml:3735(title)
+#: C/evolution.xml:3785(link) C/evolution.xml:3799(title)
 msgid "Creating Appointments"
 msgstr "Termine erstellen"
 
-#: C/evolution.xml:3724(link) C/evolution.xml:3821(title)
-#: C/evolution.xml:5297(title)
+#: C/evolution.xml:3788(link) C/evolution.xml:3887(title)
+#: C/evolution.xml:5317(title)
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: C/evolution.xml:3727(link) C/evolution.xml:3860(title)
+#: C/evolution.xml:3791(link) C/evolution.xml:3923(title)
 msgid "Classifications"
 msgstr "Einstufungen"
 
-#: C/evolution.xml:3730(link) C/evolution.xml:3883(title)
+#: C/evolution.xml:3794(link) C/evolution.xml:3946(title)
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: C/evolution.xml:3738(para)
+#: C/evolution.xml:3802(para)
 msgid "Click File &gt; New &gt; Appointment."
 msgstr "Klicken Sie auf Datei &gt; Neu &gt; Termin."
 
-#: C/evolution.xml:3740(para)
-msgid "Click Calendars on the Switcher, then click New &gt; Appointment."
-msgstr "Wählen Sie Neu &gt; Termin in der Werkzeugleiste."
+#: C/evolution.xml:3804(para)
+msgid ""
+"Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
+msgstr ""
+"Gehen Sie zur Kalenderansicht und wählen Sie Datei &gt; Neu &gt; Termin in "
+"der Menüleiste."
 
-#: C/evolution.xml:3742(para)
+#: C/evolution.xml:3806(para)
 msgid ""
 "Double-click in a blank space on the calendar view to open an Appointment "
-"dialogue box. The appointment is created for that particular time on the "
-"calendar view against which you have double clicked on."
+"dialog box. The particular time on the calendar view against which you have "
+"double clicked on will be suggested for the new appointment."
 msgstr ""
 "Klicken Sie zweimal in einen leeren Bereich in der Kalenderansicht um den "
 "Termin-Editor zu erhalten. Der Termin wird für die Zeit vorgeschlagen, auf "
 "welche Sie in der Kalenderansicht geklickt haben."
 
-#: C/evolution.xml:3744(para)
+#: C/evolution.xml:3808(para)
 msgid "Select the required duration on the calender view and enter the summary."
 msgstr ""
 "Wählen Sie die gewünschte Dauer des Termins in der Kalenderansicht und geben "
 "Sie eine Zusammenfassung ein."
 
-#: C/evolution.xml:3747(para)
-msgid ""
-"Select a calendar in the Calendar drop-down list. Type a brief summary of "
-"the appointment in the Summary field."
-msgstr ""
-"Wählen Sie einen Kalender aus der Auswahlliste aus. Geben Sie eine kurze "
-"Zusammenfassung für den Termin in das »Zusammenfassung«-Feld ein."
+#: C/evolution.xml:3811(para) C/evolution.xml:3966(para)
+msgid "Select a calendar in the Calendar drop-down list."
+msgstr "Wählen Sie einen Kalender in der Kalender-Auswahlliste."
 
-#: C/evolution.xml:3752(para)
-msgid "Type a location for the appointment in the Location field."
-msgstr "Geben Sie einen Ort für den Termin in das »Ort«-Feld ein."
+#: C/evolution.xml:3812(para) C/evolution.xml:3823(para)
+#: C/evolution.xml:3981(para) C/evolution.xml:4364(para)
+#: C/evolution.xml:4418(para) C/evolution.xml:4650(para)
+#: C/evolution.xml:5716(para)
+msgid "Enter a brief summary in the Summary field."
+msgstr "Geben Sie eine kurze Zusammenfassung in das »Zusammenfassung«-Feld ein."
 
-#: C/evolution.xml:3755(para)
-msgid "Select the date, time and set the duration"
-msgstr "Wählen Sie das Datum, die Zeit und die Dauer."
+#: C/evolution.xml:3817(para) C/evolution.xml:3984(para)
+msgid "(Optional) Type a location in the Location field."
+msgstr "(Optional) Geben Sie einen Ort im »Ort«-Feld ein."
 
-#: C/evolution.xml:3758(para)
-msgid "Enter a brief summary of the appointment in the description field."
-msgstr "Geben Sie eine kurze Beschreibung im »Beschreibung«-Feld ein."
+#: C/evolution.xml:3820(para)
+msgid "Select the date and time."
+msgstr "Wählen Sie Datum und Zeit."
 
-#: C/evolution.xml:3761(para)
+#: C/evolution.xml:3826(para) C/evolution.xml:3987(para)
 msgid ""
 "To select this appointment as an all day event, click Options &gt; All Day "
 "Event."
@@ -8809,97 +8850,113 @@ msgstr ""
 "Falls dieser Termin den ganzen Tag betrifft, wählen Sie Optionen &gt; "
 "Ganztägiges Ereignis in der Menüleiste aus."
 
-#: C/evolution.xml:3763(para)
+#: C/evolution.xml:3828(para) C/evolution.xml:3989(para)
 msgid "Click the All Day Event button on the toolbar."
-msgstr "Klicken Sie auf den »Ganztägiges Ereignis«-Knopf in der Werkzeugleiste aus."
+msgstr ""
+"Klicken Sie auf den »Ganztägiges Ereignis«-Knopf in der Werkzeugleiste aus."
 
-#: C/evolution.xml:3766(para)
-msgid "If the event is an all day event, specify a starting and ending date."
+#: C/evolution.xml:3831(para) C/evolution.xml:3992(para)
+msgid ""
+"If the event is an all day event, specify a starting date and an ending date."
 msgstr ""
 "Falls das Ereignis ein ganztägiges Ereignis ist, geben Sie ein Anfangsdatum "
 "und ein Enddatum ein."
 
-#: C/evolution.xml:3769(para)
-msgid "If the event is not an all day event, specify a starting and ending time."
+#: C/evolution.xml:3834(para) C/evolution.xml:3995(para)
+msgid ""
+"If the event is not an all day event, specify a starting time and an ending "
+"time."
 msgstr ""
 "Falls das Ereignis kein ganztägiges Ereignis ist, geben Sie eine Startzeit "
 "und eine Endzeit ein."
 
-#: C/evolution.xml:3772(para)
+#: C/evolution.xml:3837(para) C/evolution.xml:3998(para)
 msgid "Select For to specify the duration."
 msgstr "Wählen Sie »für« um die Dauer des Termins anzugeben."
 
-#: C/evolution.xml:3774(para)
+#: C/evolution.xml:3839(para) C/evolution.xml:4000(para)
 msgid "Select Until to specify the ending time of the event."
 msgstr "Wählen Sie »bis« um die Endzeit des Termins anzugeben."
 
-#: C/evolution.xml:3777(para) C/evolution.xml:3936(para)
-#: C/evolution.xml:4305(para) C/evolution.xml:4356(para)
+#: C/evolution.xml:3842(para) C/evolution.xml:4003(para)
+#: C/evolution.xml:4373(para) C/evolution.xml:4424(para)
 msgid "Type the time zone information in the Time Zone field."
 msgstr "Geben Sie die Zeitzone in das Zeitzone-Feld ein."
 
-#: C/evolution.xml:3779(para) C/evolution.xml:3938(para)
-#: C/evolution.xml:4307(para) C/evolution.xml:4358(para)
+#: C/evolution.xml:3844(para) C/evolution.xml:4005(para)
+#: C/evolution.xml:4375(para) C/evolution.xml:4426(para)
 msgid "Click the globe to customize the time zone."
 msgstr "Klicken Sie auf den Globus, um die Zeitzone anzupassen."
 
-#: C/evolution.xml:3780(para) C/evolution.xml:3939(para)
-#: C/evolution.xml:4308(para) C/evolution.xml:4359(para)
+#: C/evolution.xml:3845(para) C/evolution.xml:4006(para)
+#: C/evolution.xml:4376(para) C/evolution.xml:4427(para)
 msgid "To hide or show the Time Zone field, click View &gt; Time Zone."
 msgstr ""
 "Um das Zeitzone-Feld anzuzeigen oder zu verstecken, wählen Sie Ansicht &gt; "
 "Zeitzone in der Menüleiste aus."
 
-#: C/evolution.xml:3783(para)
+#: C/evolution.xml:3848(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
 msgstr ""
 "Um die Zeit als beschäftigt anzuzeigen, wählen Sie in der Menüleiste "
 "Optionen &gt; Zeit als beschäftigt anzeigen."
 
-#: C/evolution.xml:3786(para)
-msgid ""
-"(Optional) Type a category in the Categories field. To show or hide the "
-"Categories field, click View &gt; Categories."
+#: C/evolution.xml:3851(para) C/evolution.xml:3929(para)
+#: C/evolution.xml:4379(para) C/evolution.xml:4430(para)
+#: C/evolution.xml:4646(para)
+msgid "(Optional) Type a category in the Categories field."
+msgstr "(Optional) Geben Sie ein Kategorie im »Kategorien«-Feld ein."
+
+#: C/evolution.xml:3852(para) C/evolution.xml:3935(para)
+#: C/evolution.xml:4380(para) C/evolution.xml:4431(para)
+msgid "To show or hide the Categories field, click View &gt; Categories."
 msgstr ""
-"(Optional) Geben Sie eine Kategorie im Kategorien-Feld an. Um das "
-"»Kategorien«-Feld anzuzeigen oder zu verstecken, klicken Sie auf Ansicht "
-"&gt; Kategorien in der Menüleiste."
+"Um das »Kategorien«-Feld anzuzeigen oder zu verstecken, klicken Sie auf "
+"Ansicht &gt; Kategorien in der Menüleiste."
 
-#: C/evolution.xml:3787(para)
+#: C/evolution.xml:3855(para) C/evolution.xml:4383(para)
+#: C/evolution.xml:4434(para) C/evolution.xml:4656(para)
+#: C/evolution.xml:5725(para)
+msgid "(Optional) Enter a description in the Description field."
+msgstr "(Optional) Geben Sie eine Beschreibung im »Beschreibung«-Feld ein."
+
+#: C/evolution.xml:3858(para) C/evolution.xml:3913(para)
+#: C/evolution.xml:4009(para)
 msgid ""
-"For more information on categories, see <link linkend=\"bxmtbjb"
-"\">Classifications</link>."
+"To create an alarm for this appointment, click Alarms on the toolbar, or "
+"click Options &gt; Alarms."
 msgstr ""
+"Um einen Alarm für diesen Termin zu erzeugen, klicken Sie auf »Alarme« in der "
+"Werkzeugleiste, oder wählen Sie Optionen &gt; Alarme in der Menüleiste."
 
-#: C/evolution.xml:3790(para)
-msgid "Type a description in the Description field."
-msgstr "Geben Sie eine Beschreibung im »Beschreibung«-Feld ein."
-
-#: C/evolution.xml:3793(para)
-msgid "To select an alarm for this appointment, click Alarm on the toolbar."
+#: C/evolution.xml:3859(para) C/evolution.xml:3916(para)
+#: C/evolution.xml:4010(para)
+msgid "Select Customize to add or remove customized alarms for the event."
 msgstr ""
-"Um einen Alarm für diesen Termin auszuwählen, klicken Sie auf »Alarme« in "
-"der Werkzeugleiste."
+"Wählen Sie »Anpassen« in der Auswahlliste, um angepasste Alarme für dieses "
+"Ereignis hinzuzufügen oder zu entfernen."
 
-#: C/evolution.xml:3794(para)
+#: C/evolution.xml:3860(para) C/evolution.xml:4011(para)
 msgid ""
-"If you select an alarm, specify when and how you want the alarm to notify. "
 "For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
 "link>."
 msgstr ""
-"Wenn Sie einen Alarm setzen, geben Sie an wann und wie der Alarm Sie "
-"benachrichtigen soll. Für weitere Informationen zu Alarmen siehe <link "
-"linkend=\"bshly4v\">Erinnerungen</link>."
+"Für weitere Informationen zu Alarmen siehe <link linkend=\"bshly4v"
+"\">Erinnerungen</link>."
 
-#: C/evolution.xml:3797(para) C/evolution.xml:3946(para)
+#: C/evolution.xml:3863(para) C/evolution.xml:4014(para)
+#: C/evolution.xml:4392(para) C/evolution.xml:4437(para)
+#: C/evolution.xml:4659(para)
 msgid ""
-"(Optional) To add an attachment to the appointment, drag and drop the "
-"attachment into the attachment bar."
+"(Optional) To add an attachment, drag and drop the attachment into the "
+"attachment bar."
 msgstr ""
-"(Optional) Um einem Termin einen Anhang hinzuzufügen, ziehen Sie den Anhang "
-"per Maus in die Anlagenleiste und lassen Sie dann die Maustaste los."
+"(Optional) Um einen Anhang hinzuzufügen, ziehen Sie den Anhang per Maus in "
+"die Anlagenleiste und lassen Sie dann die Maustaste los."
 
-#: C/evolution.xml:3799(para) C/evolution.xml:3948(para)
+#: C/evolution.xml:3865(para) C/evolution.xml:4016(para)
+#: C/evolution.xml:4394(para) C/evolution.xml:4439(para)
+#: C/evolution.xml:4661(para)
 msgid ""
 "Click the Attach button on the toolbar, or click Insert &gt; Attachment and "
 "then browse to the attachment."
@@ -8908,7 +8965,7 @@ msgstr ""
 "Einfügen &gt; Anlage aus der Menüleiste aus, und wählen Sie dann die Anlage "
 "aus."
 
-#: C/evolution.xml:3802(para) C/evolution.xml:3951(para)
+#: C/evolution.xml:3868(para) C/evolution.xml:4019(para)
 msgid ""
 "(Optional) Select a classification (Public, Private, or Confidential) by "
 "clicking &gt; Options &gt; Classifications."
@@ -8916,11 +8973,12 @@ msgstr ""
 "(Optional) Klicken Sie auf Optionen &gt; Einstufung und wählen Sie eine "
 "Einstufung (Öffentlich, Privat, Vertraulich) aus."
 
-#: C/evolution.xml:3805(para) C/evolution.xml:3954(para)
+#: C/evolution.xml:3871(para) C/evolution.xml:4022(para)
 msgid "(Optional) Click the Recurrence button on the toolbar."
-msgstr "(Optional) Klicken Sie auf den »Wiederholung«-Knopf in der Werkzeugleiste."
+msgstr ""
+"(Optional) Klicken Sie auf den »Wiederholung«-Knopf in der Werkzeugleiste."
 
-#: C/evolution.xml:3807(para) C/evolution.xml:3956(para)
+#: C/evolution.xml:3873(para) C/evolution.xml:4024(para)
 msgid ""
 "Click Options &gt; Recurrence, and specify whether you want the appointment "
 "to recur and how often."
@@ -8928,11 +8986,11 @@ msgstr ""
 "Wählen Sie Optionen &gt; Wiederholung in der Menüleiste aus, und geben Sie "
 "an ob und wie oft der Termin wiederholt werden soll."
 
-#: C/evolution.xml:3812(title)
+#: C/evolution.xml:3878(title)
 msgid "All Day Event"
 msgstr "Ganztägiges Ereignis"
 
-#: C/evolution.xml:3813(para)
+#: C/evolution.xml:3879(para)
 msgid ""
 "An All Day event appears at the top of a day's appointment list, in the "
 "header under the date, rather than inside. That makes it easy to have "
@@ -8950,7 +9008,7 @@ msgstr ""
 "genau definierten Start- und Endzeiten können sich auch überschneiden; falls "
 "dies der Fall ist werden sie nebeneinander in der Tagesansicht dargestellt."
 
-#: C/evolution.xml:3814(para)
+#: C/evolution.xml:3880(para)
 msgid ""
 "If you create calendar appointments that overlap, Evolution displays them "
 "side by side in your calendar."
@@ -8958,7 +9016,7 @@ msgstr ""
 "Wenn Sie Kalendereinträge erzeugen, die sich zeitlich überschneiden, so "
 "zeigt Evolution diese Termin nebeneinander in Ihrem Kalender an."
 
-#: C/evolution.xml:3822(para)
+#: C/evolution.xml:3888(para)
 msgid ""
 "You can have several Reminders for individual appointments, any time prior "
 "to the appointment you schedule. You can have one reminder of each of the "
@@ -8968,29 +9026,29 @@ msgstr ""
 "jeder gewünschten Zeit vor dem jeweiligen Termin. Sie können aus folgenden "
 "Arten wählen, um eine Erinnerung zu erzeugen:"
 
-#: C/evolution.xml:3826(title)
+#: C/evolution.xml:3892(title)
 msgid "Display:"
 msgstr "Alarm-Popup anzeigen:"
 
-#: C/evolution.xml:3827(para)
+#: C/evolution.xml:3893(para)
 msgid "A notification pops up on your screen to remind you of your appointment."
 msgstr ""
 "Ein Benachrichtigungsfenster öffnet sich auf Ihrem Bildschirm, um Sie an den "
 "Termin zu erinnern."
 
-#: C/evolution.xml:3832(title)
+#: C/evolution.xml:3898(title)
 msgid "Audio:"
 msgstr "Einen Klang abspielen:"
 
-#: C/evolution.xml:3833(para)
+#: C/evolution.xml:3899(para)
 msgid "Your computer delivers a sound alarm."
 msgstr "Der Computer spielt einen Klang ab."
 
-#: C/evolution.xml:3838(title)
+#: C/evolution.xml:3904(title)
 msgid "Program:"
 msgstr "Ein Programm ausführen:"
 
-#: C/evolution.xml:3839(para)
+#: C/evolution.xml:3905(para)
 msgid ""
 "You can run a program as a reminder. You can enter its name in the text "
 "field, or find it with the Browse button."
@@ -8998,7 +9056,7 @@ msgstr ""
 "Sie können ein Computer-Programm als Erinnerung starten. Wählen Sie das "
 "gewünschte Programm aus."
 
-#: C/evolution.xml:3843(para)
+#: C/evolution.xml:3909(para)
 msgid ""
 "Apart from the above notifications, the Evolution alarm icon blinks in the "
 "notification area. To pause the alarm or view the event, click the "
@@ -9008,35 +9066,17 @@ msgstr ""
 "Alarm-Symbol im Benachrichtigungsfeld. Um den Alarm zu unterbrechen oder den "
 "Termin zu betrachten, klicken Sie auf das Benachrichtigungssymbol."
 
-#: C/evolution.xml:3844(para)
+#: C/evolution.xml:3910(para)
 msgid "To create a reminder:"
 msgstr "Eine Erinnerung erzeugen:"
 
-#: C/evolution.xml:3847(para)
-msgid ""
-"When creating an appointment, click Alarms on the toolbar, or click Options "
-"&gt; Alarms."
-msgstr ""
-"Wenn Sie einen Termin erzeugen, klicken Sie auf »Alarme« in der "
-"Werkzeugleiste, oder wählen Sie Optionen &gt; Alarme in der Menüleiste."
-
-#: C/evolution.xml:3850(para)
-msgid "Select the alarm for the event."
-msgstr "Wählen Sie einen Alarm für diesen Termin aus."
-
-#: C/evolution.xml:3853(para)
-msgid "Select Customize to add or remove customized alarms for the event."
-msgstr ""
-"Wählen Sie »Anpassen« in der Auswahlliste, um angepasste Alarme für dieses "
-"Ereignis hinzuzufügen oder zu entfernen."
-
-#: C/evolution.xml:3856(para)
+#: C/evolution.xml:3919(para)
 msgid ""
 "If you have stored reminders in a local calendar, they work from the moment "
 "you log in. However, for reminders stored on any remote server like "
-"GroupWise Exchange which requires authentication, you must run Evolution at "
-"least once after logging in. No matter where the reminders are stored, you "
-"can quit Evolution and still be reminded of an upcoming appointment."
+"GroupWise or Exchange which requires authentication, you must run Evolution "
+"at least once after logging in. No matter where the reminders are stored, "
+"you can quit Evolution and still be reminded of an upcoming appointment."
 msgstr ""
 "Alarmbenachrichtigungen für Besprechungen in einem nicht-lokalen Kalender "
 "wie Exchange oder GroupWise funktionieren erst, nachdem Sie Evolution einmal "
@@ -9046,27 +9086,28 @@ msgstr ""
 "Alarmbenachrichtigungen gespeichert sind: Sie können nun Evolution beenden "
 "und werden trotzdem über einen bevorstehenden Termin alarmiert."
 
-#: C/evolution.xml:3861(para)
+#: C/evolution.xml:3924(para)
 msgid ""
-"If you are using a calendar on a Novell GroupWise® or Microsoft Exchange "
-"server, select a classification for the appointment to determine who can "
-"view it. Public is the default category, and a public appointment can be "
-"viewed by anyone on the calendar-sharing network. Private denotes one level "
-"of security, and Confidential an even higher level. The different levels "
-"vary depending on your server settings; check with your system administrator "
-"or adjust your delegation settings."
-msgstr ""
-"Falls Sie einen Kalender auf einem Novell GroupWise- oder Microsoft Exchange-"
-"Server benutzen, wählen Sie eine Einstufung für den Termin um zu bestimmen, "
-"wer den Termin sehen kann. Die Vorgabe-Einstufung ist »öffentlich«; "
-"öffentliche Termine können von jeder Person im Kalender-Netzwerk betrachtet "
-"werden. »Privat« bezeichnet einen ersten Grad an Vertraulichkeit, und "
-"»Vertraulich« einen höheren Grad. Die verschiedenen Grade können je nach "
-"Server-Einstellungen unterschiedlich sein; fragen Sie Ihren "
-"Systemadministrator oder ändern Sie Ihre Zuweisungseinstellungen "
-"dementsprechend."
-
-#: C/evolution.xml:3862(para)
+"If you are using a calendar on a Novell <trademark class=\"registered"
+"\">GroupWise</trademark> or Microsoft Exchange server, select a "
+"classification for the appointment to determine who can view it. Public is "
+"the default category, and a public appointment can be viewed by anyone on "
+"the calendar-sharing network. Private denotes one level of security, and "
+"Confidential an even higher level. The different levels vary depending on "
+"your server settings; check with your system administrator or adjust your "
+"delegation settings."
+msgstr ""
+"Falls Sie einen Kalender auf einem Novell <trademark class=\"registered"
+"\">GroupWise</trademark>- oder Microsoft Exchange-Server benutzen, wählen "
+"Sie eine Einstufung für den Termin um zu bestimmen, wer den Termin sehen "
+"kann. Die Vorgabe-Einstufung ist »öffentlich«; öffentliche Termine können von "
+"jeder Person im Kalender-Netzwerk betrachtet werden. »Privat« bezeichnet "
+"einen ersten Grad an Vertraulichkeit, und »Vertraulich« einen höheren Grad. "
+"Die verschiedenen Grade können je nach Server-Einstellungen unterschiedlich "
+"sein; fragen Sie Ihren Systemadministrator oder ändern Sie Ihre "
+"Zuweisungseinstellungen dementsprechend."
+
+#: C/evolution.xml:3925(para)
 msgid ""
 "If you are using a Novell GroupWise or Microsoft Exchange server, other "
 "people on the server can check your schedule to see if you are available at "
@@ -9082,36 +9123,26 @@ msgstr ""
 "&gt; Zeit als beschäftigt anzeigen in der Menüleiste. Per Vorgabe werden "
 "Termine als beschäftigt angezeigt."
 
-#: C/evolution.xml:3863(para)
-msgid "You can categorize appointments in the same way you can categorize contacts."
+#: C/evolution.xml:3926(para)
+msgid ""
+"You can categorize appointments in the same way you can categorize contacts."
 msgstr ""
 "Sie können Termine genauso wie Kontakte in verschiedene Kategorien "
 "einsortieren."
 
-#: C/evolution.xml:3866(para)
-msgid "Type a category in the Categories field."
-msgstr "(Optional) Geben Sie ein Kategorie im »Kategorien«-Feld ein."
-
-#: C/evolution.xml:3869(para)
+#: C/evolution.xml:3932(para)
 msgid ""
 "Select the check box next to each category that matches the appointment you "
 "are creating."
 msgstr "Wählen Sie die gewünschten Ankreuzfelder der jeweiligen Kategorien aus."
 
-#: C/evolution.xml:3872(para) C/evolution.xml:4363(para)
-#: C/evolution.xml:4579(para)
-msgid "To show or hide Categories field, click View &gt; Categories."
-msgstr ""
-"Um das »Kategorien«-Feld anzuzeigen oder zu verstecken, klicken Sie auf "
-"Ansicht &gt; Kategorien in der Menüleiste."
-
-#: C/evolution.xml:3876(para)
+#: C/evolution.xml:3939(para)
 msgid ""
 "You can add a new category to your category list by clicking Edit Master "
 "Category List, then click Click Here To Add A Category."
 msgstr "Um eine neue Kategorie zur Kategorienliste hinzuzufügen, TODO"
 
-#: C/evolution.xml:3878(para)
+#: C/evolution.xml:3941(para)
 msgid ""
 "After you have selected your categories, click OK to assign these categories "
 "to the appointment. The categories you selected are now listed in the text "
@@ -9121,12 +9152,12 @@ msgstr ""
 "ausgewählt haben. Die ausgewählten Kategorien werden nun im Textfeld neben "
 "dem »Kategorien«-Knopf aufgelistet."
 
-#: C/evolution.xml:3879(para)
+#: C/evolution.xml:3942(para)
 msgid ""
 "Appointments with categories appear with icons in the calendar display, and "
 "you can also search for appointments by category. To display only the "
-"appointments in a particular category, select Category Is in the search bar "
-"at the top of the calendar, and select a category."
+"appointments in a particular category, select the corresponding category in "
+"the search bar at the top of the calendar."
 msgstr ""
 "Termine mit Kategorien erscheinen mit kleinen Symbolen in der "
 "Kalenderanzeige, und Sie können auch nach Terminen suchen, indem Sie nach "
@@ -9134,15 +9165,15 @@ msgstr ""
 "angezeigt zu bekommen, wählen Sie diese aus der Auswahlliste links oben, "
 "direkt über der Kalenderanzeige neben »Anzeigen« aus."
 
-#: C/evolution.xml:3884(para)
+#: C/evolution.xml:3947(para)
 msgid ""
 "The Recurrence tool button lets you describe repetition in appointments "
 "ranging from once every day up to once every 100 years. You can then choose "
 "a time and date when the appointment stops recurring, and, under Exceptions, "
 "pick individual days when the appointment does not recur. Make your "
-"selections from left to right, and you form a sentence: “Every two weeks on "
-"Monday and Friday until January 3, 2008” or “Every month on the first Friday "
-"for 12 occurrences.”"
+"selections from left to right, and you form a sentence: <quote>Every two "
+"weeks on Monday and Friday until January 3, 2008</quote> or <quote>Every "
+"month on the first Friday for 12 occurrences.</quote>"
 msgstr ""
 "Die Wiederholungsfunktion kann Wiederholungen für einen Termin erzeugen, von "
 "jedem Tag bis einmal in hundert Jahren. Sie können eine Zeit und ein Datum "
@@ -9152,10 +9183,10 @@ msgstr ""
 "Alle zwei Wochen bei Montag und Freitag bis 03.01.2008&rdquo; oder &rdquo;"
 "Alle 1 Monat am erster Freitag für 12 Treffer&ldquo; (sic!)."
 
-#: C/evolution.xml:3885(para)
+#: C/evolution.xml:3948(para)
 msgid ""
-"After you have finished settings, click the disk icon in the toolbar to save "
-"and close the appointment editor window. If you want, you can alter an "
+"After you have finished settings, click the Save button in the toolbar to "
+"save and close the appointment editor window. If you want, you can alter an "
 "appointment summary in the calendar view by clicking it and typing. You can "
 "change other settings by right-clicking the appointment then choosing Open, "
 "or double-clicking the appointment."
@@ -9166,7 +9197,7 @@ msgstr ""
 "Einstellungen ändern, indem Sie mit der rechten Maustaste auf den Termin "
 "klicken und »Öffnen« auswählen, oder doppelt auf den Termin klicken."
 
-#: C/evolution.xml:3891(para)
+#: C/evolution.xml:3954(para)
 msgid ""
 "A meeting is an event you schedule for multiple people. Evolution can be "
 "used to schedule group meetings and help you manage responses to meeting "
@@ -9176,12 +9207,13 @@ msgstr ""
 "erfordert. Evolution kann Gruppenbesprechungen planen und Ihnen dabei helfen "
 "die Antworten auf Besprechungsanfragen zu verarbeiten."
 
-#: C/evolution.xml:3892(para)
+#: C/evolution.xml:3955(para)
 msgid ""
 "When you create a meeting or group appointment, you can specify the "
-"attendees in several categories, such as “chair” or “required.” When you "
-"save the meeting listing, each attendee is sent an e-mail with the meeting "
-"information, which also gives them the option to respond."
+"attendees in several categories, such as <quote>chair</quote> or "
+"<quote>required.</quote> When you save the meeting listing, each attendee is "
+"sent an email with the meeting information, which also gives them the option "
+"to respond."
 msgstr ""
 "Wenn Sie einen Besprechung oder Gruppentermin erstellen, so können Sie die "
 "Teilnehmer in mehrere Kategorien einordnen, wie zum Beispiel als &ldquo;"
@@ -9189,14 +9221,14 @@ msgstr ""
 "Besprechung speichern wird jedem Teilnehmer eine E-Mail mit Informationen "
 "zur Besprechung und der Möglichkeit zur Antwort geschickt."
 
-#: C/evolution.xml:3893(para)
+#: C/evolution.xml:3956(para)
 msgid ""
 "If you don't need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
-"and select Forward as iCalendar. This opens a new e-mail message with the "
+"and select Forward as iCalendar. This opens a new email message with the "
 "event notification attached as an announcement. Recipients can add the event "
-"to their calendars with one click, but it won't automatically send you e-"
-"mail about whether they plan to attend."
+"to their calendars with one click, but it won't automatically send you email "
+"about whether they plan to attend."
 msgstr ""
 "Falls Sie als Organisator keine Anwesenheitsinformationen von Teilnehmer "
 "erhalten möchten und einfach nur das Ereignis ankündigen möchten, klicken "
@@ -9206,45 +9238,41 @@ msgstr ""
 "mit einem Klick hinzufügen, aber Ihnen wird keine E-Mail geschickt, ob ein "
 "Empfänger plant anwesend zu sein."
 
-#: C/evolution.xml:3894(para)
+#: C/evolution.xml:3957(para)
 msgid "To schedule a meeting:"
 msgstr "Um eine Besprechung anzusetzen:"
 
-#: C/evolution.xml:3897(para) C/evolution.xml:4002(para)
+#: C/evolution.xml:3960(para) C/evolution.xml:4070(para)
 msgid "Click File &gt; New &gt; Meeting."
 msgstr "Klicken Sie auf Datei &gt; Neu &gt; Besprechung."
 
-#: C/evolution.xml:3900(para) C/evolution.xml:4341(para)
+#: C/evolution.xml:3963(para) C/evolution.xml:4409(para)
 msgid ""
-"If you have multiple e-mail accounts, select the one to use by selecting an "
+"If you have multiple email accounts, select the one to use by selecting an "
 "item in the Organizer field."
 msgstr ""
 "Falls Sie mehrere E-Mail-Konten haben, wählen Sie das gewünschte Konto in "
 "der Auswahlliste im Organisator-Feld aus."
 
-#: C/evolution.xml:3903(para)
-msgid "Select a calendar in the Calendar drop-down list."
-msgstr "Wählen Sie einen Kalender in der Kalender-Auswahlliste."
-
-#: C/evolution.xml:3906(para) C/evolution.xml:4005(para)
-msgid "Click Add to add the e-mail addresses of people you want to invite."
+#: C/evolution.xml:3969(para) C/evolution.xml:4073(para)
+msgid "Click Add to add the email addresses of people you want to invite."
 msgstr ""
 "Klicken Sie auf den Hinzufügen-Knopf, um die E-Mail-Adressen der Pesonen "
 "hinzuzufügen, die Sie einladen möchten."
 
-#: C/evolution.xml:3909(para)
+#: C/evolution.xml:3972(para)
 msgid "To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 "Um einen Teilnehmer von der Liste zu entfernen, wählen Sie den Teilnehmer "
 "aus und klicken Sie auf den Entfernen-Knopf."
 
-#: C/evolution.xml:3912(para)
+#: C/evolution.xml:3975(para)
 msgid "To edit a field, select the field and click Edit."
 msgstr ""
 "Um ein Feld zu bearbeiten, klicken Sie auf das Feld und klicken Sie dann auf "
 "den Bearbeiten-Knopf."
 
-#: C/evolution.xml:3915(para)
+#: C/evolution.xml:3978(para)
 msgid ""
 "Click View on the menu bar to show or hide the Type, Role, Status, and RSVP "
 "fields."
@@ -9252,63 +9280,7 @@ msgstr ""
 "Klicken Sie auf Ansicht in der Menüleiste, um die Art-, Status- Positions- "
 "und UAwg-Felder anzuzeigen oder zu verbergen."
 
-#: C/evolution.xml:3918(para)
-msgid "Type summary of the meeting in the Summary field."
-msgstr ""
-"Geben Sie eine kurze Zusammenfassung für die Besprechung in das "
-"»Zusammenfassung«-Feld ein."
-
-#: C/evolution.xml:3921(para)
-msgid "Type a location for the meeting in the Location field."
-msgstr "Geben Sie einen Ort für die Besprechung in das »Ort«-Feld ein."
-
-#: C/evolution.xml:3924(para)
-msgid ""
-"To select this meeting as an all day event, click the All Day Event button "
-"on the toolbar."
-msgstr ""
-"Falls diese Besprechung ein ganztägiges Ereignis sein soll, klicken Sie auf "
-"den »Ganztägiges Ereignis«-Knopf in der Werkzeugleiste."
-
-#: C/evolution.xml:3927(para)
-msgid "If the event is an all day event, specify a starting date and an ending date."
-msgstr ""
-"Falls das Ereignis ein ganztägiges Ereignis ist, geben Sie ein Anfangsdatum "
-"und ein Enddatum ein."
-
-#: C/evolution.xml:3930(para)
-msgid ""
-"If the event is not an all day event, specify a starting time and an ending "
-"time."
-msgstr ""
-"Falls das Ereignis kein ganztägiges Ereignis ist, geben Sie eine Startzeit "
-"und eine Endzeit ein."
-
-#: C/evolution.xml:3933(para)
-msgid ""
-"Select For to specify the duration or select Until to specify the ending "
-"time of the event."
-msgstr ""
-"Wählen Sie »für« um die Dauer des Termins anzugeben, oder wählen Sie »bis« "
-"um die Endzeit des Termins anzugeben."
-
-#: C/evolution.xml:3942(para)
-msgid ""
-"(Optional) To set an alarm for this meeting, click Alarms on the toolbar, "
-"then specify when and how you want to the alarm to notify you."
-msgstr ""
-"(Optional) Um einen Alarm für diese Besprechung auszuwählen, klicken Sie auf "
-"»Alarme« in der Werkzeugleiste."
-
-#: C/evolution.xml:3943(para)
-msgid ""
-"For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
-"link>."
-msgstr ""
-"Für weitere Informationen zu Alarmen siehe <link linkend=\"bshly4v"
-"\">Erinnerungen</link>."
-
-#: C/evolution.xml:3959(para)
+#: C/evolution.xml:4027(para)
 msgid ""
 "To query free/busy information for the attendees, click the Free/Busy button "
 "on the toolbar."
@@ -9316,30 +9288,31 @@ msgstr ""
 "Um die Verfügbarkeit der Teilnehmer zu prüfen, klicken Sie auf den "
 "»Verfügbarkeit«-Knopf in der Werkzeugleiste."
 
-#: C/evolution.xml:3961(para)
+#: C/evolution.xml:4029(para)
 msgid "Click Options &gt; Free/Busy."
 msgstr "Klicken Sie auf Optionen &gt; Verfügbarkeit in der Menüleiste."
 
-#: C/evolution.xml:3964(para)
+#: C/evolution.xml:4032(para)
 msgid "Click Save to save the meeting."
 msgstr ""
 "Klicken Sie auf den Speichern-Knopf in der Werkzeugleiste, um die "
 "Besprechung zu speichern."
 
-#: C/evolution.xml:3967(para)
-msgid "An e-mail is sent out to all the recipients, inviting them to your event."
+#: C/evolution.xml:4035(para)
+msgid "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 "Eine E-Mail wird an alle Teilnehmer verschickt, um diese für das Ereignis "
 "einzuladen."
 
-#: C/evolution.xml:3969(para)
+#: C/evolution.xml:4037(para)
 msgid ""
-"A meeting can have only one organizer, and only the organizer can add "
-"participants. You can designate yourself the organizer of the meeting, but "
-"if you are not the original organizer, you can create confusion in the "
-"scheduling process. If you want to invite additional people to a meeting "
-"without changing the organizer, it is best to forward the first organizer's "
-"message to the additional participants."
+"In Evolution, a meeting can have only one organizer, and only the organizer "
+"can add participants to that meeting. Though it is possible to change the "
+"organizer of a meeting, this is not recommended as a means to invite "
+"additional participants to meetings. If you want to invite additional people "
+"to a meeting and are not that meeting's organizer, it is recommended that "
+"you forward the invitation message you received from the original meeting "
+"organiser to additional participants."
 msgstr ""
 "Eine Besprechung kann nur einen Organisator haben, und nur der Organisator "
 "kann Teilnehmer hinzufügen. Sie können sich als Organisator einer "
@@ -9349,7 +9322,7 @@ msgstr ""
 "einfachsten, die eigentliche Einladungsnachricht an weitere Personen "
 "weiterzuleiten."
 
-#: C/evolution.xml:3975(para)
+#: C/evolution.xml:4043(para)
 msgid ""
 "Meeting requests are sent as iCal attachments. To view or respond to one, "
 "click the attachment icon and view it inline in the mail window. All the "
@@ -9362,28 +9335,28 @@ msgstr ""
 "Angaben werden angezeigt, inklusive Zeiten und Daten. Danach können Sie "
 "wählen, wie Sie die Einladung beantworten möchten. Zur Auswahl stehen:"
 
-#: C/evolution.xml:3978(para)
+#: C/evolution.xml:4046(para)
 msgid "Accept"
 msgstr "Annehmen"
 
-#: C/evolution.xml:3981(para)
+#: C/evolution.xml:4049(para)
 msgid "Tentatively Accept"
 msgstr "Vorläufig"
 
-#: C/evolution.xml:3984(para)
+#: C/evolution.xml:4052(para)
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: C/evolution.xml:3987(para)
+#: C/evolution.xml:4055(para)
 msgid ""
-"Click OK to send an e-mail to the organizer with your answer. The event is "
+"Click OK to send an email to the organizer with your answer. The event is "
 "also added to your calendar if you accept."
 msgstr ""
 "Klicken Sie auf OK um eine E-Mail mit Ihrer Antwort an den Organisator zu "
 "senden. Das Ereignis wird zudem zu Ihrem Kalender hinzugefügt, falls Sie "
 "Annehmen ausgewählt haben."
 
-#: C/evolution.xml:3988(para)
+#: C/evolution.xml:4056(para)
 msgid ""
 "After you add the meeting to your calendar, you can make changes to the "
 "information, but if the original organizer sends out another update, your "
@@ -9393,17 +9366,15 @@ msgstr ""
 "Änderungen vornehmen, aber falls der eigentliche Organisator eine "
 "Aktualisierung schickt, können diese Änderungen überschrieben werden."
 
-#: C/evolution.xml:3993(para)
+#: C/evolution.xml:4061(para)
 msgid ""
 "When you get a reply to a meeting invitation you sent, you can view it "
-"inline by clicking the attachment and selecting View Inline. At the bottom, "
-"you can click OK to update your attendee list."
+"inline by clicking the attachment and selecting View Inline."
 msgstr ""
 "Wenn Sie eine Antwort auf eine von Ihnen verschickte Besprechungseinladung "
-"erhalten und diese innerhalb der Nachricht betrachten. Klicken Sie unten auf "
-"OK, um Ihre Teilnehmerliste zu aktualisieren."
+"erhalten und diese innerhalb der Nachricht betrachten."
 
-#: C/evolution.xml:3998(para)
+#: C/evolution.xml:4066(para)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -9424,45 +9395,47 @@ msgstr ""
 "Besprechungseinladungen versenden um Ihre Kalenderplanung mit anderen "
 "Personen abzugleichen."
 
-#: C/evolution.xml:3999(para)
+#: C/evolution.xml:4067(para)
 msgid "To access the free/busy view:"
 msgstr "Um die Verfügbarkeit einzusehen:"
 
-#: C/evolution.xml:4008(para)
-msgid "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
+#: C/evolution.xml:4076(para)
+msgid ""
+"Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
 msgstr ""
 "Klicken Sie auf »Verfügbarkeit« in der Werkzeugleiste, oder klicken Sie auf "
 "Optionen &gt; Verfügbarkeit in der Menüleiste."
 
-#: C/evolution.xml:4013(para)
+#: C/evolution.xml:4081(para)
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
 "the Autopick buttons to choose a time automatically, then click Save and "
 "Close. Attendees on an Exchange server have the appointment updated "
-"automatically; others receive e-mail notification of any change in plans."
+"automatically; others receive email notification of any change in plans."
 msgstr ""
 "Bestimmen Sie die Besprechungszeit, indem Sie entweder im Planungsgitter die "
-"Besprechungszeit per Maus verändern oder indem Sie den »Auto-Auswählen«-"
-"Knopf benutzen, um automatisch eine Zeit auszuwählen. Klicken Sie dann auf "
+"Besprechungszeit per Maus verändern oder indem Sie den »Auto-Auswählen«-Knopf "
+"benutzen, um automatisch eine Zeit auszuwählen. Klicken Sie dann auf "
 "Schließen und dann auf Speichern. Für Teilnehmer auf einem Exchange-Server "
 "wird der Termin automatisch aktualisiert; alle anderen erhalten eine E-Mail-"
 "Benachrichtigung über jegliche Änderungen in der Planung."
 
-#: C/evolution.xml:4017(title)
+#: C/evolution.xml:4085(title)
 msgid "Attendee List:"
 msgstr "Teilnehmer-Liste:"
 
-#: C/evolution.xml:4018(para)
-msgid "The Attendee List shows the people who have been invited to the appointment."
+#: C/evolution.xml:4086(para)
+msgid ""
+"The Attendee List shows the people who have been invited to the appointment."
 msgstr ""
 "Die Teilnehmer-Liste zeigt die Personen an, die für den Termin eingeladen "
 "wurden."
 
-#: C/evolution.xml:4021(title)
+#: C/evolution.xml:4089(title)
 msgid "Schedule Grid:"
 msgstr "Planungsgitter"
 
-#: C/evolution.xml:4022(para)
+#: C/evolution.xml:4090(para)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -9482,7 +9455,7 @@ msgstr ""
 "als URL im Evolution-Adressbuch in die jeweiligen Kontaktinformationen "
 "eingegeben haben."
 
-#: C/evolution.xml:4027(para)
+#: C/evolution.xml:4095(para)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV, FTP server, "
 "or remote machine through secure shell or other Web server with HTTP PUT "
@@ -9495,19 +9468,19 @@ msgstr ""
 "Ihrem Systemadministrator falls Sie sich nicht sicher sind, ob letzteres vom "
 "Server unterstützt wird."
 
-#: C/evolution.xml:4028(para)
+#: C/evolution.xml:4096(para)
 msgid "To set up Calendar or Free/Busy publishing:"
 msgstr ""
 "Um die Veröffentlichung von Kalender- oder Verfügbarkeitsinformationen "
 "einzustellen:"
 
-#: C/evolution.xml:4031(para) C/evolution.xml:4766(para)
+#: C/evolution.xml:4099(para) C/evolution.xml:4833(para)
 msgid "Click Edit &gt; Preferences, then click Calendar and Tasks."
 msgstr ""
 "Klicken Sie auf Bearbeiten, dann Einstellungen, dann auf Kalender und "
 "Aufgaben."
 
-#: C/evolution.xml:4034(para)
+#: C/evolution.xml:4102(para)
 msgid ""
 "Click the Calendar Publishing tab, click Add, then select the information "
 "you want to publish."
@@ -9515,25 +9488,25 @@ msgstr ""
 "Klicken Sie auf den Reiter »Kalenderveröffentlichung«, dann auf Hinzufügen, "
 "und wählen Sie dann die  Informationen aus, die Sie veröffentlichen möchten."
 
-#: C/evolution.xml:4037(para)
+#: C/evolution.xml:4105(para)
 msgid "Select the frequency with which you want to upload data."
 msgstr ""
 "Wählen Sie den Veröffentlichungsintervall aus, wie häufig Sie Ihre Daten "
 "hochladen möchten."
 
-#: C/evolution.xml:4040(para)
+#: C/evolution.xml:4108(para)
 msgid "Select the calendars you want to display data for."
 msgstr "Wählen Sie die Kalenderquellen aus, deren Daten enthalten sein sollen."
 
-#: C/evolution.xml:4043(para)
+#: C/evolution.xml:4111(para)
 msgid "Specify the publishing location for the upload server."
 msgstr "Wählen Sie den Ort für die Veröffentlichung aus."
 
-#: C/evolution.xml:4046(para)
+#: C/evolution.xml:4114(para)
 msgid "Type your username and password."
 msgstr "Tragen Sie Ihren Benutzernamen und Ihr Passwort ein."
 
-#: C/evolution.xml:4052(para)
+#: C/evolution.xml:4120(para)
 msgid ""
 "To immediately publish calendar information, go to the Calendar tool and "
 "click Actions &gt; Publish Calendar Information."
@@ -9541,15 +9514,13 @@ msgstr ""
 "Um die Kalenderinformationen sofort zu veröffentlichen, wählen Sie im "
 "Kalender-Fenster Aktionen &gt; Kalenderinformationen veröffentlichen."
 
-#: C/evolution.xml:4054(para)
-msgid ""
-"Evolution allows you to specify a template to use when posting to the Free/"
-"Busy server."
+#: C/evolution.xml:4122(para) C/evolution.xml:6682(para)
+msgid "You can specify a template to use when posting to the Free/Busy server."
 msgstr ""
 "Evolution ermöglicht es eine Vorlage zu nutzen, wenn Sie "
 "Verfügungbarkeitsinformationen auf einem Server veröffentlichen."
 
-#: C/evolution.xml:4060(para)
+#: C/evolution.xml:4128(para)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their Web calendar, "
 "you can enter it as part of the contact information in the Contacts tool. "
@@ -9562,161 +9533,114 @@ msgstr ""
 "dieser Person planen, zeigt Evolution automatisch die "
 "Verfügbarkeitsinformationen dieses Kontakts dar."
 
-#: C/evolution.xml:4069(para)
+#: C/evolution.xml:4135(para)
 msgid ""
-"Evolution enables you to find the Calender items by using Customized Search. "
-"To start searching for various calendar items, use the following procedure:"
+"You can use a customized search, an advanced search, or a quick search to "
+"search for Calendar items."
 msgstr ""
-"Evolution ermöglicht das Auffinden von Kalendereinträgen indem Sie die "
-"Individuelle Suche benutzen:"
+"Sie können eine Individuelle Suche, eine Erweiterte Suche, oder eine "
+"Schnelle Suche nach Kalendereinträgen durchführen."
 
-#: C/evolution.xml:4073(para) C/evolution.xml:4390(para)
-#: C/evolution.xml:4625(para)
+#: C/evolution.xml:4138(para)
 msgid ""
-"Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"stock_search.png\"/> to expand the drop-down list"
+"Evolution enables you to find the Calendar items by using a Customized "
+"Search."
 msgstr ""
-"Klicken Sie auf das Such-Symbol <inlinegraphic format=\"PNG\" fileref="
-"\"figures/stock_search.png\"/> um den Suchtypen auszuwählen."
-
-#: C/evolution.xml:4076(para) C/evolution.xml:4393(para)
-#: C/evolution.xml:4628(para)
-msgid "Select the search type:"
-msgstr "Wählen Sie den Suchtypen aus:"
+"Evolution ermöglicht das Auffinden von Kalendereinträgen indem Sie die "
+"Individuelle Suche benutzen."
 
-#: C/evolution.xml:4079(para) C/evolution.xml:4396(para)
-#: C/evolution.xml:4631(para)
+#: C/evolution.xml:4148(para) C/evolution.xml:4464(para)
+#: C/evolution.xml:4700(para)
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: C/evolution.xml:4082(para) C/evolution.xml:4399(para)
-#: C/evolution.xml:4634(para)
+#: C/evolution.xml:4151(para) C/evolution.xml:4467(para)
+#: C/evolution.xml:4703(para)
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: C/evolution.xml:4085(para) C/evolution.xml:4402(para)
-#: C/evolution.xml:4637(para)
+#: C/evolution.xml:4154(para) C/evolution.xml:4470(para)
+#: C/evolution.xml:4706(para)
 msgid "Any field Contains"
 msgstr "Ein beliebiges Feld enthält"
 
-#: C/evolution.xml:4090(para) C/evolution.xml:4642(para)
+#: C/evolution.xml:4159(para) C/evolution.xml:4711(para)
 msgid "Evolution displays the desired Calendar items."
 msgstr "Evolution zeigt die gewünschten Kalendereinträge an."
 
-#: C/evolution.xml:4095(para) C/evolution.xml:4412(para)
-#: C/evolution.xml:4647(para)
-msgid ""
-"You can perform an advanced search based on any of the search type mentioned "
-"above."
-msgstr ""
-"Sie können auch eine erweiterte Suche basierend auf den zuvor genannten "
-"Suchtypen durchführen (also eine Suche innerhalb des vorherigen "
-"Suchergebnisses)."
-
-#: C/evolution.xml:4097(para) C/evolution.xml:4414(para)
-#: C/evolution.xml:4649(para)
-msgid "To perform an advanced search:"
-msgstr "Um eine erweiterte Suche durchzuführen:"
-
-#: C/evolution.xml:4100(para) C/evolution.xml:4652(para)
-msgid "Select the desired search type from the drop-down list."
-msgstr "Wählen Sie den gewünschten Suchtypen aus der Auswahlliste aus."
+#: C/evolution.xml:4171(para) C/evolution.xml:4485(para)
+#: C/evolution.xml:4723(para)
+msgid "Select Advanced Search to open Advanced Search dialog box."
+msgstr "Wählen Sie »Erweiterte Suche«, um das Dialogfenster zu öffnen.."
 
-#: C/evolution.xml:4103(para) C/evolution.xml:4417(para)
-#: C/evolution.xml:4655(para)
-msgid "Select Advanced Search to open Advanced Search dialogue box."
-msgstr "Wählen Sie »Erweiterte Suche«, um das Dialogfenster zu öffnen. "
-
-#: C/evolution.xml:4104(para) C/evolution.xml:4418(para)
-#: C/evolution.xml:4656(para)
+#: C/evolution.xml:4172(para) C/evolution.xml:4486(para)
+#: C/evolution.xml:4724(para)
 msgid "Search name field displays the search type you have selected."
 msgstr "Das Feld »Suchname« zeigt den Suchtypen an, die Sie ausgewählt haben."
 
-#: C/evolution.xml:4109(para) C/evolution.xml:4423(para)
-#: C/evolution.xml:4661(para)
+#: C/evolution.xml:4177(para) C/evolution.xml:4491(para)
+#: C/evolution.xml:4729(para)
 msgid "Click Add to add rules."
 msgstr "Klicken Sie auf »Hinzufügen«, um Regeln hinzuzufügen."
 
-#: C/evolution.xml:4112(para) C/evolution.xml:4426(para)
-#: C/evolution.xml:4664(para)
-msgid "Select the criteria and then, type a search entry in the given field."
+#: C/evolution.xml:4180(para) C/evolution.xml:4494(para)
+#: C/evolution.xml:4732(para)
+msgid "Select the criteria, and then type a search entry in the given field."
 msgstr ""
 "Wählen Sie die Suchkriterien aus und geben Sie danach einen Suchbegriff in "
 "das Feld ein."
 
-#: C/evolution.xml:4118(para) C/evolution.xml:4670(para)
+#: C/evolution.xml:4186(para) C/evolution.xml:4738(para)
 msgid "Click Save to save your search results."
 msgstr "Wählen Sie »Speichern« um Ihre Suchergebnisse zu speichern."
 
-#: C/evolution.xml:4123(para)
+#: C/evolution.xml:4191(para)
 msgid ""
-"Displays all the Calendar items that match the in-built criteria that you "
-"have selected from the drop-down list in the Search bar."
+"Displays all the Calendar items that match the criteria that you have "
+"selected from the drop-down list in the Search bar."
 msgstr ""
 "Zeigt alle Kalendereinträge an, die auf vorgefertigte Kriterien passen, "
 "welche Sie aus der Auswahlliste links oben in der Suchleiste auswählen "
 "können."
 
-#: C/evolution.xml:4128(para) C/evolution.xml:4680(para)
+#: C/evolution.xml:4195(para) C/evolution.xml:4747(para)
 msgid "Click the Show drop-down list."
 msgstr "Klicken Sie neben »Anzeigen« auf die Auswahlliste."
 
-#: C/evolution.xml:4131(para) C/evolution.xml:4472(para)
-#: C/evolution.xml:4683(para)
-msgid "Select the search criteria:"
-msgstr "Wählen Sie die Suchkriterien aus:"
-
-#: C/evolution.xml:4134(para) C/evolution.xml:4475(para)
-#: C/evolution.xml:4686(para)
+#: C/evolution.xml:4201(para) C/evolution.xml:4543(para)
+#: C/evolution.xml:4753(para)
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: C/evolution.xml:4137(para) C/evolution.xml:4478(para)
-#: C/evolution.xml:4689(para)
+#: C/evolution.xml:4204(para) C/evolution.xml:4546(para)
+#: C/evolution.xml:4756(para)
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: C/evolution.xml:4140(para)
+#: C/evolution.xml:4207(para)
 msgid "Active Appointments"
 msgstr "Zugewiesene Termine"
 
-#: C/evolution.xml:4143(para)
+#: C/evolution.xml:4210(para)
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: C/evolution.xml:4158(para) C/evolution.xml:4508(para)
+#: C/evolution.xml:4225(para) C/evolution.xml:4576(para)
 msgid "Favourites"
 msgstr "Favoriten"
 
-#: C/evolution.xml:4167(para) C/evolution.xml:4517(para)
-#: C/evolution.xml:4713(para)
-msgid "Holidays"
-msgstr "Urlaub"
-
-#: C/evolution.xml:4179(para) C/evolution.xml:4529(para)
-#: C/evolution.xml:4725(para)
-msgid "Key Customers"
-msgstr "Schlüssel-Kunde"
-
-#: C/evolution.xml:4200(para) C/evolution.xml:4550(para)
-#: C/evolution.xml:4746(para)
-msgid "Time &amp; Expenses"
-msgstr "Zeit und Ausgaben"
-
-#: C/evolution.xml:4211(para)
-msgid "You can view the desired items listed in the Calender view."
-msgstr "Sie können die gewünschten Einträge nun in der Kalenderansicht betrachten."
+#: C/evolution.xml:4278(para)
+msgid "You can view the desired items listed in the Calendar view."
+msgstr "Sie können die gewünschten Einträge in der Kalenderansicht betrachten."
 
-#: C/evolution.xml:4216(para)
-msgid ""
-"To print the displayed calendar items, click File &gt; Print or right click "
-"on the calendar item &gt; Print."
+#: C/evolution.xml:4283(para)
+msgid "To print the displayed calendar items, click File &gt; Print."
 msgstr ""
 "Um die dargestellten Kalendereinträge zu drucken, wählen Sie Datei &gt; "
-"Drucken in der Menülesite aus, oder klicken Sie mit der rechten Maustaste "
+"Drucken in der Menüleiste aus, oder klicken Sie mit der rechten Maustaste "
 "auf einen Kalendereintrag und wählen Sie Drucken aus."
 
-#: C/evolution.xml:4221(para)
+#: C/evolution.xml:4288(para)
 msgid ""
 "Keeping a list of everything you did in the past eventually slows down your "
 "calendar. To delete old events, click Actions &gt; Purge, then enter the "
@@ -9729,29 +9653,30 @@ msgstr ""
 "Termine Sie erhalten möchten. Klicken Sie auf OK um die davorliegenden "
 "Termine endgültig zu löschen."
 
-#: C/evolution.xml:4226(para)
+#: C/evolution.xml:4293(para)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr "Nur Teilnehmer einer Besprechung können eine Besprechung delegieren."
 
-#: C/evolution.xml:4229(para)
+#: C/evolution.xml:4296(para)
 msgid "In the Calendar, right-click the meeting you want to delegate."
 msgstr ""
 "Klicken Sie im Kalender mit der rechten Maustaste auf die Besprechung, die "
 "Sie delegieren möchten."
 
-#: C/evolution.xml:4232(para)
-msgid "Click Delegate Meetings."
-msgstr "Klicken Sie auf »Besprechung delegieren.«"
+#: C/evolution.xml:4299(para)
+msgid "Click Delegate Meeting."
+msgstr "Klicken Sie auf »Besprechung delegieren«."
 
-#: C/evolution.xml:4235(para)
+#: C/evolution.xml:4302(para)
 msgid "Select the contacts you want to delegate the meeting to."
-msgstr "Wählen Sie die Kontakte aus, an die die Besprechung delegiert werden soll."
+msgstr ""
+"Wählen Sie die Kontakte aus, an die die Besprechung delegiert werden soll."
 
-#: C/evolution.xml:4241(para)
-msgid "Each contact receives a copy of the meeting."
-msgstr "Jeder Kontakt erhält eine E-Mail, die über diese Veränderung informiert."
+#: C/evolution.xml:4308(para)
+msgid "Each contact receives a copy of the meeting invitation."
+msgstr "Jeder Kontakt erhält eine E-Mail mit der Einladung zur Besprechung."
 
-#: C/evolution.xml:4246(para)
+#: C/evolution.xml:4313(para)
 msgid ""
 "To create a new calendar, click File &gt; New &gt; Calendar. If the calendar "
 "is one you plan to store locally, you need only provide a name and color. If "
@@ -9770,7 +9695,7 @@ msgstr ""
 "Aktualisierung an, welche bestimmt, wie oft Evolution nach Änderungen im "
 "Kalender schauen soll."
 
-#: C/evolution.xml:4247(para)
+#: C/evolution.xml:4314(para)
 msgid ""
 "The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has "
 "an extensive list of shared online calendars, including national and "
@@ -9782,34 +9707,40 @@ msgstr ""
 "nationalen und religiösen Feiertagen, Mondkalendern, Sportkalendern, und "
 "lokalen und regionalen Veranstaltungen."
 
-#: C/evolution.xml:4248(para)
+#: C/evolution.xml:4315(para)
 msgid ""
-"Evolution lets you view and manage calendars on remote CalDAV servers such "
-"as Hula®. For more information about Hula, see the <ulink url=\"http://www."
-"hula-project.org\">Hula Project Web site</ulink>. The procedure to create a "
-"CalDAV calendar source is similar to that of a remote Web calendar source. "
-"You can view and create calendar events on CalDav accounts just like other "
-"calendars on Evolution."
+"Evolution lets you view and manage calendars on remote CalDAV servers. The "
+"procedure to create a CalDAV calendar source is similar to that of a remote "
+"Web calendar source. You can view and create calendar events on CalDav "
+"accounts just like other calendars on Evolution."
 msgstr ""
 "Evolution ermöglicht das Verwalten und Betrachten von Kalendern auf nicht-"
 "lokalen CalDAV-Servern wie Hula&reg;. Für weitere Informationen über Hula "
-"siehe die <ulink url=\"http://www.hula-project.org\">Hula- Projekt-"
-"Internetseite</ulink>. Das Hinzufügen eines CalDAV-Kalenders ist gleich dem Hinzufügen eines Webcal-Kalenders. CalDAV-Kalendereinträge können genauso hinzugefügt und betrachtet werden wie alle anderen Kalender in Evolution auch."
+"siehe die <ulink url=\"http://www.hula-project.org\">Hula-Projekt-"
+"Internetseite</ulink>. Das Hinzufügen eines CalDAV-Kalenders ist gleich dem "
+"Hinzufügen eines Webcal-Kalenders. CalDAV-Kalendereinträge können genauso "
+"hinzugefügt und betrachtet werden wie alle anderen Kalender in Evolution "
+"auch."
 
-#: C/evolution.xml:4253(para)
+#: C/evolution.xml:4320(para)
 msgid ""
-"The Task List, located in the lower-right corner of the calendar, lets you "
-"keep a list of tasks separate from your calendar appointments. You can use "
-"the list in a larger window by clicking the Tasks button in the switcher or "
-"in the folder tree."
+"The Task List, located in the upper-right corner of the calendar, lets you "
+"keep a list of tasks separate from your calendar appointments."
 msgstr ""
 "Die Aufgabenliste, die sich in der oberen rechten Ecke der Kalenderansicht "
 "befindet, zeigt Ihnen die Liste der Aufgaben getrennt von Ihren "
-"Kalendereinträgen an. Sie können diese Liste in einem größeren Fenster "
-"betrachten, indem Sie auf den »Aufgaben«-Knopf unten links in der "
-"Seitenleiste klicken, um zum Aufgaben-Fenster zu wechseln."
+"Kalendereinträgen an."
 
-#: C/evolution.xml:4254(para)
+#: C/evolution.xml:4321(para)
+msgid ""
+"You can use the list in a larger window by clicking the Tasks button in the "
+"side bar."
+msgstr ""
+"Sie können diese Liste in einem größeren Fenster betrachten, indem Sie auf "
+"den »Aufgaben«-Knopf unten links in der Seitenleiste klicken, um zum Aufgaben-"
+"Fenster zu wechseln."
+
+#: C/evolution.xml:4322(para)
 msgid ""
 "Task Lists are more easily organized in the dedicated Tasks tool. Each task "
 "list is assigned a color, and you can use the Tasks tool switcher to hide "
@@ -9823,39 +9754,40 @@ msgstr ""
 "die Aufgaben aller ausgewählten Aufgabenlisten angezeigt, in der jeweils "
 "vorgegebenen Farbe."
 
-#: C/evolution.xml:4257(link) C/evolution.xml:4268(title)
+#: C/evolution.xml:4325(link) C/evolution.xml:4336(title)
 msgid "Creating a New Task List"
 msgstr "Eine neue Aufgabenliste erstellen"
 
-#: C/evolution.xml:4260(link) C/evolution.xml:4287(title)
+#: C/evolution.xml:4328(link) C/evolution.xml:4355(title)
 msgid "Creating a New Task"
 msgstr "Eine neue Aufgabe erstellen"
 
-#: C/evolution.xml:4263(link) C/evolution.xml:4332(title)
+#: C/evolution.xml:4331(link) C/evolution.xml:4400(title)
 msgid "Assigned Tasks"
 msgstr "Zugewiesene Aufgaben"
 
-#: C/evolution.xml:4271(para)
+#: C/evolution.xml:4339(para)
 msgid "Click File &gt; New &gt; Task List."
 msgstr "Klicken Sie auf Datei &gt; Neu &gt; Aufgabenliste."
 
-#: C/evolution.xml:4274(para)
+#: C/evolution.xml:4342(para)
 msgid "Specify the name and color for the task list."
 msgstr "Legen Sie den Namen und die Farbe für die Aufgabenliste fest."
 
-#: C/evolution.xml:4277(para)
-msgid "(Optional) If the task is an online list, specify the URL of the task list."
+#: C/evolution.xml:4345(para)
+msgid ""
+"(Optional) If the task is an online list, specify the URL of the task list."
 msgstr ""
 "(Optional) Falls es sich um eine Online-Liste handelt, geben Sie die Adresse "
 "der Aufgabenliste in das »URL«-Feld ein."
 
-#: C/evolution.xml:4283(para)
+#: C/evolution.xml:4351(para)
 msgid ""
 "After you have added a task to your to-do list, its summary appears in the "
 "Summary section of the task list. To view or edit a detailed description of "
 "an item, double-click it, or right-click it and select Open. You can delete "
-"items by selecting them, then clicking Delete.The list of tasks is sorted in "
-"a similar way to the list of e-mail messages in Evolution Mail. Click once "
+"items by selecting them, then clicking Delete. The list of tasks is sorted "
+"in a similar way to the list of email messages in Evolution Mail. Click once "
 "on a message header to change the direction and type of sorting, or right-"
 "click to add or remove columns from the display."
 msgstr ""
@@ -9869,56 +9801,36 @@ msgstr ""
 "diesem Merkmal zu sortieren, oder klicken Sie mit der rechten Maustaste auf "
 "die Kopfzeilen, um Spalten hinzuzufügen oder aus der Ansicht zu entfernen."
 
-#: C/evolution.xml:4290(para)
-msgid "Click New &gt; Task."
-msgstr "Klicken Sie auf Neu &gt; Aufgabe."
+#: C/evolution.xml:4358(para)
+msgid "Click File &gt; New &gt; Task."
+msgstr "Klicken Sie auf Datei &gt; Neu &gt; Aufgabe."
 
-#: C/evolution.xml:4293(para) C/evolution.xml:4344(para)
+#: C/evolution.xml:4361(para) C/evolution.xml:4412(para)
 msgid "Select a group for the task."
 msgstr "Wählen Sie eine Gruppe für die Aufgabe."
 
-#: C/evolution.xml:4296(para)
-msgid "Type a brief summary for the task in the Summary field."
-msgstr ""
-"Geben Sie eine kurze Zusammenfassung für die Aufgabe in das "
-"»Zusammenfassung«-Feld ein."
-
-#: C/evolution.xml:4299(para)
-msgid "(Optional) Specify a starting date and ending date for the task"
+#: C/evolution.xml:4367(para)
+msgid "(Optional) Specify a starting date and ending date for the task."
 msgstr ""
 "(Optional) Geben Sie ein Anfangsdatum und ein Fälligkeitsdatum für die "
 "Aufgabe ein."
 
-#: C/evolution.xml:4302(para)
-msgid "(Optional) Specify a starting time and ending time for the task"
+#: C/evolution.xml:4370(para)
+msgid "(Optional) Specify a starting time and ending time for the task."
 msgstr ""
 "(Optional) Geben Sie eine Anfangszeit und eine Fälligkeitszeit für die "
 "Aufgabe ein."
 
-#: C/evolution.xml:4311(para) C/evolution.xml:4362(para)
-#: C/evolution.xml:4578(para)
-msgid "(Optional) Type a category in the Categories field."
-msgstr "(Optional) Geben Sie ein Kategorie im »Kategorien«-Feld ein."
-
-#: C/evolution.xml:4312(para)
-msgid "To show or hide the Categories field, click View &gt; Categories."
-msgstr ""
-"Um das »Kategorien«-Feld anzuzeigen oder zu verstecken, klicken Sie auf "
-"Ansicht &gt; Kategorien in der Menüleiste."
-
-#: C/evolution.xml:4315(para) C/evolution.xml:4366(para)
-msgid "Type a description for the task."
-msgstr "Geben Sie eine Beschreibung für die Aufgabe ein."
-
-#: C/evolution.xml:4318(para) C/evolution.xml:4374(para)
+#: C/evolution.xml:4386(para) C/evolution.xml:4442(para)
+#: C/evolution.xml:4664(para)
 msgid ""
 "(Optional) Click Options &gt; Classifications, then select a classification "
-"(as Public, Private or Confidential) for the task."
+"(as Public, Private or Confidential)."
 msgstr ""
 "(Optional) Klicken Sie auf Optionen &gt; Einstufung und wählen Sie eine "
-"Einstufung (Öffentlich, Privat, Vertraulich) für die Aufgabe aus."
+"Einstufung (Öffentlich, Privat, Vertraulich) aus."
 
-#: C/evolution.xml:4321(para) C/evolution.xml:4377(para)
+#: C/evolution.xml:4389(para) C/evolution.xml:4445(para)
 msgid ""
 "(Optional) To specify a status for the task, click Options &gt; Status "
 "Details."
@@ -9926,50 +9838,35 @@ msgstr ""
 "(Optional) Um den Status einer Aufgabe zu definieren, klicken Sie auf "
 "Optionen &gt; Statusdetails."
 
-#: C/evolution.xml:4324(para)
-msgid ""
-"(Optional) To add an attachment to the task, drag and drop the attachment "
-"into the attachment bar."
-msgstr ""
-"(Optional) Um einer Aufgabe einen Anhang hinzuzufügen, ziehen Sie den Anhang "
-"per Maus in die Anlagenleiste und lassen Sie dann die Maustaste los."
-
-#: C/evolution.xml:4326(para) C/evolution.xml:4371(para)
-#: C/evolution.xml:4593(para)
-msgid "Click the Attach button on the toolbar, then browse to the attachment."
-msgstr ""
-"Klicken Sie auf den »Beilegen«-Knopf in der Werkzeugleiste, und wählen Sie "
-"die Anlage aus."
-
-#: C/evolution.xml:4333(para)
+#: C/evolution.xml:4401(para)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution kann Aufgaben mehreren Personen zuweisen."
 
-#: C/evolution.xml:4334(para)
+#: C/evolution.xml:4402(para)
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
-"such as “chair” or “required.” When you save the task, each attendee is sent "
-"an e-mail with the task information, which also gives them the option to "
-"respond."
+"such as <quote>chair</quote> or <quote>required.</quote> When you save the "
+"task, each attendee is sent an email with the task information, which also "
+"gives them the option to respond."
 msgstr ""
 "Wenn Sie eine Aufgabe zuweisen, so können Sie die Teilnehmer in mehrere "
-"Kategorien einordnen, wie zum Beispiel als &ldquo;Vorsitzender&rdquo; oder "
-"&ldquo;Benötigter Teilnehmer&rdquo;. Wenn Sie eine Aufgabe speichern wird "
+"Kategorien einordnen, wie zum Beispiel als <quote>Vorsitzender</quote> oder "
+"<quote>Benötigter Teilnehmer</quote>. Wenn Sie eine Aufgabe speichern wird "
 "jedem Teilnehmer eine E-Mail mit Informationen zur Aufgabe und der "
 "Möglichkeit zur Antwort geschickt."
 
-#: C/evolution.xml:4335(para)
+#: C/evolution.xml:4403(para)
 msgid "To assign a new task:"
 msgstr "Eine neue Aufgabe zuweisen:"
 
-#: C/evolution.xml:4338(para)
+#: C/evolution.xml:4406(para)
 msgid "Click File &gt; New &gt; Assigned Task."
 msgstr "Klicken Sie auf Datei &gt; Neu &gt; Zugewiesene Aufgabe."
 
-#: C/evolution.xml:4347(para)
+#: C/evolution.xml:4415(para)
 msgid ""
 "Click Add, or press Insert key, or right click and then press Add to add the "
-"e-mail addresses of people you want to assign the task.To remove an attendee "
+"email addresses of people you want to assign the task.To remove an attendee "
 "from the list, select an attendee, then press Remove.To edit a field, select "
 "the field, then click Edit.Click View on the menu bar to show or hide the "
 "Type, Role, Status, and RSVP fields."
@@ -9979,15 +9876,9 @@ msgstr ""
 "entfernen, wählen Sie den Teilnehmer aus und klicken Sie auf Entfernen. Um "
 "ein Feld zu bearbeiten, wählen Sie das Feld aus, und klicken Sie auf "
 "Bearbeiten. Klicken Sie auf Ansicht in der Menüleiste, um die Felder Art, "
-"Status, Position und UAwg angezeigt oder verstekt zu bekommen."
+"Status, Position und UAwg angezeigt oder versteckt zu bekommen."
 
-#: C/evolution.xml:4350(para)
-msgid "Type a brief summary of the task in the Summary field."
-msgstr ""
-"Geben Sie eine kurze Zusammenfassung für die Aufgabe in das "
-"»Zusammenfassung«-Feld ein."
-
-#: C/evolution.xml:4353(para)
+#: C/evolution.xml:4421(para)
 msgid ""
 "(Optional) Specify a starting date and time, and a due date and time for the "
 "task."
@@ -9995,42 +9886,30 @@ msgstr ""
 "(Optional) Geben Sie eine Startzeit und ein Anfangsdatum, sowie eine "
 "Fälligkeitszeit und ein Fälligkeitsdatum für die Aufgabe ein."
 
-#: C/evolution.xml:4369(para)
-msgid ""
-"(Optional) To add an attachment to the assigned task, drag and drop the "
-"attachment into the attachment bar."
-msgstr ""
-"(Optional) Um einer zugewiesenen Aufgabe einen Anhang hinzuzufügen, ziehen "
-"Sie den Anhang per Maus in die Anlagenleiste und lassen Sie dann die "
-"Maustaste los."
-
-#: C/evolution.xml:4383(title)
-msgid "Searching For Task Items"
+#: C/evolution.xml:4451(title)
+msgid "Searching for Task Items"
 msgstr "Nach Aufgaben suchen"
 
-#: C/evolution.xml:4386(para)
-msgid ""
-"Evolution enables you to find the task items by using Customized Search. To "
-"start searching for various task items, use the following procedure:"
+#: C/evolution.xml:4454(para)
+msgid "Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 "Evolution ermöglicht das Auffinden von Aufgaben, indem Sie die Individuelle "
-"Suche benutzen:"
+"Suche benutzen."
 
-#: C/evolution.xml:4407(para)
+#: C/evolution.xml:4475(para)
 msgid "Evolution displays the desired Task items."
 msgstr "Evolution zeigt die gewünschten Aufgaben an."
 
-#: C/evolution.xml:4431(para)
+#: C/evolution.xml:4499(para)
 msgid ""
-"Displays all the task items that match the in-built criteria that you have "
-"selected from the drop-down list at the top left side, just above the "
-"display pane."
+"Displays all the task items that match the criteria that you have selected "
+"from the drop-down list at the top left side, just above the display pane."
 msgstr ""
 "Die schnelle Suche zeigt alle Aufgaben an, die auf vorgefertigte Kriterien "
 "passen, welche Sie aus der Auswahlliste links oben, direkt über der Liste "
 "der Aufgaben, auswählen können."
 
-#: C/evolution.xml:4433(para)
+#: C/evolution.xml:4501(para)
 msgid ""
 "This feature provides the following best quick search options. This allows "
 "you to quickly see when tasks are due, as it can become unwieldy for "
@@ -10041,120 +9920,127 @@ msgstr ""
 "fällig sind und daher einfacher planen, falls Sie viele Aufgaben erledigen "
 "oder handhaben müssen."
 
-#: C/evolution.xml:4435(title)
+#: C/evolution.xml:4503(title)
 msgid "Any Category:"
 msgstr "Beliebige Kategorie:"
 
-#: C/evolution.xml:4436(para)
-msgid "It shows all the tasks that fall under any category."
+#: C/evolution.xml:4504(para)
+msgid "Displays all the tasks that fall under any category."
 msgstr "Zeigt alle Aufgaben an, die in eine beliebige Kategorie fallen."
 
-#: C/evolution.xml:4439(title)
+#: C/evolution.xml:4507(title)
 msgid "Unmatched:"
 msgstr "Nicht einsortiert:"
 
-#: C/evolution.xml:4440(para)
+#: C/evolution.xml:4508(para)
 msgid ""
-"It shows all the tasks that do not fall under any of the categories listed "
+"Displays all the tasks that do not fall under any of the categories listed "
 "here."
 msgstr "Zeigt alle Aufgaben an, die in keine der aufgelisteten Kategorien fallen."
 
-#: C/evolution.xml:4443(title)
+#: C/evolution.xml:4511(title)
 msgid "Next 7 Days' Tasks:"
 msgstr "Aufgaben der nächsten 7 Tage:"
 
-#: C/evolution.xml:4444(para)
-msgid ""
-"It shows all the active tasks that are due within the next seven dates. You "
-"can view all the tasks that end within the next seven days from the current "
-"date."
+#: C/evolution.xml:4512(para)
+msgid "Displays all the active tasks that are due within the next seven days."
 msgstr ""
-"Zeigt alle Aufgaben an, deren Fälligkeitsdatum innerhalb der nächsten sieben "
-"Tage liegt, welche also innerhalb der nächsten sieben Tage (vom heutigen "
-"Tage aus gesehen) enden."
+"Zeigt alle aktiven Aufgaben an, deren Fälligkeitsdatum innerhalb der "
+"nächsten 7 Tage liegt."
 
-#: C/evolution.xml:4447(title)
+#: C/evolution.xml:4515(title)
 msgid "Active Tasks:"
 msgstr "Aktive Aufgaben:"
 
-#: C/evolution.xml:4448(para)
+#: C/evolution.xml:4516(para)
 msgid ""
-"It shows all the tasks whose due date is yet to come. This allows you to see "
+"Displays all the tasks whose due date is yet to come. This allows you to see "
 "the date due for tasks due in the future."
 msgstr ""
 "Zeigt alle Aufgaben an, deren Fälligkeit gesetzt ist. Dies ermöglicht das "
 "Anzeigen der Fälligkeitsdaten für die Aufgaben, die in näheren Zukunft "
 "fällig sind."
 
-#: C/evolution.xml:4451(title)
+#: C/evolution.xml:4519(title)
 msgid "Over Due Tasks:"
 msgstr "Überfällige Aufgaben:"
 
-#: C/evolution.xml:4452(para)
-msgid "It shows all the tasks whose end date has already passed."
-msgstr "Zeigt alle Aufgaben an, deren Enddatum bereits in der Vergangenheit liegt."
+#: C/evolution.xml:4520(para)
+msgid "Displays all the tasks whose end date has already passed."
+msgstr ""
+"Zeigt alle Aufgaben an, deren Enddatum bereits in der Vergangenheit liegt."
 
-#: C/evolution.xml:4455(title)
+#: C/evolution.xml:4523(title)
 msgid "Completed Tasks:"
 msgstr "Erledigte Aufgaben:"
 
-#: C/evolution.xml:4456(para)
-msgid "It shows the tasks whose status is 100% completed."
+#: C/evolution.xml:4524(para)
+msgid "Displays the tasks whose status is 100% completed."
 msgstr "Zeigt die Aufgaben an, deren Status »zu 100% erledigt« ist."
 
-#: C/evolution.xml:4459(title)
+#: C/evolution.xml:4527(title)
 msgid "Tasks With Attachment:"
 msgstr "Aufgaben mit Anlagen:"
 
-#: C/evolution.xml:4460(para)
-msgid "It shows all the tasks with attachment."
-msgstr "Zeigt alle Aufgaben mit Anlagen an."
+#: C/evolution.xml:4528(para)
+msgid "Displays all the tasks with attachments."
+msgstr "Dies zeigt alle Aufgaben mit Anlagen an."
 
-#: C/evolution.xml:4463(title)
+#: C/evolution.xml:4531(title)
 msgid "&lt;List of Categories&gt;:"
 msgstr "&lt;Liste der Kategorien&gt;:"
 
-#: C/evolution.xml:4464(para)
+#: C/evolution.xml:4532(para)
 msgid ""
 "Lists all the tasks that belong to a particular category such as "
-"Anniversary, Holidays, Gifts etc."
+"Anniversary, Holidays, Gifts, etc."
 msgstr ""
 "Listet alle Aufgaben auf, welche zu einer bestimmten Kategorie (wie "
 "Jahrestage, Geschenke etc.) gehören."
 
-#: C/evolution.xml:4466(para) C/evolution.xml:4677(para)
+#: C/evolution.xml:4534(para)
 msgid "To perform quick search,"
 msgstr "Um eine schnelle Suche durchführen,"
 
-#: C/evolution.xml:4469(para)
+#: C/evolution.xml:4537(para)
 msgid "Click the Show drop-down list from the Search bar."
-msgstr "Klicken Sie in die Auswahlliste rechts neben »Anzeigen:« in der Suchleiste."
+msgstr ""
+"Klicken Sie in die Auswahlliste rechts neben »Anzeigen:« in der Suchleiste."
 
-#: C/evolution.xml:4481(para)
+#: C/evolution.xml:4549(para)
 msgid "Next 7 Days Tasks"
 msgstr "Aufgaben der nächsten 7 Tage"
 
-#: C/evolution.xml:4484(para)
+#: C/evolution.xml:4552(para)
 msgid "Active Tasks"
 msgstr "Zugewiesene Aufgaben"
 
-#: C/evolution.xml:4487(para)
+#: C/evolution.xml:4555(para)
 msgid "Over Due Tasks"
 msgstr "Überfällige Aufgaben"
 
-#: C/evolution.xml:4490(para)
+#: C/evolution.xml:4558(para)
 msgid "Completed Tasks"
 msgstr "Erledigte Aufgaben"
 
-#: C/evolution.xml:4493(para)
+#: C/evolution.xml:4561(para)
 msgid "Tasks With Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: C/evolution.xml:4561(para)
+#: C/evolution.xml:4585(para) C/evolution.xml:4780(para)
+msgid "Holidays"
+msgstr "Urlaub"
+
+#: C/evolution.xml:4597(para) C/evolution.xml:4792(para)
+msgid "Key Customers"
+msgstr "Schlüssel-Kunde"
+
+#: C/evolution.xml:4629(para)
 msgid "You can view the desired items listed in the Task view."
-msgstr "Sie können die gewünschten Einträge nun in der Aufgabenansicht betrachten."
+msgstr ""
+"Sie können die gewünschten Einträge nun in der Aufgabenansicht betrachten."
 
-#: C/evolution.xml:4567(para)
+#: C/evolution.xml:4635(para)
 msgid ""
 "In Evolution, the Memos component lets you create, edit, and store journal "
 "entries without dates, using the filesystem as a backend."
@@ -10162,105 +10048,94 @@ msgstr ""
 "In Evolution können Sie Notizen ohne Datumsbezug erzeugen, bearbeiten und "
 "auf der lokalen Festplatte speichern."
 
-#: C/evolution.xml:4569(para)
+#: C/evolution.xml:4637(para)
 msgid "To create a new memo entry:"
 msgstr "Eine neue Notiz anlegen:"
 
-#: C/evolution.xml:4572(para)
+#: C/evolution.xml:4640(para)
 msgid "Click File &gt; New &gt; Memo."
 msgstr "Klicken Sie auf Neu &gt; Notiz."
 
-#: C/evolution.xml:4575(para)
-msgid "Select a group in which you would create a memo entry."
-msgstr "Wählen Sie eine Gruppe, in der die neue Notiz angelegt werden soll."
+#: C/evolution.xml:4643(para) C/evolution.xml:5713(para)
+msgid "Select the Group in which you would like to create the entry."
+msgstr "Wählen Sie die Gruppe, in der die neue Notiz angelegt werden soll."
 
-#: C/evolution.xml:4582(para)
-msgid "Type text for the memo in the Summary field."
+#: C/evolution.xml:4647(para)
+msgid "To show or hide Categories field, click View &gt; Categories."
 msgstr ""
-"Geben Sie eine kurze Zusammenfassung für die Notiz in das »Zusammenfassung«-"
-"Feld ein."
+"Um das »Kategorien«-Feld anzuzeigen oder zu verstecken, klicken Sie auf "
+"Ansicht &gt; Kategorien in der Menüleiste."
 
-#: C/evolution.xml:4585(para) C/evolution.xml:5697(para)
+#: C/evolution.xml:4653(para) C/evolution.xml:5719(para)
 msgid ""
 "In the Start Date field, type the date this reminder note should appear in "
-"the recipients’ Calendars."
+"the recipients' Calendars."
 msgstr ""
 "Geben Sie ein Anfangsdatum ein, an welchem die Erinnerung im Kalender des "
 "Empfängers angezeigt werden soll."
 
-#: C/evolution.xml:4588(para)
-msgid "Type text for the memo in the Memo Content field."
-msgstr "Geben Sie den Text der Notiz in das Feld »Beschreibung« ein."
-
-#: C/evolution.xml:4591(para)
-msgid ""
-"(Optional) To add an attachment to the memo, drag and drop the attachment "
-"into the attachment bar."
-msgstr ""
-"(Optional) Um einer Notiz einen Anhang hinzuzufügen, ziehen Sie den Anhang "
-"per Maus in die Anlagenleiste und lassen Sie dann die Maustaste los."
-
-#: C/evolution.xml:4596(para)
-msgid ""
-"(Optional) Click Options &gt; Classifications, then select a classification "
-"(as Public, Private or Confidential) for the memo."
-msgstr ""
-"(Optional) Klicken Sie auf Optionen &gt; Einstufung und wählen Sie eine "
-"Einstufung (Öffentlich, Privat, Vertraulich) für die Notiz aus."
-
-#: C/evolution.xml:4601(title)
-msgid "The Memo list"
+#: C/evolution.xml:4669(title)
+msgid "The Memo List"
 msgstr "Die Notizenliste"
 
-#: C/evolution.xml:4602(para)
+#: C/evolution.xml:4670(para)
 msgid ""
 "As with calendars and tasks, you can create multiple memo lists. Each memo "
-"list is assigned a color, and you can use the Memos switcher to hide and "
-"show memos."
+"list is assigned a color, and you can use the side bar to hide and show memo "
+"lists."
 msgstr ""
 "Genau so wie bei Kalendern und Aufgaben können Sie mehrere Notizlisten "
-"erstellen. Jeder Notizliste wird eine Farbe zugewiesen, und eine Notiz wird "
-"im Vorschaufenster angezeigt, wenn Sie diese in der Auflistung der "
-"vorhandenen Notizen auswählen."
+"erstellen. Jeder Notizliste wird eine Farbe zugewiesen, und Sie können "
+"einzelne Notizlisten in der Seitenleiste anzeigen und verstecken."
 
-#: C/evolution.xml:4603(para)
+#: C/evolution.xml:4671(para)
 msgid "To create a new memo list:"
 msgstr "Eine neue Notizenliste erzeugen:"
 
-#: C/evolution.xml:4606(para)
+#: C/evolution.xml:4674(para)
 msgid "Click File &gt; New &gt; Memo List."
 msgstr "Klicken Sie auf Datei &gt; Neu &gt; Notizenliste."
 
-#: C/evolution.xml:4609(para)
-msgid "Type the group, name and color for the memo list."
+#: C/evolution.xml:4677(para)
+msgid "Enter the type, name and color for the memo list."
 msgstr "Wählen Sie den Typen, den Namen und die Farbe der Notizliste aus."
 
-#: C/evolution.xml:4618(title)
-msgid "Searching For Memo Items"
+#: C/evolution.xml:4686(title)
+msgid "Searching for Memo Items"
 msgstr "Nach Notizen suchen"
 
-#: C/evolution.xml:4621(para)
+#: C/evolution.xml:4687(para)
 msgid ""
-"Evolution enables you to find the Memo items by using Customized Search. To "
-"start searching for various Memo items, use the following procedure:"
+"You can use a customized search, an advanced search, or a quick search to "
+"search for Memo Items."
+msgstr ""
+"Sie können eine Individuelle Suche, eine Erweiterte Suche, oder eine "
+"Schnelle Suche nach Notizen durchführen."
+
+#: C/evolution.xml:4690(para)
+msgid "Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 "Evolution ermöglicht das Auffinden von Notizen indem Sie die Individuelle "
-"Suche benutzen:"
+"Suche benutzen."
+
+#: C/evolution.xml:4720(para)
+msgid "Select the desired search type from the drop-down list."
+msgstr "Wählen Sie den gewünschten Suchtypen aus der Auswahlliste aus."
 
-#: C/evolution.xml:4675(para)
+#: C/evolution.xml:4743(para)
 msgid ""
-"Displays all the Memo items that match the in-built criteria that you have "
-"selected from the Show drop-down list in the Search bar."
+"Displays all the Memo items that match the criteria that you have selected "
+"from the Show drop-down list in the Search bar."
 msgstr ""
 "Zeigt alle Notizen an, die auf vorgefertigte Kriterien passen, welche Sie "
 "aus der Auswahlliste links oben, direkt über der Kalenderanzeige, auswählen "
 "können."
 
-#: C/evolution.xml:4755(para)
+#: C/evolution.xml:4822(para)
 msgid "You can view the desired items listed in the Memo view."
 msgstr "Sie können die gewünschten Einträge nun in der Notizenansicht betrachten."
 
-#: C/evolution.xml:4763(para)
+#: C/evolution.xml:4830(para)
 msgid ""
 "Evolution supports the use of time zones. If you share calendar files with "
 "friends or co-workers, you might need to configure your time zone."
@@ -10269,21 +10144,21 @@ msgstr ""
 "mit Freunden oder Arbeitskollegen teilen, so sollten Sie gegebenenfalls Ihre "
 "Zeitzone angeben. "
 
-#: C/evolution.xml:4769(para)
+#: C/evolution.xml:4836(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
 msgstr ""
 "Klicken Sie auf das Symbol neben dem Zeitzonenfeld, und wählen Sie Ihren Ort "
 "aus."
 
-#: C/evolution.xml:4770(para)
+#: C/evolution.xml:4837(para)
 msgid "Each red dot represents a major city."
 msgstr "Jeder rote Punkt steht für eine größere Stadt."
 
-#: C/evolution.xml:4773(para)
+#: C/evolution.xml:4840(para)
 msgid "Select a city, then click OK."
 msgstr "Wählen Sie eine Stadt aus und klicken Sie auf OK."
 
-#: C/evolution.xml:4776(para)
+#: C/evolution.xml:4843(para)
 msgid ""
 "You can also configure time zone information specific to each appointment. "
 "To do that, simply create a new appointment and click the globe to customize "
@@ -10300,136 +10175,148 @@ msgstr ""
 "Sie Verwirrung vermeiden indem Sie die Zeitzone dieses Termins korrekt "
 "setzen."
 
-#: C/evolution.xml:4780(title)
+#: C/evolution.xml:4847(title)
 msgid "Marcus Bains Line"
 msgstr "Marcus-Bains-Linie"
 
-#: C/evolution.xml:4781(para)
+#: C/evolution.xml:4848(para)
 msgid ""
 "The Marcus Bains Line is a marker to show the current date and time. This "
-"feature is now available in the Evolution calendar."
+"feature is available in the Evolution calendar."
 msgstr ""
 "Die Marcus-Bains-Linie ist eine Markierung, die Ihnen die momentane Zeit und "
-"das momentane Datum anzeigt."
+"das momentane Datum im Kalender anzeigt."
 
-#: C/evolution.xml:4787(para)
+#: C/evolution.xml:4854(para)
 msgid ""
-"Evolution™ Exchange for Microsoft Exchange allows Evolution clients to "
-"access accounts on Microsoft Exchange 2000 and 2003 servers. Like Evolution, "
-"it is free software and is licensed under the GPL."
+"<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
+"Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
+"servers. Like Evolution, it is free software and is licensed under the GPL."
 msgstr ""
-"Evolution&trade; Exchange für Microsoft Exchange ermöglicht Evolution-"
-"Installationen den Zugriff auf Konten auf Microsoft Exchange 2000- und 2003-"
-"Servern. Genauso wie Evolution handelt es sich um freie Software unter der "
-"GPL-Lizenz."
+"<trademark>Evolution</trademark> Exchange für Microsoft Exchange ermöglicht "
+"Evolution-Installationen den Zugriff auf Konten auf Microsoft Exchange 2000- "
+"und 2003-Servern. Genauso wie Evolution handelt es sich um freie Software "
+"unter der GPL-Lizenz."
 
-#: C/evolution.xml:4790(link) C/evolution.xml:4810(title)
+#: C/evolution.xml:4857(link) C/evolution.xml:4877(title)
 msgid "Evolution Exchange Features"
 msgstr "Evolution-Exchange-Funktionen"
 
-#: C/evolution.xml:4793(link) C/evolution.xml:4912(title)
+#: C/evolution.xml:4860(link) C/evolution.xml:4979(title)
 msgid "Adding Your Exchange Account to Evolution"
 msgstr "Ein Exchange-Konto einrichten"
 
-#: C/evolution.xml:4796(link) C/evolution.xml:5079(title)
+#: C/evolution.xml:4863(link) C/evolution.xml:5097(title)
 msgid "Accessing the Exchange Server"
 msgstr "Auf den Exchange-Server zugreifen"
 
-#: C/evolution.xml:4799(link) C/evolution.xml:5087(title)
+#: C/evolution.xml:4866(link) C/evolution.xml:5105(title)
 msgid "Settings Exclusive to Evolution Exchange"
 msgstr "Spezielle Evolution-Exchange-Einstellungen"
 
-#: C/evolution.xml:4802(link) C/evolution.xml:5110(link)
-#: C/evolution.xml:5330(title)
+#: C/evolution.xml:4869(link) C/evolution.xml:5128(link)
+#: C/evolution.xml:5350(title)
 msgid "Scheduling Meetings with Free/Busy"
 msgstr "Besprechungen planen mit der Verfügbarkeitsfunktion"
 
-#: C/evolution.xml:4806(para)
+#: C/evolution.xml:4873(para)
 msgid ""
 "Evolution Exchange works only with Exchange 2000 and later, and requires "
 "that Outlook Web Access be enabled. Each user needs a valid Microsoft "
 "Exchange server account, including a license."
-msgstr "Evolution-Exchange funktioniert nur mit den Exchange-Serverversionen 2000 oder 2003 und erfordert, dass der Outlook Web Access aktiviert ist. Jeder Benutzer benötigt ein gültiges Konto auf dem Exchange-Server, und eine gültige Lizenz."
+msgstr ""
+"Evolution-Exchange funktioniert nur mit den Exchange-Serverversionen 2000 "
+"oder 2003 und erfordert, dass der Outlook Web Access aktiviert ist. Jeder "
+"Benutzer benötigt ein gültiges Konto auf dem Exchange-Server, und eine "
+"gültige Lizenz."
 
-#: C/evolution.xml:4811(para)
-msgid "Evolution Exchange supports the following basic Microsoft Exchange features:"
-msgstr "Evolution-Exchange unterstützt die folgenden, grundlegenden Microsoft Exchange-Funktionen:"
+#: C/evolution.xml:4878(para)
+msgid ""
+"Evolution Exchange supports the following basic Microsoft Exchange features:"
+msgstr ""
+"Evolution-Exchange unterstützt die folgenden, grundlegenden Microsoft "
+"Exchange-Funktionen:"
 
-#: C/evolution.xml:4814(para) C/evolution.xml:6515(link)
-#: C/evolution.xml:6526(title) C/evolution.xml:6573(link)
-#: C/evolution.xml:6587(title)
+#: C/evolution.xml:4881(para) C/evolution.xml:6538(link)
+#: C/evolution.xml:6549(title) C/evolution.xml:6597(link)
+#: C/evolution.xml:6611(title)
 msgid "General"
 msgstr "Allgemein"
 
-#: C/evolution.xml:4818(title)
+#: C/evolution.xml:4885(title)
 msgid "Remote Exchange Information Store:"
 msgstr ""
 
-#: C/evolution.xml:4819(para)
+#: C/evolution.xml:4886(para)
 msgid ""
 "Allows you to access mail, address book (including the Global Address List "
 "folder), calendars, and task folders on an Exchange server from Evolution."
 msgstr ""
 
-#: C/evolution.xml:4824(title)
+#: C/evolution.xml:4891(title)
 msgid "Palm Synchronization:"
 msgstr ""
 
-#: C/evolution.xml:4825(para)
+#: C/evolution.xml:4892(para)
 msgid "Supported for Contacts and Calendars on Exchange."
 msgstr "Wird unterstützt für Kontakte und Kalender auf Exchange-Servern."
 
-#: C/evolution.xml:4830(title)
+#: C/evolution.xml:4897(title)
 msgid "Password Management:"
 msgstr "Passwortverwaltung:"
 
-#: C/evolution.xml:4831(para)
+#: C/evolution.xml:4898(para)
 msgid ""
 "Allows you to reset your password. If your password has expired, Evolution "
 "asks you to change your password at startup."
 msgstr ""
 
-#: C/evolution.xml:4837(para) C/evolution.xml:5419(para)
+#: C/evolution.xml:4904(para) C/evolution.xml:5439(para)
 msgid "Mail"
 msgstr "E-Mail"
 
-#: C/evolution.xml:4841(title)
+#: C/evolution.xml:4908(title)
 msgid "Viewing Mail in Exchange Folders:"
 msgstr ""
 
-#: C/evolution.xml:4842(para)
+#: C/evolution.xml:4909(para)
 msgid ""
 "Mail stored on the Exchange server is visible in the Mail component in "
 "Evolution."
 msgstr ""
 
-#: C/evolution.xml:4847(title)
-msgid "Sending E-mail via Exchange Protocols:"
-msgstr ""
+#: C/evolution.xml:4914(title)
+#, fuzzy
+msgid "Sending Email via Exchange Protocols:"
+msgstr "E-Mail an einen Kontakt senden:"
 
-#: C/evolution.xml:4848(para)
+#: C/evolution.xml:4915(para)
 msgid ""
-"If you use the Microsoft Exchange mail transport protocol to send e-mail, "
-"make sure that the address you have entered as your e-mail address is "
-"exactly the one that the Exchange server has on file. This might be "
-"“yourname@exchange-server.example.com” rather than “yourname@example.com”."
+"If you use the Microsoft Exchange mail transport protocol to send email, "
+"make sure that the address you have entered as your email address is exactly "
+"the one that the Exchange server has on file. This might be "
+"<quote>yourname@exchange-server.example.com</quote> rather than "
+"<quote>yourname@example.com.</quote>"
 msgstr ""
 
-#: C/evolution.xml:4853(title)
+#: C/evolution.xml:4920(title)
 msgid "Out of Office Message:"
 msgstr "»Nicht im Büro«-Nachricht:"
 
-#: C/evolution.xml:4854(para)
+#: C/evolution.xml:4921(para)
 msgid ""
-"You can set ‘out of Office' message that will automatically be sent to "
-"people who send mails to you while you are away from office."
-msgstr "Sie können eine »Nicht im Büro«-Nachricht setzen. Diese wir automatisch an Personen geschickt, die Ihnen E-Mails senden während Sie nicht in Ihrem Büro sind."
+"You can set <quote>out of Office</quote> message that will automatically be "
+"sent to people who send mail to you while you are away from office."
+msgstr ""
+"Sie können eine »Nicht im Büro«-Nachricht setzen. Diese wir automatisch an "
+"Personen geschickt, die Ihnen E-Mails senden während Sie nicht in Ihrem Büro "
+"sind."
 
-#: C/evolution.xml:4859(title)
+#: C/evolution.xml:4926(title)
 msgid "Send Options:"
-msgstr ""
+msgstr "Versandoptionen:"
 
-#: C/evolution.xml:4860(para)
+#: C/evolution.xml:4927(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message so that the "
 "recipients will know how important the message is.The priority can have one "
@@ -10439,62 +10326,62 @@ msgid ""
 "messages sent."
 msgstr ""
 
-#: C/evolution.xml:4866(para) C/evolution.xml:5442(para)
-#: C/evolution.xml:6951(link) C/evolution.xml:7021(title)
+#: C/evolution.xml:4933(para) C/evolution.xml:5462(para)
+#: C/evolution.xml:6993(link) C/evolution.xml:7063(title)
 msgid "Calendar"
 msgstr "Kalender:"
 
-#: C/evolution.xml:4870(title)
+#: C/evolution.xml:4937(title)
 msgid "Meeting Requests/Proposal:"
 msgstr ""
 
-#: C/evolution.xml:4871(para)
+#: C/evolution.xml:4938(para)
 msgid ""
 "Allows Evolution users to schedule meetings. You can check when other users "
 "are busy according to their calendars and send the meeting requests "
 "accordingly."
 msgstr ""
 
-#: C/evolution.xml:4876(title)
+#: C/evolution.xml:4943(title)
 msgid "Adding iCalendar Meeting Requests to the Calendar:"
 msgstr ""
 
-#: C/evolution.xml:4877(para)
+#: C/evolution.xml:4944(para)
 msgid ""
 "Allows you to add the iCalendar meeting requests you receive to your "
 "Exchange calendar. Note that you need to specify the calendar from the list, "
 "to which you want to add your meeting schedules."
 msgstr ""
 
-#: C/evolution.xml:4883(para) C/evolution.xml:5354(para)
-#: C/evolution.xml:5453(para)
+#: C/evolution.xml:4950(para) C/evolution.xml:5374(para)
+#: C/evolution.xml:5473(para)
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: C/evolution.xml:4887(title)
+#: C/evolution.xml:4954(title)
 msgid "Address Completion:"
 msgstr "Adress-Vervollständigung:"
 
-#: C/evolution.xml:4888(para)
+#: C/evolution.xml:4955(para)
 msgid "Supported for your Exchange Contacts folder."
 msgstr ""
 
-#: C/evolution.xml:4893(title)
+#: C/evolution.xml:4960(title)
 msgid "Adding vCards to the Address Book:"
 msgstr "vCards zum Adressbuch hinzufügen:"
 
-#: C/evolution.xml:4894(para)
+#: C/evolution.xml:4961(para)
 msgid ""
 "Allows you to save the vCards you receive in attachment to your Exchange "
 "address book.New Address Book entries can also be created on Exchange from "
-"received e-mail messages with a single click."
+"received email messages with a single click."
 msgstr ""
 
-#: C/evolution.xml:4900(para)
+#: C/evolution.xml:4967(para)
 msgid "Work Offline (disconnected mode)"
 msgstr ""
 
-#: C/evolution.xml:4901(para)
+#: C/evolution.xml:4968(para)
 msgid ""
 "To mark a folder for offline usage, right-click the folder, then click "
 "Properties. Click Copy Folder Content Locally for Offline Operation. For "
@@ -10502,76 +10389,81 @@ msgid ""
 "Offline</link>."
 msgstr ""
 "Um einen Ordner für die Offline-Benutzung zu markieren, klicken Sie mit der "
-"rechten Maustaste auf den Kalender und wählen Sie »Eigenschaften«. Wählen "
-"Sie »Ordnerinhalt für Offline-Nutzung markieren«. Für weitere Informationen "
-"zum Offline-Arbeiten siehe <link linkend=\"usage-mail-getnsend-offline"
-"\">Offline arbeiten</link>."
+"rechten Maustaste auf den Kalender und wählen Sie »Eigenschaften«. Wählen Sie "
+"»Ordnerinhalt für Offline-Nutzung markieren«. Für weitere Informationen zum "
+"Offline-Arbeiten siehe <link linkend=\"usage-mail-getnsend-offline\">Offline "
+"arbeiten</link>."
 
-#: C/evolution.xml:4906(para)
+#: C/evolution.xml:4973(para)
 msgid "Recall Message function is not available."
 msgstr ""
 
-#: C/evolution.xml:4913(para)
+#: C/evolution.xml:4980(para)
 msgid ""
 "After you have installed Evolution Exchange, you need to set up access for "
 "your Exchange account on both the Exchange server and within Evolution."
 msgstr ""
 
-#: C/evolution.xml:4916(link) C/evolution.xml:4933(title)
+#: C/evolution.xml:4983(link) C/evolution.xml:5000(title)
 msgid "Exchange Server Settings"
 msgstr "Exchange-Server-Einstellungen"
 
-#: C/evolution.xml:4919(link) C/evolution.xml:4947(title)
+#: C/evolution.xml:4986(link) C/evolution.xml:5014(title)
 msgid "Standard Configuration Tool for Evolution Exchange"
 msgstr ""
 
-#: C/evolution.xml:4922(link) C/evolution.xml:4951(title)
+#: C/evolution.xml:4989(link) C/evolution.xml:5018(title)
 msgid "Simple Configuration Tool for Evolution Exchange"
 msgstr ""
 
-#: C/evolution.xml:4925(link) C/evolution.xml:4958(title)
+#: C/evolution.xml:4992(link) C/evolution.xml:5025(title)
 msgid "Creating a New Exchange Account"
 msgstr "Ein neues Exchange-Konto erstellen"
 
-#: C/evolution.xml:4928(link) C/evolution.xml:5000(title)
+#: C/evolution.xml:4995(link) C/evolution.xml:5049(title)
 msgid "Configuring an Existing Account for Evolution Exchange Account"
 msgstr ""
 
-#: C/evolution.xml:4934(para)
+#: C/evolution.xml:5001(para)
 msgid "Check with your system administrator to ensure that:"
 msgstr ""
 
-#: C/evolution.xml:4937(para)
+#: C/evolution.xml:5004(para)
 msgid "You have a valid account on the Exchange server."
 msgstr "Sie haben ein gültiges Konto auf dem Exchange-Server."
 
-#: C/evolution.xml:4940(para)
+#: C/evolution.xml:5007(para)
 msgid ""
 "You are permitted to access the account with WebDAV. This is the default "
 "setting for the Exchange server, so unless your system administrator has "
 "specifically turned it off, no changes should be necessary."
 msgstr ""
 
-#: C/evolution.xml:4943(para)
+#: C/evolution.xml:5010(para)
 msgid ""
-"The <ulink url=\"http://support.novell.com\">Novell® Web site Knowledgebase</"
-"ulink> has additional information about checking to make sure that your "
-"Exchange server accepts connections from Evolution."
+"The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
+"\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
+"information about checking to make sure that your Exchange server accepts "
+"connections from Evolution."
 msgstr ""
+"In der <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
+"\">Novell</trademark>-Wissensdatenbank</ulink> finden Sie weitere "
+"Informationen, wie Sie sicherstellen können, dass Ihr Exchange-Server "
+"Verbindung von Evolution akzeptiert."
 
-#: C/evolution.xml:4948(para)
+#: C/evolution.xml:5015(para)
 msgid ""
 "When you know that your server is ready for you to connect, you are ready to "
 "add your Exchange account to Evolution Exchange."
 msgstr ""
 
-#: C/evolution.xml:4952(para)
+#: C/evolution.xml:5019(para)
 msgid ""
 "Evolution Exchange comes with a simple account creation tool for Exchange "
 "accounts."
 msgstr ""
 
-#: C/evolution.xml:4953(para)
+#: C/evolution.xml:5020(para)
 msgid ""
 "If you have no accounts configured, the simple account configuration "
 "assistant starts when you start Evolution. It asks only for the Outlook Web "
@@ -10579,7 +10471,7 @@ msgid ""
 "the remaining information for you."
 msgstr ""
 
-#: C/evolution.xml:4954(para)
+#: C/evolution.xml:5021(para)
 msgid ""
 "If the simple account configuration tool does not run automatically, you "
 "need to create an account manually. For more information on how to do this, "
@@ -10587,13 +10479,7 @@ msgid ""
 "Account</link>."
 msgstr ""
 
-#: C/evolution.xml:4961(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S"
-msgstr ""
-"Klicken Sie auf Bearbeiten, dann Einstellungen, oder drücken Sie "
-"Umschalttaste+Steuerung+S."
-
-#: C/evolution.xml:4969(para)
+#: C/evolution.xml:5036(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>. Remember "
@@ -10604,25 +10490,17 @@ msgstr ""
 "folgen, wählen Sie allerdings »Microsoft Exchange« als Server-Typ unter "
 "»Abrufen von E-Mails«."
 
-#: C/evolution.xml:4980(para)
-msgid ""
-"You may configure only Only one Microsoft Exchange account can be configured "
-"in Evolution."
+#: C/evolution.xml:5042(para)
+msgid "Only one Microsoft Exchange account can be configured in Evolution."
 msgstr "Sie können nur ein Microsoft-Exchange-Konto in Evolution einrichten."
 
-#: C/evolution.xml:5001(para)
+#: C/evolution.xml:5050(para)
 msgid ""
 "Use the following procedure to configure your existing account for Evolution "
 "Exchange:"
 msgstr ""
 
-#: C/evolution.xml:5004(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S, then click Mail Accounts."
-msgstr ""
-"Klicken Sie auf Bearbeiten &gt; Einstellungen oder drücken Sie Umschalttaste"
-"+Steuerung+S, dann klicken Sie auf E-Mail-Konten."
-
-#: C/evolution.xml:5007(para)
+#: C/evolution.xml:5056(para)
 msgid ""
 "Select the account you want to convert, then click Edit to appear the "
 "Account Editor."
@@ -10630,15 +10508,16 @@ msgstr ""
 "Wählen Sie das Konto welches Sie umwandeln möchten, dann klicken Sie auf "
 "Bearbeiten."
 
-#: C/evolution.xml:5008(para)
+#: C/evolution.xml:5057(para)
 msgid "You can view Identity tab enabled."
 msgstr ""
 
-#: C/evolution.xml:5022(para) C/evolution.xml:5616(para)
-msgid "Change your e-mail address as needed."
+#: C/evolution.xml:5062(para) C/evolution.xml:5636(para)
+#, fuzzy
+msgid "Change your email address as needed."
 msgstr "Ändern Sie Ihre E-Mail-Adresse"
 
-#: C/evolution.xml:5025(para)
+#: C/evolution.xml:5065(para)
 msgid ""
 "Click the Receiving Mail tab, then select Microsoft Exchange as your server "
 "type."
@@ -10646,46 +10525,46 @@ msgstr ""
 "Klicken Sie auf den Reiter »Abrufen von E-Mails« und wählen Sie Microsoft "
 "Exchange als Server-Typen."
 
-#: C/evolution.xml:5044(para)
+#: C/evolution.xml:5070(para)
 msgid ""
 "Type your user name, and the Outlook Web Access (OWA) URL. Click "
 "Authenticate, then enter the password at the prompt. The Exchange server "
 "authenticates your account."
 msgstr ""
 
-#: C/evolution.xml:5047(para)
-msgid "Select your authentication method."
-msgstr "Wählen Sie die Legitimationsart aus."
+#: C/evolution.xml:5078(para) C/evolution.xml:5650(para)
+#, fuzzy
+msgid "Click the Receiving Options tab."
+msgstr "Klicken Sie auf den Reiter Sicherheit."
 
-#: C/evolution.xml:5061(para)
+#: C/evolution.xml:5079(para)
 msgid ""
-"Click the Receiving Options tab, then specify how often to check for new "
-"mail, your Global Catalog server name and whether to apply filters to "
-"messages in your Inbox, check for junk, set a password expiry period, and "
-"any other settings you want to include."
+"Specify how often to check for new mail, your Global Catalog server name and "
+"whether to apply filters to messages in your Inbox, check for junk, set a "
+"password expiry period, and any other settings you want to include."
 msgstr ""
 
-#: C/evolution.xml:5064(para)
+#: C/evolution.xml:5082(para)
 msgid ""
 "Use the Defaults tab to define folders, send cc: or bcc: messages to certain "
 "IDs, and set options for message receipts."
 msgstr ""
 
-#: C/evolution.xml:5067(para)
+#: C/evolution.xml:5085(para)
 msgid "Use the Security tab to set PGP and s/MIME options."
 msgstr ""
 
-#: C/evolution.xml:5070(para)
+#: C/evolution.xml:5088(para)
 msgid "Quit Evolution and restart it."
 msgstr "Beenden Sie Evolution und starten Sie die Anwendung neu."
 
-#: C/evolution.xml:5071(para)
+#: C/evolution.xml:5089(para)
 msgid ""
 "Changes to Evolution Exchange accounts configuration are not active until "
 "you have restarted the application."
 msgstr ""
 
-#: C/evolution.xml:5080(para)
+#: C/evolution.xml:5098(para)
 msgid ""
 "When you have installed Evolution Exchange, you can access public folders "
 "and perform certain Exchange actions like delegation and password "
@@ -10696,54 +10575,54 @@ msgid ""
 "the Contacts tool for contacts, and the Calendar tool for setting schedules."
 msgstr ""
 
-#: C/evolution.xml:5081(para)
+#: C/evolution.xml:5099(para)
 msgid ""
 "If you are using both an Exchange account and a local mail account, you "
-"should be aware that whenever you save an e-mail address or appointment from "
-"an e-mail message, it is saved in your Exchange contacts list or calendar, "
+"should be aware that whenever you save an email address or appointment from "
+"an email message, it is saved in your Exchange contacts list or calendar, "
 "rather than in your local account. The same is true for synchronization with "
 "Palm OS devices; tasks, and appointments.Addresses from your Palm OS device "
 "are synchronized in the Exchange folders rather than in local folders."
 msgstr ""
 
-#: C/evolution.xml:5082(para)
+#: C/evolution.xml:5100(para)
 msgid ""
 "To avoid unnecessary strain on the server, the Global Address List (GAL) "
 "appears empty until you search for something in it."
 msgstr ""
 
-#: C/evolution.xml:5088(para)
+#: C/evolution.xml:5106(para)
 msgid ""
 "There are some settings in Evolution that are available only with Evolution "
-"Exchange, like delegation and permission handling, creating “Out of Office” "
-"messages, changing password and viewing folder size."
+"Exchange, like delegation and permission handling, creating <quote>Out of "
+"Office</quote> messages, changing password and viewing folder size."
 msgstr ""
 
-#: C/evolution.xml:5092(link) C/evolution.xml:5115(title)
+#: C/evolution.xml:5110(link) C/evolution.xml:5133(title)
 msgid "Send Options"
-msgstr ""
+msgstr "Versandoptionen"
 
-#: C/evolution.xml:5095(link) C/evolution.xml:5197(title)
+#: C/evolution.xml:5113(link) C/evolution.xml:5214(title)
 msgid "Access Delegation"
 msgstr ""
 
-#: C/evolution.xml:5098(link) C/evolution.xml:5201(title)
+#: C/evolution.xml:5116(link) C/evolution.xml:5218(title)
 msgid "Delegating Access to Others"
 msgstr ""
 
-#: C/evolution.xml:5101(link) C/evolution.xml:5248(title)
+#: C/evolution.xml:5119(link) C/evolution.xml:5268(title)
 msgid "Subscribe to Other Users' Folders"
 msgstr "Ordner anderer Benutzer abonnieren"
 
-#: C/evolution.xml:5104(link) C/evolution.xml:5272(title)
+#: C/evolution.xml:5122(link) C/evolution.xml:5292(title)
 msgid "Subscribe to Public Folders"
 msgstr "Öffentliche Ordner abonnieren"
 
-#: C/evolution.xml:5107(link) C/evolution.xml:5302(title)
+#: C/evolution.xml:5125(link) C/evolution.xml:5322(title)
 msgid "Setting an Out of Office Message"
 msgstr ""
 
-#: C/evolution.xml:5116(para)
+#: C/evolution.xml:5134(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message from an "
 "exchange account so that the recipients will know how important the message "
@@ -10753,150 +10632,134 @@ msgid ""
 "read receipt request for the messages sent."
 msgstr ""
 
-#: C/evolution.xml:5119(title)
+#: C/evolution.xml:5137(title)
 msgid "Tracking Options"
 msgstr ""
 
-#: C/evolution.xml:5120(para)
+#: C/evolution.xml:5138(para)
 msgid ""
 "Evolution lets you track the status of an item you have sent. You can enable "
 "the Delivery Receipt request as well as Read Receipt request so that you "
 "will know when the item reached the recipients or read by them."
 msgstr ""
 
-#: C/evolution.xml:5121(para)
+#: C/evolution.xml:5139(para)
 msgid "To set the importance and sensitivity of the message:"
 msgstr ""
 
-#: C/evolution.xml:5124(para)
+#: C/evolution.xml:5142(para)
 msgid "Open a Compose Message window."
 msgstr ""
 
-#: C/evolution.xml:5127(para)
+#: C/evolution.xml:5145(para)
 msgid "Select the exchange account from the From field."
 msgstr ""
 
-#: C/evolution.xml:5130(para)
+#: C/evolution.xml:5148(para)
 msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
 msgstr ""
 
-#: C/evolution.xml:5135(para)
+#: C/evolution.xml:5153(para)
 msgid ""
 "Select the priority for your sent message from the given three options "
 "(Normal, High, Low)"
 msgstr ""
 
-#: C/evolution.xml:5138(para)
+#: C/evolution.xml:5156(para)
 msgid ""
 "Select the sensitivity for your sent message from the given four options "
 "(Normal, Personal, Private, Confidential)."
 msgstr ""
 
-#: C/evolution.xml:5142(title)
+#: C/evolution.xml:5160(title)
 msgid "Message Access Delegation:"
 msgstr ""
 
-#: C/evolution.xml:5143(para)
+#: C/evolution.xml:5161(para)
 msgid ""
 "Click Send as Delegate to send the message to the recipient on behalf of "
 "someone else."
 msgstr ""
 
-#: C/evolution.xml:5146(para)
+#: C/evolution.xml:5164(para)
 msgid ""
 "To send a calendar item as delegate, you should subscribe to the delegator's "
 "message and also you should have necessary rights assigned to you by the "
 "delegator."
 msgstr ""
 
-#: C/evolution.xml:5150(para)
-msgid "Click User to open Show Contacts dialogue box."
+#: C/evolution.xml:5168(para)
+#, fuzzy
+msgid "Click User to open Show Contacts dialog box."
 msgstr ""
+"Wählen Sie Gespeicherte Suchen bearbeiten aus. Das »Suchen«-Fenster öffnet "
+"sich."
 
-#: C/evolution.xml:5153(para)
+#: C/evolution.xml:5171(para)
 msgid ""
 "Select the contact from the desired Address book and click Add, then close "
-"the dialogue box."
+"the dialog box."
 msgstr ""
 
-#: C/evolution.xml:5155(para)
+#: C/evolution.xml:5173(para)
 msgid ""
 "You are not permitted to send a message on behalf of more than one person at "
 "a time."
 msgstr ""
 
-#: C/evolution.xml:5157(para)
+#: C/evolution.xml:5175(para)
 msgid ""
 "When the recipient opens the mail, he or she can also read a message that "
-"‘The message was sent by &lt;<emphasis>Delegator's name</emphasis>&gt; on "
-"behalf of &lt;<emphasis>Delegate's name</emphasis>&gt; on the preview pane "
-"header bar."
+"<guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;"
+"Delegate's name&gt;</guilabel> on the preview pane header bar."
 msgstr ""
 
-#: C/evolution.xml:5162(para)
+#: C/evolution.xml:5180(para)
 msgid ""
 "Select the Request a delivery receipt for this message check box to get a "
 "delivery receipt from your recipient."
 msgstr ""
 
-#: C/evolution.xml:5165(para)
+#: C/evolution.xml:5183(para)
 msgid ""
 "Select the Request a read receipt for this message to get a read receipt for "
 "the message you have sent."
 msgstr ""
 
-#: C/evolution.xml:5168(para)
-msgid "Click OK to confirm your selection."
-msgstr "Klicken Sie auf »OK«, um Ihre Auswahl zu bestätigen."
-
-#: C/evolution.xml:5174(title)
+#: C/evolution.xml:5192(title)
 msgid "Delegating Calendar Items"
 msgstr "Kalendereinträgen delegieren"
 
-#: C/evolution.xml:5175(para)
+#: C/evolution.xml:5193(para)
 msgid ""
 "You can send Meetings or Appointments on behalf of someone else if you have "
 "subscribed to his or her Calendar."
 msgstr ""
 
-#: C/evolution.xml:5176(para)
-msgid "To delegate a Meeting,"
-msgstr "Um eine Besprechung zu delegieren,"
-
-#: C/evolution.xml:5179(para)
-msgid "Select the delegator's calendar."
+#: C/evolution.xml:5196(para)
+msgid "Select the delegator's Calendar."
 msgstr "Wählen Sie den Kalender des Delegaten aus."
 
-#: C/evolution.xml:5182(para)
+#: C/evolution.xml:5199(para)
 msgid "Open a new Meeting composer window."
 msgstr "Öffnen Sie ein E-Mail-Editorfenster."
 
-#: C/evolution.xml:5185(para)
+#: C/evolution.xml:5202(para)
 msgid "Add the recipients."
 msgstr "Fügen Sie die Empfänger hinzu."
 
-#: C/evolution.xml:5188(para)
-msgid "Click Send after filling in all other informations required."
-msgstr ""
-
-#: C/evolution.xml:5189(para)
-msgid ""
-"When the recipient receives the calendar item, he or she can read the "
-"message on top that the <emphasis>&lt;Delegator&gt;</emphasis> through "
-"<emphasis>&lt;Delegate&gt;</emphasis> requests your presence at the "
-"following meeting."
-msgstr ""
+#: C/evolution.xml:5205(para)
+#, fuzzy
+msgid "Fill in the information."
+msgstr "Enthält die grundlegenden Informationen zu einem Kontakt."
 
-#: C/evolution.xml:5190(para)
+#: C/evolution.xml:5207(para)
 msgid ""
-"When a delegate receives the calendar item from another delegate, he or she "
-"can read that the &lt;<emphasis>Delegator</emphasis>&gt; through &lt;"
-"<emphasis>Delegate</emphasis>&gt; request the presence at the following "
-"meeting. Please respond of behalf of his or her &lt;<emphasis>Delegator</"
-"emphasis>&gt;."
+"When the recipient receives the calendar item, a message indicates that the "
+"item was created by someone on behalf of the Delegator."
 msgstr ""
 
-#: C/evolution.xml:5198(para)
+#: C/evolution.xml:5215(para)
 msgid ""
 "You can allow other people in your organization's Global Address List to "
 "access your calendar, address book, and messages, and they can let you "
@@ -10904,105 +10767,105 @@ msgid ""
 "other's schedules to completely manage their personal information."
 msgstr ""
 
-#: C/evolution.xml:5202(para)
+#: C/evolution.xml:5219(para)
 msgid "To add someone to your list of delegates:"
 msgstr "Um eine Person zu Ihrer Liste von Delegaten hinzuzufügen:"
 
-#: C/evolution.xml:5205(para)
-msgid ""
-"Click Edit &gt; Preferences or press Shift+Ctrl+S, then click the Exchange "
-"Settings tab."
-msgstr ""
-"Klicken Sie auf Bearbeiten, dann Einstellungen (oder drücken Sie "
-"Umschalttaste+Steuerung+S), dann klicken Sie auf den Reiter Exchange-"
-"Einstellungen."
+#: C/evolution.xml:5225(para)
+#, fuzzy
+msgid "Click the Exchange Settings tab."
+msgstr "Klicken Sie auf den Reiter Sicherheit."
 
-#: C/evolution.xml:5208(para)
-msgid "Click Delegation Assistant to open the Delegates dialogue box."
+#: C/evolution.xml:5228(para)
+#, fuzzy
+msgid "Click Delegation Assistant to open the Delegates dialog box."
 msgstr ""
+"Klicken Sie auf den Bearbeiten-Knopf. Das »Regel bearbeiten«-Fenster öffnet "
+"sich."
 
-#: C/evolution.xml:5213(para)
+#: C/evolution.xml:5233(para)
 msgid "Click Add, then search for a contact in the Global Address List."
 msgstr ""
 "Klicken Sie auf »Hinzufügen« und suchen Sie dann nach einem Kontakt in der "
 "Globalen Adressliste."
 
-#: C/evolution.xml:5214(para)
+#: C/evolution.xml:5234(para)
 msgid ""
 "Remember that the Global Address List (GAL) appears empty until you have "
 "searched for something in it."
 msgstr ""
 
-#: C/evolution.xml:5217(para)
+#: C/evolution.xml:5237(para)
+#, fuzzy
 msgid ""
-"Select the delegate and click Edit to open the delegate permission dialogue "
+"Select the delegate and click Edit to open the delegate permission dialog "
 "box."
-msgstr ""
+msgstr "Wählen Sie das IMAP-Konto aus und klicken Sie auf Bearbeiten."
 
-#: C/evolution.xml:5222(para)
+#: C/evolution.xml:5242(para)
 msgid ""
 "Select from the following access levels for each of the four types of "
 "folders:"
 msgstr ""
 
-#: C/evolution.xml:5225(para)
+#: C/evolution.xml:5245(para)
 msgid "Do not allow this person to access any folders of this type."
 msgstr "Der Person nicht den Zugriff auf Ordner dieses Typs erlauben."
 
-#: C/evolution.xml:5228(title)
+#: C/evolution.xml:5248(title)
 msgid "Reviewer (read-only):"
 msgstr "Einsicht (nur lesen):"
 
-#: C/evolution.xml:5229(para)
+#: C/evolution.xml:5249(para)
 msgid ""
 "Allows the delegate to see items in this type of folder, but not create new "
 "items or edit existing items."
 msgstr ""
 
-#: C/evolution.xml:5232(title)
+#: C/evolution.xml:5252(title)
 msgid "Author (read, create):"
 msgstr "Erstellung (lesen, erstellen):"
 
-#: C/evolution.xml:5233(para)
+#: C/evolution.xml:5253(para)
 msgid ""
 "The delegate can view items in your folders, and can create new items, but "
 "cannot change any existing items."
 msgstr ""
 
-#: C/evolution.xml:5236(title)
+#: C/evolution.xml:5256(title)
 msgid "Editor (read, create, edit):"
 msgstr "Bearbeitung (lesen, erstellen, bearbeiten):"
 
-#: C/evolution.xml:5237(para)
+#: C/evolution.xml:5257(para)
 msgid "The delegate can view, create, and change items in your folders."
 msgstr ""
 
-#: C/evolution.xml:5244(para)
+#: C/evolution.xml:5264(para)
 msgid ""
-"The delegate will be notified through a separate mail that he/she is being "
-"added to your list of delegates. The mail summarizes all the rights that has "
-"been assigned to him or her."
+"The delegate is notified through a separate mail that he or she is being "
+"added to your list of delegates. The mail summarizes all the rights that "
+"have been assigned to the delegate."
 msgstr ""
 
-#: C/evolution.xml:5249(para)
+#: C/evolution.xml:5269(para)
 msgid "To access the folders delegated to you:"
 msgstr ""
 
-#: C/evolution.xml:5252(para)
+#: C/evolution.xml:5272(para)
 msgid "Click File &gt; Subscribe to Other User's Exchange Folder."
 msgstr "Klicken Sie auf »Datei &gt; Ordner eines anderen Benutzers abonnieren«."
 
-#: C/evolution.xml:5257(para)
+#: C/evolution.xml:5277(para)
 msgid ""
-"Specify the e-mail address of the user who has delegated to you, or click "
+"Specify the email address of the user who has delegated to you, or click "
 "User to select the user from your address book."
 msgstr ""
 
-#: C/evolution.xml:5260(para)
+#: C/evolution.xml:5280(para)
 msgid "Select the folder you want to open."
 msgstr "Wählen Sie das Verzeichnis aus, dass geöffnet werden soll."
 
-#: C/evolution.xml:5266(para)
+#: C/evolution.xml:5286(para)
 msgid ""
 "Folders delegated to you appear in your folder list inside a folder labeled "
 "with the name of its owner. For example, if Martha Thompson delegates "
@@ -11010,41 +10873,42 @@ msgid ""
 "folder tree at the same level as your Personal Folders and Public Folders."
 msgstr ""
 
-#: C/evolution.xml:5267(para)
+#: C/evolution.xml:5287(para)
 msgid ""
 "If the folder fails to open properly, check with the folder owner to make "
 "sure that you have been granted the correct access permissions."
 msgstr ""
 
-#: C/evolution.xml:5273(para)
+#: C/evolution.xml:5293(para)
 msgid "You can subscribe to public folders available on the Exchange server."
 msgstr ""
 
-#: C/evolution.xml:5279(para)
+#: C/evolution.xml:5299(para)
 msgid "Select the Exchange account."
 msgstr "Wählen Sie das Exchange-Konto aus."
 
-#: C/evolution.xml:5282(para)
+#: C/evolution.xml:5302(para)
 msgid "Check the folders you want to subscribe to."
 msgstr "Wählen Sie die Ordner aus, die Sie abonnieren möchten."
 
-#: C/evolution.xml:5288(para)
+#: C/evolution.xml:5308(para)
 msgid "The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 
-#: C/evolution.xml:5291(para)
+#: C/evolution.xml:5311(para)
 msgid "To view contents of a folder, click it."
 msgstr "Klicken Sie auf einen Ordner, um den Inhalt dieses Ordners einzusehen."
 
-#: C/evolution.xml:5298(para)
+#: C/evolution.xml:5318(para)
 msgid ""
 "Reminders for meetings in your Exchange calendar do not work until you have "
 "run Evolution at least once after logging in. This is different from locally "
 "stored reminders, which work from the moment you log in, regardless of "
-"whether you have run Evolution in the session.so that you can fix a "
-"convenient time for a meeting.To enable Reminder setting in your Exchange "
-"account, select ‘Remember the password'checkbox. To find more information "
-"about Reminders see<link linkend=\"bshly4v\">Reminders</link>"
+"whether you have run Evolution in the session so that you can fix a "
+"convenient time for a meeting. To enable Reminder setting in your Exchange "
+"account, select <guilabel>Remember the password</guilabel> checkbox. To find "
+"more information about Reminders see<link linkend=\"bshly4v\">Reminders</"
+"link>."
 msgstr ""
 "Alarmbenachrichtigungen für Besprechungen in Ihrem Exchange-Kalender "
 "funktionieren erst, nachdem Sie Evolution einmal gestartet haben nach dem "
@@ -11053,40 +10917,36 @@ msgstr ""
 "angemeldet haben, ohne dass Evolution gestartet wurde. Um "
 "Alarmbenachrichtigungen in Ihrem Exchange-Konto zu aktivieren, wählen Sie "
 "das »Passwort speichern«-Ankreuzfeld. Für weitere Informationen über "
-"Alarmbenachrichtigungen siehe <link linkend=\"bshly4v\">Erinnerungen</link>"
+"Alarmbenachrichtigungen siehe <link linkend=\"bshly4v\">Erinnerungen</link>."
 
-#: C/evolution.xml:5303(para)
+#: C/evolution.xml:5323(para)
 msgid ""
 "An Out of Office message is an automatic reply that you can send as a reply "
-"to messages, explaining why you aren't immediately responding to their "
-"messages. For example, if you go on vacation for a week and won't access "
-"your e-mail, you can set an automatic reply so that people know that you "
-"aren't ignoring them."
+"to messages, explaining why you are not immediately responding to their "
+"messages. For example, if you go on vacation for a week and will not access "
+"your email, you can set an automatic reply so that people know that you are "
+"not ignoring them."
 msgstr ""
 
-#: C/evolution.xml:5306(para)
-msgid "Click Edit &gt; Preferences &gt; Mail Accounts."
-msgstr "Klicken Sie auf Bearbeiten, dann Einstellungen, dann auf E-Mail-Konten."
-
-#: C/evolution.xml:5309(para)
+#: C/evolution.xml:5329(para)
 msgid "Select the Exchange account, then click Edit."
 msgstr "Wählen Sie das Exchange-Konto aus und klicken Sie dann auf »Bearbeiten«."
 
-#: C/evolution.xml:5312(para)
+#: C/evolution.xml:5332(para)
 msgid ""
 "Select the Exchange Settings tab. The top option allows you to set an Out of "
 "Office message."
 msgstr ""
 
-#: C/evolution.xml:5315(para)
+#: C/evolution.xml:5335(para)
 msgid "Click I Am Currently Out of the Office."
 msgstr "Klicken Sie auf »Ich bin zurzeit nicht im Büro«."
 
-#: C/evolution.xml:5318(para)
+#: C/evolution.xml:5338(para)
 msgid "Type a short message in the text field."
 msgstr "Geben Sie eine kurze Nachricht in das Textfeld ein."
 
-#: C/evolution.xml:5325(para)
+#: C/evolution.xml:5345(para)
 msgid ""
 "Your message is automatically sent to anyone who sends you mail until you "
 "return and select I Am in the office."
@@ -11094,7 +10954,7 @@ msgstr ""
 "Ihre Nachricht wird automatisch an jeden verschickt, der Ihnen eine E-Mail "
 "schreibt, bis Sie wieder auf »Ich bin zurzeit im Büro« klicken."
 
-#: C/evolution.xml:5331(para)
+#: C/evolution.xml:5351(para)
 msgid ""
 "Evolution helps you fix a convenient time for a meeting according to the "
 "availability of the attendees.It's Free/Busy feature allows you to perform a "
@@ -11103,284 +10963,287 @@ msgid ""
 "altogether."
 msgstr ""
 
-#: C/evolution.xml:5335(para)
+#: C/evolution.xml:5355(para)
 msgid "Create a new appointment in the calendar."
 msgstr "Erstellen Sie einen neuen Termin im Kalender."
 
-#: C/evolution.xml:5338(para)
+#: C/evolution.xml:5358(para)
 msgid ""
 "Right-click the appointment, then select Schedule Meeting to appear "
 "Evolution Meeting editor."
 msgstr ""
 
-#: C/evolution.xml:5341(para)
+#: C/evolution.xml:5361(para)
 msgid "Click the Add tab to enter the email addresses into the list."
 msgstr ""
 
-#: C/evolution.xml:5344(para)
+#: C/evolution.xml:5364(para)
 msgid ""
 "Click the Attendees tab to select the participants from Global Address List "
 "(GAL)."
 msgstr ""
 
-#: C/evolution.xml:5345(para)
+#: C/evolution.xml:5365(para)
 msgid "You can directly select the participants from the following address lists."
 msgstr ""
 
-#: C/evolution.xml:5351(para)
+#: C/evolution.xml:5371(para)
 msgid "Global Address List"
 msgstr "Globale Adressliste"
 
-#: C/evolution.xml:5357(para)
+#: C/evolution.xml:5377(para)
 msgid ""
 "You can also specify the category as Anniversary, Birthday, Business etc. "
 "from the drop-down list for each address list given."
 msgstr ""
 
-#: C/evolution.xml:5360(para)
+#: C/evolution.xml:5380(para)
 msgid "Add the participants to the following categories of attendees."
 msgstr ""
 
-#: C/evolution.xml:5363(para)
+#: C/evolution.xml:5383(para)
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: C/evolution.xml:5366(para)
+#: C/evolution.xml:5386(para)
 msgid "Required Participants"
 msgstr "Benötigte Teilnehmer"
 
-#: C/evolution.xml:5369(para)
+#: C/evolution.xml:5389(para)
 msgid "Optional Participants"
 msgstr "Optionale Teilnehmer"
 
-#: C/evolution.xml:5372(para)
+#: C/evolution.xml:5392(para)
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: C/evolution.xml:5377(para)
+#: C/evolution.xml:5397(para)
 msgid "Click Free/Busy tool at the top right corner."
 msgstr ""
 
-#: C/evolution.xml:5380(para)
+#: C/evolution.xml:5400(para)
 msgid ""
 "Click Options &gt; Update Free/Busy to check participant schedules and, if "
 "possible, update the meeting in all participants' calendars"
 msgstr ""
 
-#: C/evolution.xml:5383(para)
+#: C/evolution.xml:5403(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
-"meeting, you can “nudge” the meeting forward or backward to the nearest "
-"available time. To do so, just click the arrows to the left or right of the "
-"Autopick button. The Autopick tool lets you move the meeting to the nearest "
-"time during which all attendees are available. If you are not satisfied with "
-"those results, you can also drag the edges of the area marked as meeting "
-"time to the hours that you want to select.<computeroutput/>"
+"meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
+"nearest available time. To do so, just click the arrows to the left or right "
+"of the Autopick button. The Autopick tool lets you move the meeting to the "
+"nearest time during which all attendees are available. If you are not "
+"satisfied with those results, you can also drag the edges of the area marked "
+"as meeting time to the hours that you want to select."
 msgstr ""
 
-#: C/evolution.xml:5389(para)
-msgid "Evolution™ can access accounts on Novell® GroupWise® 7 system."
-msgstr "Evolution™ kann auf Konten auf Novell® GroupWise® 7-Servern zugreifen."
+#: C/evolution.xml:5409(para)
+msgid ""
+"<trademark>Evolution</trademark> can access accounts on <trademark class="
+"\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
+"trademark> 7 system."
+msgstr ""
+"<trademark>Evolution</trademark> kann auf Konten eines »<trademark class="
+"\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
+"trademark> 7«-Systems zugreifen."
 
-#: C/evolution.xml:5392(link) C/evolution.xml:5415(title)
+#: C/evolution.xml:5412(link) C/evolution.xml:5435(title)
 msgid "GroupWise Features"
 msgstr "GroupWise-Funktionen"
 
-#: C/evolution.xml:5395(link) C/evolution.xml:5504(title)
+#: C/evolution.xml:5415(link) C/evolution.xml:5524(title)
 msgid "GroupWise Terminology vs. Evolution Terminology"
 msgstr "GroupWise-Begriffe vs. Evolution-Begriffe"
 
-#: C/evolution.xml:5398(link) C/evolution.xml:5575(title)
+#: C/evolution.xml:5418(link) C/evolution.xml:5595(title)
 msgid "Adding your GroupWise Account to Evolution"
 msgstr "GroupWise-Konto in Evolution hinzufügen"
 
-#: C/evolution.xml:5401(link) C/evolution.xml:5714(title)
+#: C/evolution.xml:5421(link) C/evolution.xml:5736(title)
 msgid "Scheduling Appointments with Free/Busy"
 msgstr ""
 
-#: C/evolution.xml:5404(link) C/evolution.xml:5736(title)
+#: C/evolution.xml:5424(link) C/evolution.xml:5758(title)
 msgid "Managing Sent Items"
 msgstr ""
 
-#: C/evolution.xml:5407(link) C/evolution.xml:5932(title)
+#: C/evolution.xml:5427(link) C/evolution.xml:5939(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
 msgstr ""
 
-#: C/evolution.xml:5410(link) C/evolution.xml:6102(title)
+#: C/evolution.xml:5430(link) C/evolution.xml:6110(title)
 msgid "Junk Mail Handling"
 msgstr ""
 
-#: C/evolution.xml:5416(para)
+#: C/evolution.xml:5436(para)
 msgid ""
 "GroupWise connectivity in Evolution supports the following basic Novell "
 "GroupWise features:"
 msgstr ""
 
-#: C/evolution.xml:5422(para)
+#: C/evolution.xml:5442(para)
 msgid "Viewing mail and folders stored on the GroupWise system."
 msgstr ""
 
-#: C/evolution.xml:5425(para)
+#: C/evolution.xml:5445(para)
 msgid "Sending mail from you GroupWise account."
 msgstr "E-Mails von Ihrem GroupWise-Konto verschicken."
 
-#: C/evolution.xml:5428(para)
+#: C/evolution.xml:5448(para)
 msgid "Converting mail to a task or meeting."
 msgstr ""
 
-#: C/evolution.xml:5431(para)
+#: C/evolution.xml:5451(para)
 msgid "Tracking the status of a message."
 msgstr "Den Status einer Nachricht verfolgen."
 
-#: C/evolution.xml:5434(para)
+#: C/evolution.xml:5454(para)
 msgid ""
 "Marking a message as junk mail adds the sender to your GroupWise junk mail "
 "list."
 msgstr ""
 
-#: C/evolution.xml:5437(para)
+#: C/evolution.xml:5457(para)
 msgid "Improved Status Tracking."
 msgstr "Verbesserte Statusverfolgung."
 
-#: C/evolution.xml:5445(para)
+#: C/evolution.xml:5465(para)
 msgid ""
 "You can send and receive appointment and meeting requests. Allows Evolution "
 "users to schedule meetings and view attendee availability for other users on "
 "GroupWise."
 msgstr ""
 
-#: C/evolution.xml:5448(para)
+#: C/evolution.xml:5468(para)
 msgid ""
 "You can receive an iCalendar meeting request and add it to your GroupWise "
 "calendar."
 msgstr ""
 
-#: C/evolution.xml:5456(para)
+#: C/evolution.xml:5476(para)
 msgid ""
 "Address Completion is supported for your GroupWise address books, including "
 "the System address book, the Frequent Contacts address book, and your "
 "personal address book."
 msgstr ""
 
-#: C/evolution.xml:5459(para)
+#: C/evolution.xml:5479(para)
 msgid ""
 "If you receive a card attachment and click Save in Address Book, it is saved "
 "to your Personal address book. New Address Book entries can also be added to "
-"your personal address book from received E-mail messages."
+"your personal address book from received Email messages."
 msgstr ""
 
-#: C/evolution.xml:5462(para)
+#: C/evolution.xml:5482(para)
 msgid ""
 "To create your GroupWise Frequent contacts and Personal address books, you "
 "need to access your GroupWise account once through GroupWise Java client "
-"because Evolution currently does not support creating them.The GroupWise "
+"because Evolution currently does not support creating them. The GroupWise "
 "system address book is marked for offline use by default.This boosts "
 "performance."
 msgstr ""
 
-#: C/evolution.xml:5467(para) C/evolution.xml:5539(para)
+#: C/evolution.xml:5487(para) C/evolution.xml:5559(para)
 msgid "Reminder Note"
 msgstr "Erinnerungsmitteilung"
 
-#: C/evolution.xml:5470(para)
+#: C/evolution.xml:5490(para)
 msgid ""
 "GroupWise Reminder Note is integrated into Memo component. You can view the "
 "Reminder notes listed under Memos at the bottom right of the Calendar view "
 "given that you have selected them under the Memos component."
 msgstr ""
 
-#: C/evolution.xml:5475(para)
+#: C/evolution.xml:5495(para)
 msgid "Proxy"
 msgstr "Vertretung"
 
-#: C/evolution.xml:5478(para)
+#: C/evolution.xml:5498(para)
 msgid "You can assign Proxy access to other users."
 msgstr "Sie können anderen Benutzer Vertretungsrechte zuteilen."
 
-#: C/evolution.xml:5481(para)
+#: C/evolution.xml:5501(para)
 msgid "You can view other users' accounts through Proxy access."
-msgstr "Sie können über Vertretungszugriff auf die Konten anderer Benutzer zugreifen."
+msgstr ""
+"Sie können über Vertretungszugriff auf die Konten anderer Benutzer zugreifen."
 
-#: C/evolution.xml:5486(para)
+#: C/evolution.xml:5506(para)
 msgid "There are, however, some features that are not available:"
 msgstr "Allerdings sind einige Funktionen leider nicht verfügbar:"
 
-#: C/evolution.xml:5489(para)
+#: C/evolution.xml:5509(para)
 msgid "Resending items"
 msgstr ""
 
-#: C/evolution.xml:5492(para)
+#: C/evolution.xml:5512(para)
 msgid "Retracting items"
 msgstr ""
 
-#: C/evolution.xml:5495(para)
+#: C/evolution.xml:5515(para)
 msgid "Accepting appointments or meetings in offline mode"
 msgstr ""
 
-#: C/evolution.xml:5498(para)
+#: C/evolution.xml:5518(para)
 msgid "Archive"
 msgstr ""
 
-#: C/evolution.xml:5505(para)
+#: C/evolution.xml:5525(para)
 msgid ""
 "GroupWise and Evolution sometimes uses different terminology for different "
 "types of items. The following table compares GroupWise terminology to "
 "Evolution terminology."
 msgstr ""
 
-#: C/evolution.xml:5513(para)
+#: C/evolution.xml:5533(para)
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: C/evolution.xml:5516(para) C/evolution.xml:7160(glossterm)
-msgid "Evolution"
-msgstr "Evolution"
-
-#: C/evolution.xml:5523(para) C/evolution.xml:5534(para)
+#: C/evolution.xml:5543(para) C/evolution.xml:5554(para)
 msgid "Appointment"
 msgstr "Termin"
 
-#: C/evolution.xml:5526(para)
+#: C/evolution.xml:5546(para)
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: C/evolution.xml:5531(para)
+#: C/evolution.xml:5551(para)
 msgid "Posted Appointment"
 msgstr ""
 
-#: C/evolution.xml:5542(para) C/evolution.xml:5566(para)
+#: C/evolution.xml:5562(para) C/evolution.xml:5586(para)
 msgid "None; use a task"
 msgstr "Keine Entsprechung, benutzen Sie  stattdessen eine Aufgabe"
 
-#: C/evolution.xml:5547(para)
+#: C/evolution.xml:5567(para)
 msgid "Discussion Note"
 msgstr ""
 
-#: C/evolution.xml:5550(para)
+#: C/evolution.xml:5570(para)
 msgid "None; use an assigned task"
 msgstr "Keine Entsprechung, benutzen Sie stattdessen eine Zugewiesene Aufgabe"
 
-#: C/evolution.xml:5555(para)
+#: C/evolution.xml:5575(para)
 msgid "Phone Message"
 msgstr ""
 
-#: C/evolution.xml:5558(para)
+#: C/evolution.xml:5578(para)
 msgid "None; use a message"
 msgstr "Keine Entsprechung, benutzen Sie stattdessen eine E-Mail-Nachricht"
 
-#: C/evolution.xml:5563(para)
+#: C/evolution.xml:5583(para)
 msgid "Checklist"
 msgstr ""
 
-#: C/evolution.xml:5578(link) C/evolution.xml:5586(title)
+#: C/evolution.xml:5598(link) C/evolution.xml:5606(title)
 msgid "Creating a New GroupWise Account"
 msgstr "Ein neues GroupWise-Konto erstellen"
 
-#: C/evolution.xml:5581(link) C/evolution.xml:5601(title)
+#: C/evolution.xml:5601(link) C/evolution.xml:5621(title)
 msgid "Changing an Existing Account to Work with GroupWise"
 msgstr ""
 
-#: C/evolution.xml:5595(para)
+#: C/evolution.xml:5615(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>."
@@ -11388,161 +11251,137 @@ msgstr ""
 "Erzeugen Sie das Konto, indem Sie der Beschreibung unter <link linkend="
 "\"usage-mainwindow-starting\">Evolution zum ersten Mal starten</link> folgen."
 
-#: C/evolution.xml:5602(para)
+#: C/evolution.xml:5622(para)
 msgid ""
-"If you have an existing e-mail account, and want to convert it to use with "
+"If you have an existing email account, and want to convert it to use with "
 "GroupWise:"
 msgstr ""
 
-#: C/evolution.xml:5608(para)
+#: C/evolution.xml:5628(para)
 msgid "Select the account you want to convert, then click Edit."
 msgstr ""
 
-#: C/evolution.xml:5611(para)
+#: C/evolution.xml:5631(para)
 msgid "Click the Identity tab."
 msgstr ""
 
-#: C/evolution.xml:5619(para)
+#: C/evolution.xml:5639(para)
 msgid ""
 "Click the Receiving Email tab, then select Novell GroupWise as your server "
 "type."
 msgstr ""
 
-#: C/evolution.xml:5624(para)
+#: C/evolution.xml:5644(para)
 msgid ""
 "Type the name of your mail server, your user name, and select whether to use "
 "SSL."
 msgstr ""
 
-#: C/evolution.xml:5626(para)
+#: C/evolution.xml:5646(para)
 msgid ""
 "Select SSL for a highly secured connection between your client and server. "
 "Contact your administrator for further details."
 msgstr ""
 
-#: C/evolution.xml:5630(para)
-msgid ""
-"Click the Receiving Options tab, then select if you want Evolution to "
-"automatically check for new mail."
-msgstr ""
-
-#: C/evolution.xml:5650(para)
+#: C/evolution.xml:5671(para)
 msgid ""
 "Select if you want to automatically synchronize your remote calendar and "
 "contacts locally."
 msgstr ""
 
-#: C/evolution.xml:5651(para)
+#: C/evolution.xml:5672(para)
 msgid ""
 "It fetches the remote calendar and contact information and stores it on your "
 "local drive."
 msgstr ""
 
-#: C/evolution.xml:5653(para)
+#: C/evolution.xml:5674(para)
 msgid ""
 "Remote calendar and contacts are typically stored remotely on servers rather "
 "than on local hard disk."
 msgstr ""
 
-#: C/evolution.xml:5657(para)
+#: C/evolution.xml:5678(para)
 msgid ""
 "Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
 msgstr ""
 
-#: C/evolution.xml:5661(para)
+#: C/evolution.xml:5682(para)
 msgid ""
 "(Optional) Click the Proxy tab, then click Add to add any Proxy users to "
 "your account."
 msgstr ""
 
-#: C/evolution.xml:5664(para) C/evolution.xml:6056(para)
-msgid "Click OK, then click Close."
-msgstr ""
-
-#: C/evolution.xml:5671(title)
+#: C/evolution.xml:5693(title)
 msgid "Reminder Notes"
 msgstr ""
 
-#: C/evolution.xml:5672(para)
+#: C/evolution.xml:5694(para)
 msgid ""
 "GroupWise Reminder notes are like mail messages except they are scheduled "
 "for a particular day and appear on the Calendar for that date. You can use "
 "reminder notes to show vacations, holidays, pay days, birthdays, and so "
 "forth.Posted reminder notes are placed in your Calendar on the date you "
-"specify. They are not placed in your Mailbox or in any other user’s Mailbox."
+"specify. They are not placed in your Mailbox or in any other user's Mailbox."
 msgstr ""
 
-#: C/evolution.xml:5673(para)
+#: C/evolution.xml:5695(para)
 msgid ""
 "Evolution integrates this feature into its Memo component so that you can "
 "view the Reminder notes listed under Memo at the right bottom side of the "
 "calender view."
 msgstr ""
 
-#: C/evolution.xml:5675(para)
+#: C/evolution.xml:5697(para)
 msgid ""
 "Select the memo or the Reminder notes under the Memo component to display it "
 "on the Calendar view."
 msgstr ""
 
-#: C/evolution.xml:5678(para)
+#: C/evolution.xml:5700(para)
 msgid ""
 "To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</"
 "link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend="
 "\"b1012vdd\">Memos</link>."
 msgstr ""
 
-#: C/evolution.xml:5679(para)
+#: C/evolution.xml:5701(para)
 msgid "To send a Reminder Note,"
 msgstr ""
 
-#: C/evolution.xml:5682(para)
-msgid "Click New &gt; Shared Memo to open the new window."
-msgstr "Klicken Sie auf Neu &gt; Gemeinsame Notiz um das neue Fenster zu öffnen."
+#: C/evolution.xml:5704(para)
+msgid "Click File &gt; New &gt; Shared Memo."
+msgstr "Klicken Sie auf Datei &gt; Neu &gt; Gemeinsame Notiz."
 
-#: C/evolution.xml:5685(para)
+#: C/evolution.xml:5707(para)
 msgid ""
 "Select the Organizer's account name from the drop-down list given next to "
 "the Organizer field."
 msgstr ""
 
-#: C/evolution.xml:5688(para)
+#: C/evolution.xml:5710(para)
 msgid ""
 "In the To field, type a username, then press Enter. Repeat for additional "
 "users."
 msgstr ""
 
-#: C/evolution.xml:5691(para)
-msgid "Select the Group in which you would create the entry."
-msgstr ""
-
-#: C/evolution.xml:5694(para)
-msgid "Enter a brief description about the Reminder Note in the Summary field."
-msgstr ""
-"Geben Sie eine kurze Zusammenfassung für die Erinnerung in das "
-"»Zusammenfassung«-Feld ein."
-
-#: C/evolution.xml:5700(para)
+#: C/evolution.xml:5722(para)
 msgid "Specify the category that the Reminder note falls under."
 msgstr ""
 
-#: C/evolution.xml:5703(para)
-msgid "Enter the description for the Reminder Note."
-msgstr ""
-
-#: C/evolution.xml:5706(para)
+#: C/evolution.xml:5728(para)
 msgid "Click Save."
 msgstr "Klicken Sie auf »Speichern«."
 
-#: C/evolution.xml:5715(para)
+#: C/evolution.xml:5737(para)
 msgid ""
 "When you schedule a meeting with your calendar on GroupWise, you can check "
 "when other local GroupWise users are busy according to their GroupWise "
 "calendars."
 msgstr ""
 
-#: C/evolution.xml:5717(para)
+#: C/evolution.xml:5739(para)
 msgid ""
 "Reminders for appointments in your GroupWise calendar do not work until you "
 "have run Evolution at least once after logging in. This is different from "
@@ -11550,189 +11389,181 @@ msgid ""
 "of whether you have run Evolution in the session."
 msgstr ""
 
-#: C/evolution.xml:5720(para)
+#: C/evolution.xml:5742(para)
 msgid "Open a new appointment in the calendar."
 msgstr "Erstellen Sie einen neuen Termin im Kalender."
 
-#: C/evolution.xml:5723(para)
+#: C/evolution.xml:5745(para)
 msgid "Click Actions &gt; Schedule Meeting."
 msgstr "Klicken Sie auf  »Aktionen &gt; Besprechung ansetzen«."
 
-#: C/evolution.xml:5726(para)
+#: C/evolution.xml:5748(para)
 msgid ""
-"Add attendees, either by entering their e-mail addresses into the list, or "
-"by clicking the Invite Others button."
+"Add attendees, either by entering their email addresses into the list, or by "
+"clicking the Invite Others button."
 msgstr ""
 
-#: C/evolution.xml:5729(para)
+#: C/evolution.xml:5751(para)
 msgid ""
 "Click Options, then click Update Free/Busy to check participant schedules "
 "and, if possible, update the meeting in all participants' calendars."
 msgstr ""
 
-#: C/evolution.xml:5732(para)
+#: C/evolution.xml:5754(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
-"meeting, you can “nudge” the meeting forward or backward to the nearest "
-"available time. To do so, just click the arrows to the left or right of the "
-"Autopick button. The Autopick tool moves the meeting to the nearest time "
-"during which all attendees are available. If you aren't satisfied with those "
-"results, you can drag the edges of the meeting time to the hours that you "
-"want to select."
+"meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
+"nearest available time. To do so, just click the arrows to the left or right "
+"of the Autopick button. The Autopick tool moves the meeting to the nearest "
+"time during which all attendees are available. If you aren't satisfied with "
+"those results, you can drag the edges of the meeting time to the hours that "
+"you want to select."
 msgstr ""
 
-#: C/evolution.xml:5739(link) C/evolution.xml:5759(title)
+#: C/evolution.xml:5761(link) C/evolution.xml:5781(title)
 msgid "Confirming Delivery of Items You have Sent"
 msgstr ""
 
-#: C/evolution.xml:5742(link) C/evolution.xml:5873(title)
+#: C/evolution.xml:5764(link) C/evolution.xml:5887(title)
 msgid "Displaying Sent Items"
 msgstr ""
 
-#: C/evolution.xml:5745(link) C/evolution.xml:5808(title)
+#: C/evolution.xml:5767(link) C/evolution.xml:5826(title)
 msgid "Checking the Status of an Item You Have Sent"
 msgstr ""
 
-#: C/evolution.xml:5748(link) C/evolution.xml:5751(link)
-#: C/evolution.xml:5835(title)
+#: C/evolution.xml:5770(link) C/evolution.xml:5773(link)
+#: C/evolution.xml:5853(title)
 msgid "Requesting a Reply for Items You Send"
 msgstr ""
 
-#: C/evolution.xml:5755(para)
+#: C/evolution.xml:5777(para)
 msgid ""
-"You can manage your sent items for GroupWise e-mail only if the recipient is "
+"You can manage your sent items for GroupWise email only if the recipient is "
 "located on the same GroupWise system as you."
 msgstr ""
 
-#: C/evolution.xml:5760(para)
+#: C/evolution.xml:5782(para)
 msgid ""
 "Evolution provides several ways for you to confirm that your item was "
 "delivered. You can easily track message status of any message you have sent. "
-"For example, you can see when an e-mail was delivered and when the recipient "
-"opened or deleted the e-mail."
+"For example, you can see when an email was delivered and when the recipient "
+"opened or deleted the email."
 msgstr ""
 
-#: C/evolution.xml:5762(title)
+#: C/evolution.xml:5784(title)
 msgid "Track an Item You Sent:"
 msgstr ""
 
-#: C/evolution.xml:5763(para)
+#: C/evolution.xml:5785(para)
 msgid ""
-"You can check the status in the Message Status window of an e-mail You have "
+"You can check the status in the Message Status window of an email you have "
 "sent."
 msgstr ""
 
-#: C/evolution.xml:5766(title)
+#: C/evolution.xml:5788(title)
 msgid "Receive Notification When the Item is Opened or Deleted:"
 msgstr ""
 
-#: C/evolution.xml:5767(para)
+#: C/evolution.xml:5789(para)
 msgid ""
 "You can receive notification when the recipient opens or deletes a message. "
 "For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items "
 "You Send</link>."
 msgstr ""
 
-#: C/evolution.xml:5770(title)
+#: C/evolution.xml:5792(title)
 msgid "Request a Reply:"
 msgstr ""
 
-#: C/evolution.xml:5771(para)
+#: C/evolution.xml:5793(para)
 msgid ""
-"You can inform the recipient that you need a reply to an e-mail. Evolution "
+"You can inform the recipient that you need a reply to an email. Evolution "
 "adds a sentence to the item stating that a reply is requested and changes "
 "the icon in the recipient's Mailbox to a double arrow. For information, see "
 "<link linkend=\"Ak05sv1\">Requesting a Reply for Items You Send</link>."
 msgstr ""
 
-#: C/evolution.xml:5775(title) C/evolution.xml:5899(title)
-msgid "Status Tracking"
+#: C/evolution.xml:5797(title) C/evolution.xml:5911(title)
+#, fuzzy
+msgid "Enabling Status Tracking"
 msgstr "Statusverfolgung"
 
-#: C/evolution.xml:5776(para)
-msgid "You can enable Status Tracking before you send any messages."
-msgstr "Sie können die Statusverfolgung aktivieren, bevor Sie Nachrichten versenden."
-
-#: C/evolution.xml:5777(para)
-msgid "To track the status of the message you are sending,"
-msgstr "Um den Status einer Nachricht zu verfolgen, die Sie versenden,"
-
-#: C/evolution.xml:5780(para)
-msgid ""
-"In the Compose Message window, click Insert &gt; Send Options &gt; Status "
-"Tracking"
+#: C/evolution.xml:5800(para) C/evolution.xml:5840(para)
+#: C/evolution.xml:5856(para)
+msgid "In the Compose Message window, click Insert &gt; Send Options."
 msgstr ""
 
-#: C/evolution.xml:5785(para) C/evolution.xml:5908(para)
+#: C/evolution.xml:5801(para)
+#, fuzzy
+msgid "Select Status Tracking."
+msgstr "Statusverfolgung"
+
+#: C/evolution.xml:5806(para) C/evolution.xml:5918(para)
 msgid "Select the check box next to Create a sent item to track information."
 msgstr ""
 
-#: C/evolution.xml:5788(para) C/evolution.xml:5911(para)
+#: C/evolution.xml:5809(para) C/evolution.xml:5921(para)
 msgid ""
 "Select any of the options given (Delivered, Delivered and opened, All "
 "information)"
 msgstr ""
 
-#: C/evolution.xml:5789(para) C/evolution.xml:5912(para)
+#: C/evolution.xml:5810(para) C/evolution.xml:5922(para)
 msgid ""
 "Based on this selection, you can view the status of the send message in the "
 "Sent Items folder."
 msgstr ""
 
-#: C/evolution.xml:5790(para)
+#: C/evolution.xml:5811(para)
 msgid ""
 "For more information, see <link linkend=\"Aal54a9\">Checking the Status of "
 "an Item You Have Sent</link>."
 msgstr ""
 
-#: C/evolution.xml:5793(para) C/evolution.xml:5915(para)
+#: C/evolution.xml:5814(para) C/evolution.xml:5925(para)
 msgid ""
-"Select the check box next to Auto-delete sent item to delete the sent item "
-"automatically from the Sent folder."
+"(Optional)Select the check box next to Auto-delete sent item to "
+"automatically delete the sent item from the Sent folder."
 msgstr ""
 
-#: C/evolution.xml:5797(title) C/evolution.xml:5919(title)
-msgid "Return Notification:"
-msgstr "Rücksendemitteilung:"
-
-#: C/evolution.xml:5798(para) C/evolution.xml:5920(para)
-msgid "In the Return Notification, specify the type of return receipt you want."
+#: C/evolution.xml:5817(para) C/evolution.xml:5928(para)
+msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
 
-#: C/evolution.xml:5811(para)
-msgid "Right-click an e-mail in your Sent folder, then click Track Message Status."
+#: C/evolution.xml:5829(para)
+#, fuzzy
+msgid "Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
+"Klicken Sie mit der rechten Maustaste auf einen Kontakt und wählen Sie dann "
+"Nachricht an Kontakt schicken."
 
-#: C/evolution.xml:5812(para)
+#: C/evolution.xml:5830(para)
 msgid ""
-"With Message Tracking, you will know when the item reached the recipients or "
-"read by them. You will also know exactly who received your message, who read "
-"your message, who deleted and when."
+"With Message Tracking, you know when the item reaches the recipients or is "
+"read by them. You also know exactly who received your message, who read your "
+"message, and who deleted it and when."
 msgstr ""
 
-#: C/evolution.xml:5819(title)
-msgid "Changing the Priority of an E-Mail"
+#: C/evolution.xml:5837(title)
+msgid "Changing the Priority of an Email"
 msgstr "Die Priorität einer E-Mail verändern"
 
-#: C/evolution.xml:5822(para) C/evolution.xml:5838(para)
-msgid "In the Compose Message window, click Insert &gt; Send Options."
-msgstr ""
-
-#: C/evolution.xml:5825(para)
+#: C/evolution.xml:5843(para)
 msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
 msgstr ""
 
-#: C/evolution.xml:5826(para)
+#: C/evolution.xml:5844(para)
 msgid ""
 "The small icon next to an item in the Mailbox is red when the priority is "
 "high."
 msgstr ""
 
-#: C/evolution.xml:5843(para)
+#: C/evolution.xml:5860(para)
 msgid "Click Reply Requested, then specify when you want to receive the reply."
 msgstr ""
 
-#: C/evolution.xml:5844(para)
+#: C/evolution.xml:5861(para)
 msgid ""
 "If you select When Convenient, then Reply Requested: When Convenient appears "
 "at the top of the message. If you select Within x Days, then Reply "
@@ -11740,117 +11571,104 @@ msgid ""
 "the top of the message."
 msgstr ""
 
-#: C/evolution.xml:5847(para)
-msgid ""
-"Click Set expiration date, and specify the number of date for the message to "
-"get expired."
-msgstr ""
-
-#: C/evolution.xml:5848(para)
+#: C/evolution.xml:5864(para)
 msgid ""
-"Until the specified count of days have passed, your message remains in the "
-"recipient's Inbox."
+"Click Set Expiration Date, then specify the number of days for this message "
+"to remain in the recipient's Inbox."
 msgstr ""
 
-#: C/evolution.xml:5857(title)
+#: C/evolution.xml:5872(title)
 msgid "Setting Message Delivery Options"
 msgstr ""
 
-#: C/evolution.xml:5858(para)
+#: C/evolution.xml:5873(para)
 msgid ""
-"You can delay the delivery of an individual message by having them held in "
-"the Outbox for a specified time after clicking Send."
+"You can delay the delivery of an individual message by having it held in the "
+"Outbox for a specified time."
 msgstr ""
 
-#: C/evolution.xml:5861(para)
+#: C/evolution.xml:5876(para)
 msgid "Click Delay message delivery."
 msgstr ""
 
-#: C/evolution.xml:5864(para)
-msgid "Set the Date and Time until you want the message to be held in the Outbox."
-msgstr ""
-
-#: C/evolution.xml:5874(para)
+#: C/evolution.xml:5879(para)
 msgid ""
-"You might want to display items you previously sent. For example, you can "
-"read a sent e-mail."
+"Use the Date and Time options to specify how long the message should remain "
+"in the Outbox before it is sent to the recipient."
 msgstr ""
 
-#: C/evolution.xml:5877(para)
+#: C/evolution.xml:5890(para)
 msgid "Click the Sent Items folder in the Folder List."
 msgstr ""
 
-#: C/evolution.xml:5880(para)
+#: C/evolution.xml:5893(para)
 msgid ""
 "All sent items reside in this folder unless you select a different folder "
-"for sent e-mail in the account editor default settings. For more information "
-"refer <link linkend=\"b17s9qmz\">Changing Default Folder for Sent and Draft "
-"Items</link> under <link linkend=\"b13uhy6r\">Default Settings</link>."
+"for sent email in the account editor default settings. For more information, "
+"refer to <link linkend=\"b17s9qmz\">Changing Default Folder for Sent and "
+"Draft Items</link> under <link linkend=\"b13uhy6r\">Default Settings</link>."
 msgstr ""
 
-#: C/evolution.xml:5884(title)
+#: C/evolution.xml:5896(title)
 msgid "Delegating an Item"
 msgstr ""
 
-#: C/evolution.xml:5887(para)
-msgid "In the Calendar, right-click the meeting or appointment you want to delegate."
+#: C/evolution.xml:5899(para)
+msgid ""
+"In the Calendar, right-click the meeting or appointment you want to delegate."
 msgstr ""
 
-#: C/evolution.xml:5890(para)
+#: C/evolution.xml:5902(para)
 msgid ""
 "Select Delegate Meeting, then select the contacts you want to delegate the "
 "meeting/appointment for."
 msgstr ""
 
-#: C/evolution.xml:5896(para)
+#: C/evolution.xml:5908(para)
 msgid "Each contact gets a copy of the appointment or meeting."
 msgstr ""
 
-#: C/evolution.xml:5900(para)
-msgid "To track the status of the message you have sent,"
-msgstr ""
-
-#: C/evolution.xml:5903(para)
+#: C/evolution.xml:5914(para)
 msgid ""
 "In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
 "Tracking"
 msgstr ""
 
-#: C/evolution.xml:5933(para)
+#: C/evolution.xml:5940(para)
 msgid ""
 "Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you "
 "perform various actions, such as reading, accepting, and declining items on "
 "behalf of another user, within the restrictions the other user sets."
 msgstr ""
 
-#: C/evolution.xml:5935(para)
+#: C/evolution.xml:5942(para)
 msgid ""
 "You can proxy for a user in a different post office or domain, as long as "
 "that person is in the same GroupWise system. You cannot proxy for a user in "
 "a different GroupWise system."
 msgstr ""
 
-#: C/evolution.xml:5940(link) C/evolution.xml:5957(title)
+#: C/evolution.xml:5947(link) C/evolution.xml:5964(title)
 msgid "Receiving Proxy Rights"
 msgstr "Vertretungsrechte erhalten"
 
-#: C/evolution.xml:5943(link) C/evolution.xml:5962(title)
+#: C/evolution.xml:5950(link) C/evolution.xml:5969(title)
 msgid "Assigning Proxy Rights to Another User"
 msgstr "Vertretungsrechte einem anderen Benutzer zuteilen"
 
-#: C/evolution.xml:5946(link) C/evolution.xml:6033(title)
+#: C/evolution.xml:5953(link) C/evolution.xml:6040(title)
 msgid "Adding and Removing Proxy Names and Rights in Your Proxy List"
 msgstr ""
 
-#: C/evolution.xml:5949(link) C/evolution.xml:6063(title)
+#: C/evolution.xml:5956(link) C/evolution.xml:6071(title)
 msgid "Managing Someone Else's Mailbox or Calendar"
 msgstr "Das Postfach oder den Kalender einer anderen Person verwalten"
 
-#: C/evolution.xml:5952(link) C/evolution.xml:6087(title)
+#: C/evolution.xml:5959(link) C/evolution.xml:6095(title)
 msgid "Marking an Item Private"
 msgstr ""
 
-#: C/evolution.xml:5958(para)
+#: C/evolution.xml:5965(para)
 msgid ""
 "Two steps must be completed before you can act as someone's proxy. First, "
 "the person for whom you plan to act as proxy must grant you rights in the "
@@ -11858,7 +11676,7 @@ msgid ""
 "access his or her Mailbox or Calendar."
 msgstr ""
 
-#: C/evolution.xml:5963(para)
+#: C/evolution.xml:5970(para)
 msgid ""
 "Use the Proxy List in the Preferences Account Editor to give other users "
 "rights to proxy for you. You can assign each user different rights to your "
@@ -11868,60 +11686,60 @@ msgid ""
 "describes the rights you can grant to users:"
 msgstr ""
 
-#: C/evolution.xml:5971(para)
+#: C/evolution.xml:5978(para)
 msgid "This Right"
 msgstr ""
 
-#: C/evolution.xml:5974(para)
+#: C/evolution.xml:5981(para)
 msgid "Lets your proxy do this"
 msgstr ""
 
-#: C/evolution.xml:5981(para)
+#: C/evolution.xml:5988(para)
 msgid "Read"
 msgstr "Lesen"
 
-#: C/evolution.xml:5984(para)
+#: C/evolution.xml:5991(para)
 msgid ""
 "Read items you receive. Proxies cannot see your Contacts folder with this or "
 "any other proxy right."
 msgstr ""
 
-#: C/evolution.xml:5989(para)
+#: C/evolution.xml:5996(para)
 msgid "Write"
 msgstr "Schreiben"
 
-#: C/evolution.xml:5992(para)
+#: C/evolution.xml:5999(para)
 msgid ""
 "Create and send items in your name, including applying your signature if you "
 "have one defined. Assign categories to items, and change the subject of "
 "items."
 msgstr ""
 
-#: C/evolution.xml:5997(para)
+#: C/evolution.xml:6004(para)
 msgid "Subscribe to my alarms"
 msgstr ""
 
-#: C/evolution.xml:6000(para)
+#: C/evolution.xml:6007(para)
 msgid ""
 "Receive the same alarms you receive. Receiving alarms is supported only if "
 "the proxy is on the same post office you are."
 msgstr ""
 
-#: C/evolution.xml:6005(para)
+#: C/evolution.xml:6012(para)
 msgid "Subscribe to my notifications"
 msgstr ""
 
-#: C/evolution.xml:6008(para)
+#: C/evolution.xml:6015(para)
 msgid ""
 "Receive notification when you receive items. Receiving notifications is "
 "supported only if the proxy is on the same post office you are."
 msgstr ""
 
-#: C/evolution.xml:6013(para)
+#: C/evolution.xml:6020(para)
 msgid "Modify options/rules/folders"
 msgstr ""
 
-#: C/evolution.xml:6016(para)
+#: C/evolution.xml:6023(para)
 msgid ""
 "Change the options in your Mailbox. The proxy can edit any of your Options "
 "settings, including the access given to other users. If the proxy also has "
@@ -11929,92 +11747,92 @@ msgid ""
 "allows a proxy to add, delete, and modify categories."
 msgstr ""
 
-#: C/evolution.xml:6021(para)
+#: C/evolution.xml:6028(para)
 msgid "Read items marked Private"
 msgstr ""
 
-#: C/evolution.xml:6024(para)
+#: C/evolution.xml:6031(para)
 msgid ""
 "Read the items you marked Private. If you don't give a proxy Private rights, "
 "all items marked Private in your Mailbox are hidden from that proxy."
 msgstr ""
 
-#: C/evolution.xml:6039(para)
+#: C/evolution.xml:6046(para)
 msgid "Select the GroupWise account to edit, then click Edit."
 msgstr ""
 
-#: C/evolution.xml:6042(para)
+#: C/evolution.xml:6049(para)
 msgid "Click the Proxy tab, then click Add."
 msgstr ""
 
-#: C/evolution.xml:6045(para)
+#: C/evolution.xml:6052(para)
 msgid ""
 "To add a user to the list, type the name in the Name box or import the "
 "contact from Contact list."
 msgstr ""
 
-#: C/evolution.xml:6048(para)
+#: C/evolution.xml:6055(para)
 msgid "Select the rights you want to give to the user."
 msgstr ""
 
-#: C/evolution.xml:6053(para)
+#: C/evolution.xml:6060(para)
 msgid ""
 "Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll"
 "\">Step 5</link> to assign rights to each user in the Proxy List."
 msgstr ""
 
-#: C/evolution.xml:6059(para)
+#: C/evolution.xml:6067(para)
 msgid ""
 "To delete a user from the Proxy List, select the user, then click Remove "
 "User."
 msgstr ""
 
-#: C/evolution.xml:6064(para)
+#: C/evolution.xml:6072(para)
 msgid ""
 "Before you can act as a proxy for someone, that person must give you proxy "
 "rights in his or her Proxy List in Preferences. The amount of access you "
 "have depends on the rights you have been given."
 msgstr ""
 
-#: C/evolution.xml:6067(para)
+#: C/evolution.xml:6075(para)
 msgid "Right-click on the GroupWise account in the folder list."
 msgstr ""
 
-#: C/evolution.xml:6070(para)
+#: C/evolution.xml:6078(para)
 msgid "Click Proxy Login."
 msgstr ""
 
-#: C/evolution.xml:6075(para)
+#: C/evolution.xml:6083(para)
 msgid ""
 "Type the user name of the person who has given you Proxy access, or select "
 "from the list."
 msgstr ""
 
-#: C/evolution.xml:6079(para)
+#: C/evolution.xml:6087(para)
 msgid "The user's data appears in the respective components."
 msgstr ""
 
-#: C/evolution.xml:6081(para)
+#: C/evolution.xml:6089(para)
 msgid ""
 "You can set different colors to each user to distinguish between each users' "
 "appointments. You can also select whether to display the appointments of a "
 "particular user or not."
 msgstr ""
 
-#: C/evolution.xml:6088(para)
+#: C/evolution.xml:6096(para)
 msgid ""
 "You can limit a proxy's access to individual items in your Mailbox or "
 "Calendar by marking items Private."
 msgstr ""
 
-#: C/evolution.xml:6089(para)
+#: C/evolution.xml:6097(para)
 msgid ""
 "When you mark an item Private, you prevent unauthorized proxies from opening "
 "it. Proxies cannot access items marked Private unless you give them those "
 "rights in your Access List."
 msgstr ""
 
-#: C/evolution.xml:6090(para)
+#: C/evolution.xml:6098(para)
 msgid ""
 "If you mark an item Private when you send it, neither your proxies nor the "
 "recipient's proxies can open the item without rights. If you mark an item "
@@ -12024,167 +11842,153 @@ msgid ""
 "accepted the appointment."
 msgstr ""
 
-#: C/evolution.xml:6093(para)
+#: C/evolution.xml:6101(para)
 msgid "In an open item, click Actions, then click Mark Private."
 msgstr ""
 
-#: C/evolution.xml:6095(para)
+#: C/evolution.xml:6103(para)
 msgid ""
 "In your Calendar, click an item in the Appointments, Reminder Notes, or "
 "Tasks List, click Actions, then click Mark Private."
 msgstr ""
 
-#: C/evolution.xml:6103(para)
+#: C/evolution.xml:6111(para)
 msgid ""
-"Junk mail handling for GroupWise accounts is a little different then other "
+"Junk mail handling for GroupWise accounts is a little different than other "
 "junk mail handling. When you mark an item as junk mail in GroupWise, the "
 "item is added to your junk list in the GroupWise system. Because these "
 "settings are on the GroupWise system, your junk list follows you from "
 "computer to computer."
 msgstr ""
 
-#: C/evolution.xml:6106(link) C/evolution.xml:6123(title)
+#: C/evolution.xml:6114(link) C/evolution.xml:6131(title)
 msgid "Marking a Message As Junk Mail"
 msgstr "Eine Nachricht als Unerwünscht markieren"
 
-#: C/evolution.xml:6109(link) C/evolution.xml:6133(title)
+#: C/evolution.xml:6117(link) C/evolution.xml:6141(title)
 msgid "Marking a Message As Not Junk Mail"
 msgstr "Eine Nachricht als Erwünscht markieren"
 
-#: C/evolution.xml:6112(link) C/evolution.xml:6147(title)
+#: C/evolution.xml:6120(link) C/evolution.xml:6155(title)
 msgid "Enabling or Disabling Your Junk Mail List"
 msgstr ""
 
-#: C/evolution.xml:6115(link) C/evolution.xml:6162(title)
-msgid "Adding an E-Mail Address to Your Junk List"
+#: C/evolution.xml:6123(link) C/evolution.xml:6170(title)
+#, fuzzy
+msgid "Adding an Email Address to Your Junk List"
 msgstr "Eine E-Mail zu Ihrer Unerwünscht-Liste hinzufügen"
 
-#: C/evolution.xml:6118(link) C/evolution.xml:6177(title)
-msgid "Removing an E-Mail Address from Your Junk List"
+#: C/evolution.xml:6126(link) C/evolution.xml:6185(title)
+msgid "Removing an Email Address from Your Junk List"
 msgstr "Eine E-Mail von Ihrer Unerwünscht-Liste entfernen"
 
-#: C/evolution.xml:6126(para)
-msgid "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
-msgstr "Wählen Sie die als Unerwünscht zu markierende E-Mail und klicken Sie dann auf den Unerwünscht-Knopf in der Werkzeugleiste oder drücken Sie Steuerung+J."
+#: C/evolution.xml:6134(para)
+msgid ""
+"Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
+msgstr ""
+"Wählen Sie die als Unerwünscht zu markierende E-Mail und klicken Sie dann "
+"auf den Unerwünscht-Knopf in der Werkzeugleiste oder drücken Sie Steuerung+J."
 
-#: C/evolution.xml:6127(para)
+#: C/evolution.xml:6135(para)
 msgid ""
 "The message is moved to your Junk Mail folder and the user is added to your "
 "junk list."
-msgstr "Die Nachricht wird nun in den Unerwünscht-Ordner verschoben und der Absender wird zu Ihrer Unerwünscht-Liste hinzugefügt."
+msgstr ""
+"Die Nachricht wird nun in den Unerwünscht-Ordner verschoben und der Absender "
+"wird zu Ihrer Unerwünscht-Liste hinzugefügt."
 
-#: C/evolution.xml:6136(para)
+#: C/evolution.xml:6144(para)
 msgid "Select the message to mark as not junk in your Junk Mail folder."
-msgstr "Wählen Sie die als Erwünscht zu markierende E-Mail in Ihrem Unerwünscht-Ordner."
+msgstr ""
+"Wählen Sie die als Erwünscht zu markierende E-Mail in Ihrem Unerwünscht-"
+"Ordner."
 
-#: C/evolution.xml:6139(para)
+#: C/evolution.xml:6147(para)
 msgid "Right-click the message, then click Mark as Not Junk."
-msgstr "Klicken Sie mit der rechten Maustaste auf die Nachricht und klicken Sie dann auf »Als nicht unerwünscht markieren«."
+msgstr ""
+"Klicken Sie mit der rechten Maustaste auf die Nachricht und klicken Sie dann "
+"auf »Als nicht unerwünscht markieren«."
 
-#: C/evolution.xml:6140(para)
+#: C/evolution.xml:6148(para)
 msgid "Or select the message and press Shift+Ctrl+J"
 msgstr "Oder wählen Sie die E-Mail und drücken Sie Umschalttaste+Steuerung+J."
 
-#: C/evolution.xml:6141(para)
+#: C/evolution.xml:6149(para)
 msgid ""
 "The message is moved to your Mailbox folder and the name is removed from "
 "your junk list."
-msgstr "Die Nachricht wird nun in Ihren EMail-Ordner verschoben und der Absender wird von Ihrer Unerwünscht-Liste entfernt."
+msgstr ""
+"Die Nachricht wird nun in Ihren EMail-Ordner verschoben und der Absender "
+"wird von Ihrer Unerwünscht-Liste entfernt."
 
-#: C/evolution.xml:6150(para) C/evolution.xml:6165(para)
-#: C/evolution.xml:6180(para)
+#: C/evolution.xml:6158(para) C/evolution.xml:6173(para)
+#: C/evolution.xml:6188(para)
 msgid "Right-click a message, then click Junk Mail Settings."
-msgstr "Klicken Sie mit der rechten Maustaste auf eine Nachricht und wählen Sie »Einstellungen zu unerwünschten Nachrichten«."
+msgstr ""
+"Klicken Sie mit der rechten Maustaste auf eine Nachricht und wählen Sie "
+"»Einstellungen zu unerwünschten Nachrichten«."
 
-#: C/evolution.xml:6153(para)
+#: C/evolution.xml:6161(para)
 msgid "Select if you want to enable or disable junk mail handling."
 msgstr ""
 
-#: C/evolution.xml:6168(para)
-msgid "Type the e-mail address to block in the Email field."
-msgstr ""
+#: C/evolution.xml:6176(para)
+msgid "Type the email address to block in the Email field."
+msgstr "Geben Sie Ihre E-Mail-Adresse in das Feld »E-Mail-Adresse« ein."
 
-#: C/evolution.xml:6171(para)
+#: C/evolution.xml:6179(para)
 msgid "Click Add, then click OK."
 msgstr "Klicken Sie auf Hinzufügen, danach auf OK."
 
-#: C/evolution.xml:6183(para)
-msgid "Select the e-mail address to remove, then click Remove."
+#: C/evolution.xml:6191(para)
+msgid "Select the email address to remove, then click Remove."
 msgstr ""
 "Wählen Sie die zu entfernende E-Mail-Adresse aus und klicken Sie auf "
 "Entfernen."
 
-#: C/evolution.xml:6195(para)
-msgid ""
-"Evolution™ supports mail connectivity to Hula® servers through IMAP and "
-"calendaring support through CalDAV."
-msgstr ""
-"Evolution&trade; unterstützt den E-Mail-Zugriff auf Hula&reg;-Server per "
-"IMAP und den Kalender-Zugriff per CalDAV."
-
-#: C/evolution.xml:6196(para)
-msgid ""
-"To add your Hula account to Evolution, you must create a new Hula account by "
-"performing the following steps:"
-msgstr ""
-"Um ein Hula-Konto zu Evolution hinzuzufügen, müssen Sie ein Hula-Konto "
-"einrichten, indem Sie die folgende Schritte durchführen:"
-
-#: C/evolution.xml:6199(para)
-msgid "Click Edit, click Preferences, then click Mail Accounts."
-msgstr "Klicken Sie auf Bearbeiten, dann Einstellungen, dann auf E-Mail-Konten."
-
-#: C/evolution.xml:6202(para)
-msgid "In the Preferences window, click Add."
-msgstr "Klicken Sie im Einstellungen-Fenster auf Hinzufügen."
-
-#: C/evolution.xml:6205(para)
-msgid ""
-"Follow the procedure explained in <link linkend=\"usage-mainwindow-starting"
-"\">Starting Evolution for the First Time</link>."
-msgstr ""
-"Folgen Sie der Beschreibung unter <link linkend=\"usage-mainwindow-starting"
-"\">Evolution zum ersten Mal starten</link>."
-
-#: C/evolution.xml:6212(para)
+#: C/evolution.xml:6203(para)
 msgid ""
 "Perhaps your mail server has changed names. Or you have grown tired of a "
 "certain layout for your appointments. Whatever the reason, you can change "
-"your Evolution™ settings."
+"your <trademark>Evolution</trademark> settings."
 msgstr ""
 "Der Name Ihres E-Mail-Servers hat sich geändert, oder Sie sind gelangweilt "
 "vom Aussehen Ihrer Termine? Sie können viele Evolution-Einstellungen "
 "verändern."
 
-#: C/evolution.xml:6215(link) C/evolution.xml:6266(title)
+#: C/evolution.xml:6206(link) C/evolution.xml:6260(title)
 msgid "Working with Mail Accounts"
 msgstr "Arbeiten mit E-Mail-Konten"
 
-#: C/evolution.xml:6218(link) C/evolution.xml:6309(title)
+#: C/evolution.xml:6209(link) C/evolution.xml:6303(title)
 msgid "Autocompletion"
 msgstr "Auto-Vervollständigung"
 
-#: C/evolution.xml:6221(link) C/evolution.xml:6371(title)
+#: C/evolution.xml:6212(link) C/evolution.xml:6365(title)
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: C/evolution.xml:6224(link) C/evolution.xml:6511(title)
+#: C/evolution.xml:6215(link) C/evolution.xml:6534(title)
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: C/evolution.xml:6227(link) C/evolution.xml:6569(title)
+#: C/evolution.xml:6218(link) C/evolution.xml:6593(title)
 msgid "Calendar and Tasks Settings"
 msgstr "Kalender- und Aufgaben-Einstellungen"
 
-#: C/evolution.xml:6230(link)
+#: C/evolution.xml:6221(link) C/evolution.xml:6712(title)
 msgid "Contact Management"
 msgstr "Verwaltung von Kontakten"
 
-#: C/evolution.xml:6233(link) C/evolution.xml:6671(title)
+#: C/evolution.xml:6224(link) C/evolution.xml:6695(title)
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: C/evolution.xml:6236(para)
+#: C/evolution.xml:6227(link) C/evolution.xml:6845(title)
+msgid "Debug Logs"
+msgstr ""
+
+#: C/evolution.xml:6230(para)
 msgid ""
 "You reach the Evolution settings window by clicking Edit &gt; Preferences. "
 "In the left part of the settings window is a column, similar to the "
@@ -12198,18 +12002,18 @@ msgstr ""
 "einzelnen Evolution-Bereichen auswählen können. Rechts treffen Sie die "
 "jeweiligen Veränderungen."
 
-#: C/evolution.xml:6238(para)
+#: C/evolution.xml:6232(para)
 msgid "There are six items you can customize."
 msgstr "Es gibt sechs Bereiche, in denen Sie Einstellungen vornehmen können."
 
-#: C/evolution.xml:6240(title)
+#: C/evolution.xml:6234(title)
 msgid "Mail Accounts:"
 msgstr "E-Mail-Konten:"
 
-#: C/evolution.xml:6241(para)
+#: C/evolution.xml:6235(para)
 msgid ""
-"Add or change information about your e-mail accounts, such as the servers "
-"you connect to, the way you download mail, and your password authentication "
+"Add or change information about your email accounts, such as the servers you "
+"connect to, the way you download mail, and your password authentication "
 "mode. This is the most complex item in the list, and is covered in <link "
 "linkend=\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
 msgstr ""
@@ -12219,13 +12023,13 @@ msgstr ""
 "Einstellungen, und wird im Kapitel <link linkend=\"config-prefs-mail-identity"
 "\">Arbeiten mit E-Mail-Konten</link> behandelt."
 
-#: C/evolution.xml:6244(title)
+#: C/evolution.xml:6238(title)
 msgid "Autocompletion:"
 msgstr "Auto-Vervollständigung:"
 
-#: C/evolution.xml:6245(para)
+#: C/evolution.xml:6239(para)
 msgid ""
-"Set the contact groups to be used when completing e-mail addresses in the "
+"Set the address books to be used when completing email addresses in the "
 "message composer. For more information, see <link linkend=\"bshoq5l"
 "\">Autocompletion</link>."
 msgstr ""
@@ -12233,11 +12037,11 @@ msgstr ""
 "Mail-Editor genutzt werden sollen. Für weitere Informationen siehe <link "
 "linkend=\"bshoq5l\">Auto-Vervollständigung</link>."
 
-#: C/evolution.xml:6248(title)
+#: C/evolution.xml:6242(title)
 msgid "Mail Preferences:"
 msgstr "E-Mail-Einstellungen:"
 
-#: C/evolution.xml:6249(para)
+#: C/evolution.xml:6243(para)
 msgid ""
 "These are overall mail reading preferences, such as display settings, "
 "notification options, and security. Settings that vary per account are in "
@@ -12253,29 +12057,29 @@ msgstr ""
 "befinden sich unter <link linkend=\"config-prefs-mail\">E-Mail-"
 "Einstellungen</link>"
 
-#: C/evolution.xml:6252(title)
+#: C/evolution.xml:6246(title)
 msgid "Composer Preferences:"
 msgstr "Editoreinstellungen:"
 
-#: C/evolution.xml:6253(para)
+#: C/evolution.xml:6247(para)
 msgid ""
 "These are settings for the way that you use the mail composer, such as "
-"shortcuts, signatures, and spelling. This includes the ability to substitute "
-"graphical emoticons for “emoticons” such as : ) that many people use in e-"
-"mail. This tool is covered in <link linkend=\"config-prefs-mail-composer"
+"signatures, and spelling. This includes the ability to substitute graphical "
+"emoticons for <quote>emoticons</quote> such as : ) that many people use in "
+"email. This tool is covered in <link linkend=\"config-prefs-mail-composer"
 "\">Composer Preferences</link>."
 msgstr ""
 "Dies sind die Einstellungen für den E-Mail-Editor, wie zum Beispiel "
 "Signaturen oder Rechtschreibung. Dies beinhaltet auch die Möglichkeit, in "
-"Textform vorliegende &ldquo;Emoticons&rdquo; graphisch darstellen zu lassen. "
+"Textform vorliegende <quote>Emoticons</quote>; graphisch darstellen zu lassen. "
 "Dieser Bereich wird unter <link linkend=\"config-prefs-mail-composer"
 "\">Editoreinstellungen</link> behandelt."
 
-#: C/evolution.xml:6256(title)
+#: C/evolution.xml:6250(title)
 msgid "Calendar and Tasks:"
 msgstr "Kalender und Aufgaben:"
 
-#: C/evolution.xml:6257(para)
+#: C/evolution.xml:6251(para)
 msgid ""
 "Use these settings to control how the calendar behaves, including your time "
 "zone and the length of your work week. For more information, see <link "
@@ -12286,11 +12090,11 @@ msgstr ""
 "<link linkend=\"config-prefs-cal\">Kalender- und Aufgaben-Einstellungen</"
 "link>."
 
-#: C/evolution.xml:6260(title)
+#: C/evolution.xml:6254(title)
 msgid "Certificates:"
 msgstr "Zertifikate:"
 
-#: C/evolution.xml:6261(para)
+#: C/evolution.xml:6255(para)
 msgid ""
 "Use these settings for certificate handling for S/MIME security systems. For "
 "more information, see <link linkend=\"bshoty0\">Certificates</link>."
@@ -12298,7 +12102,7 @@ msgstr ""
 "Diese Einstellungen betreffen die Handhabung von S/MIME-Zertifikaten. Für "
 "weitere Informationen siehe <link linkend=\"bshoty0\">Zertifikate</link>."
 
-#: C/evolution.xml:6263(para)
+#: C/evolution.xml:6257(para)
 msgid ""
 "Previous versions of Evolution included directory servers, folder settings, "
 "and Exchange delegation in the settings tool. Directory servers can now be "
@@ -12313,10 +12117,10 @@ msgstr ""
 "rechten Maustaste auf einen Ordner zugegriffen werden, und Exchange-"
 "Delegation ist nun im »Nachricht«-Menü im Kalender-Fenster verfügbar."
 
-#: C/evolution.xml:6267(para)
+#: C/evolution.xml:6261(para)
 msgid ""
 "Evolution allows you to maintain multiple accounts, or identities. When you "
-"are writing an e-mail message, you can choose which account to use by "
+"are writing an email message, you can choose which account to use by "
 "selecting from the drop-down list next to the From field in the message "
 "composer."
 msgstr ""
@@ -12325,17 +12129,18 @@ msgstr ""
 "neben dem »Von:«-Feld im E-Mail-Editor auswählen, welches Konto Sie benutzen "
 "möchten."
 
-#: C/evolution.xml:6268(para)
+#: C/evolution.xml:6262(para)
 msgid ""
-"Click Send/Receive to select all mail sources that are not disabled. If you "
-"don't want to check mail for a given account, select the account in the Mail "
-"Accounts tab and click the Disable button.."
+"Click Send/Receive to update all mail sources that are not disabled. If you "
+"don't want to check mail for a given account, select the account in Edit "
+"&gt; Preferences &gt; Mail Accounts page and click the Disable button."
 msgstr ""
 "Klicken Sie auf Verschicken/Abrufen um alle E-Mail-Quellen auszuwählen, die "
 "nicht deaktiviert sind. Falls Sie keine E-Mails für ein bestimmtes Konto "
-"abrufen möchten, so deaktivieren Sie das Konto in den E-Mail-Konten."
+"abrufen möchten, so deaktivieren Sie das Konto unter Bearbeiten &gt; "
+"Einstellungen &gt; E-Mail-Konten."
 
-#: C/evolution.xml:6269(para)
+#: C/evolution.xml:6263(para)
 msgid ""
 "To add a new account, click Add to open the Evolution configuration "
 "assistant. To alter an existing account, select it in the Preferences "
@@ -12346,46 +12151,47 @@ msgstr ""
 "Hinzufügen klicken. Wenn Sie ein bestehendes Konto ändern möchten, so "
 "klicken Sie auf Bearbeiten."
 
-#: C/evolution.xml:6270(para)
+#: C/evolution.xml:6264(para)
 msgid "The account editor dialog box has seven sections:"
 msgstr "Das Konto-Editor-Fenster hat sieben Reiter:"
 
-#: C/evolution.xml:6272(title)
+#: C/evolution.xml:6266(title)
 msgid "Identity:"
 msgstr "Identität:"
 
-#: C/evolution.xml:6273(para)
+#: C/evolution.xml:6267(para)
 msgid ""
-"Specify the name and e-mail address for this account. You can also choose a "
+"Specify the name and email address for this account. You can also choose a "
 "default signature to insert into messages sent from this account."
 msgstr ""
 "Bestimmt den Namen und die E-Mail-Adresse für dieses Konto. Sie können hier "
 "auch die Vorgabe-Signatur auswählen, die am Ende der gesendeten Nachrichten "
 "dieses Kontos eingefügt wird."
 
-#: C/evolution.xml:6276(title)
+#: C/evolution.xml:6270(title)
 msgid "Receiving Email:"
 msgstr "Abrufen von E-Mails:"
 
-#: C/evolution.xml:6277(para)
+#: C/evolution.xml:6271(para)
 msgid ""
-"Select the way you receive e-mail. You can download e-mail from a "
-"server<link linkend=\"pop\"/> POP <link linkend=\"pop\">POP</link>, read and "
-"keep it on the server (Microsoft Exchange, Novell® GroupWise®, or IMAP<link "
-"linkend=\"imap\">IMAP</link>), or read it from files that already exist on "
-"your desktop computer. Your server requires you to use a Secure Socket Layer "
-"(SSL) connection. You can select from the given three options: No "
-"encryption, TLS encryption or SSL encryption."
+"Select the way you receive email. You can download email from a <link "
+"linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
+"Exchange, <trademark class=\"registered\">Novell</trademark><trademark class="
+"\"registered\">GroupWise</trademark>, or IMAP<link linkend=\"imap\">IMAP</"
+"link>), or read it from files that already exist on your desktop computer. "
+"If your server requires you to use a secure connection, you can select from "
+"the given three options: No encryption, TLS encryption or SSL encryption."
 msgstr ""
 "Wählen Sie die Art aus, wie Sie E-Mail erhalten wollen. Sie können E-Mails "
 "von einem <link linkend=\"pop\"/>POP</link>-Server herunterladen, Sie auf "
-"dem Server behalten und dort lesen (Microsoft Exchange, Novell&reg; "
-"GroupWise&reg;, oder <link linkend=\"imap\">IMAP</link>), oder aus Dateien "
+"dem Server behalten und dort lesen (Microsoft Exchange, <trademark class="
+"\"registered\">Novell</trademark> <trademark class=\"registered\">GroupWise</"
+"trademark>, oder <link linkend=\"imap\">IMAP</link>), oder aus Dateien "
 "lesen, die bereits auf Ihrem Computer existieren. Falls Ihr Server eine "
 "sichere Verbindung voraussetzt, so können Sie aus den Optionen »Keine "
 "Verschlüsselung«, »TLS-Verschlüsselung« und »SSL-Verschlüsselung« wählen."
 
-#: C/evolution.xml:6279(para)
+#: C/evolution.xml:6273(para)
 msgid ""
 "Your system administrator might ask you to connect to a specific port on a "
 "mail server. To specify which port you use, just type a colon and the port "
@@ -12398,7 +12204,7 @@ msgstr ""
 "example.com nutzen möchten, geben Sie als Servername »smtp.example.com:143« "
 "ein."
 
-#: C/evolution.xml:6280(para)
+#: C/evolution.xml:6274(para)
 msgid ""
 "For additional information, see <link linkend=\"second-step\">Receiving "
 "Mail</link>."
@@ -12406,11 +12212,11 @@ msgstr ""
 "Für weitere Informationen siehe <link linkend=\"second-step\">Abrufen von E-"
 "Mails</link>."
 
-#: C/evolution.xml:6282(title)
+#: C/evolution.xml:6276(title)
 msgid "Receiving Options:"
 msgstr "Empfangsoptionen:"
 
-#: C/evolution.xml:6283(para)
+#: C/evolution.xml:6277(para)
 msgid ""
 "Decide if you want to check for mail automatically and how often, as well as "
 "setting other message retrieval options."
@@ -12418,7 +12224,7 @@ msgstr ""
 "Wählen Sie ob und wie oft automatisch nach neuen E-Mails gesehen werden soll "
 "und weitere Einstellungen zum Abruf von E-Mails."
 
-#: C/evolution.xml:6285(para)
+#: C/evolution.xml:6279(para)
 msgid ""
 "For additional information, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -12426,16 +12232,16 @@ msgstr ""
 "Für weitere Informationen siehe <link linkend=\"more-mail-options\">E-Mail-"
 "Empfangsoptionen</link>."
 
-#: C/evolution.xml:6287(title)
+#: C/evolution.xml:6281(title)
 msgid "Sending Mail:"
 msgstr "Verschicken von E-Mails:"
 
-#: C/evolution.xml:6288(para)
+#: C/evolution.xml:6282(para)
 msgid ""
 "Use this section to choose and configure a method for sending mail. You can "
 "choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have "
-"installed the Evolution Connector for Microsoft Exchange), or <link linkend="
-"\"sendmail\">Sendmail</link>."
+"installed the Evolution Connector for Microsoft Exchange), <link linkend="
+"\"sendmail\">Sendmail</link> or many other options."
 msgstr ""
 "Wählen Sie diesen Reiter um die gewünschte Methode für das Versenden von E-"
 "Mails auszuwählen und zu konfigurieren. Sie können aus <link linkend=\"smtp"
@@ -12443,7 +12249,7 @@ msgstr ""
 "Microsoft Exchange installiert haben), oder <link linkend=\"sendmail"
 "\">Sendmail</link> wählen."
 
-#: C/evolution.xml:6290(para)
+#: C/evolution.xml:6284(para)
 msgid ""
 "For additional information, see <link linkend=\"third-step\">Sending Mail</"
 "link>."
@@ -12451,22 +12257,22 @@ msgstr ""
 "Für weitere Informationen siehe <link linkend=\"third-step\">E-Mails "
 "verschicken</link>."
 
-#: C/evolution.xml:6292(title)
+#: C/evolution.xml:6286(title)
 msgid "Defaults:"
 msgstr "Vorgaben:"
 
-#: C/evolution.xml:6293(para)
+#: C/evolution.xml:6287(para)
 msgid ""
 "Use this section to set where this account stores the messages that it has "
 "sent, and the messages that you save as drafts. If you want to revert to the "
-"default settings, click Restore Defaults."
+"default settings, click Restore."
 msgstr ""
 "Wählen Sie diesen Reiter um zu bestimmen, wo für dieses Konto die gesendeten "
 "Nachrichten gespeichert werden sollen, und wo Entwürfe gespeichert werden "
 "sollen. Falls Sie zu den Vorgabe-Einstellungen zurückkehren möchten, so "
 "klicken Sie auf »Zurücksetzen«."
 
-#: C/evolution.xml:6295(para)
+#: C/evolution.xml:6289(para)
 msgid ""
 "If you want to send someone a copy of every message from this account, "
 "select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) "
@@ -12476,18 +12282,17 @@ msgstr ""
 "so wählen Sie entweder »Immer Kopie schicken an« oder »Immer Blindkopie "
 "schicken an«, und geben Sie eine oder mehrere E-Mail-Adressen ein."
 
-#: C/evolution.xml:6296(para)
+#: C/evolution.xml:6290(para)
 msgid ""
 "You can specify the way you want to receive message receipts. You can set "
 "Send message receipts to Never, Always or Ask for each message. For more "
 "information refer <link linkend=\"b13uhy6r\">Default Settings</link>."
 msgstr ""
 "Geben Sie an ob und wie Sie Lesebestätigungen verschicken möchten. Mögliche "
-"Optionen sind »Nie«, »Immer« oder »Bei jeder Nachricht nachfragen«. Für "
-"weitere Informationen siehe <link linkend=\"b13uhy6r\">Vorgabe-"
-"Einstellungen</link>."
+"Optionen sind »Nie«, »Immer« oder »Bei jeder Nachricht nachfragen«. Für weitere "
+"Informationen siehe <link linkend=\"b13uhy6r\">Vorgabe-Einstellungen</link>."
 
-#: C/evolution.xml:6297(para)
+#: C/evolution.xml:6291(para)
 msgid ""
 "You can change the default settings of your sent items. Click Advanced Send "
 "Options to prioritize, classify your send messages. You can also set the "
@@ -12496,11 +12301,11 @@ msgid ""
 "Notification for Mail, Calendar and Task."
 msgstr ""
 
-#: C/evolution.xml:6299(title)
+#: C/evolution.xml:6293(title)
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: C/evolution.xml:6300(para)
+#: C/evolution.xml:6294(para)
 msgid ""
 "Use this section to set the security options for this account. If you use "
 "encryption, enter your PGP key ID (see <link linkend=\"encryption"
@@ -12513,11 +12318,11 @@ msgstr ""
 "Informationen) und wählen Sie aus den vier Optionen zur Schlüssel- und "
 "Signaturhandhabung aus."
 
-#: C/evolution.xml:6303(title)
+#: C/evolution.xml:6297(title)
 msgid "Proxy:"
 msgstr "Vertretung:"
 
-#: C/evolution.xml:6304(para)
+#: C/evolution.xml:6298(para)
 msgid ""
 "This only displays if you have a GroupWise account. Use this section to set "
 "proxy access for other users to access your mailbox or calendar."
@@ -12526,12 +12331,13 @@ msgstr ""
 "können hier den Zugriff anderer Benutzer auf Ihr Postfach und Ihren Kalender "
 "einstellen."
 
-#: C/evolution.xml:6310(para)
+#: C/evolution.xml:6304(para)
 msgid ""
 "The Autocompletion tool lets you choose address books to auto-complete names "
-"for you. This functionality requires accessibility to each of the address "
-"books you want to use. To enable autocompletion, select each of the address "
-"books that you want to use auto completion in the Autocompletion page."
+"for you in the mail composer. This functionality requires accessibility to "
+"each of the address books you want to use. To enable autocompletion, select "
+"each of the address books that you want to use auto completion in the "
+"Autocompletion page."
 msgstr ""
 "Die Funktion Auto-Vervollständigung ermöglicht Ihnen Adressbücher "
 "auszuwählen, deren Namen automatisch vervollständigt werden, wenn Sie einen "
@@ -12540,36 +12346,38 @@ msgstr ""
 "möchten. Um die Auto-Vervollständigung zu aktivieren, wählen Sie die "
 "Adressbücher aus die hierfür genutzt werden sollen."
 
-#: C/evolution.xml:6314(title)
+#: C/evolution.xml:6308(title)
 msgid "IMAP Mail Headers"
 msgstr "IMAP-Kopfzeilen"
 
-#: C/evolution.xml:6315(para)
+#: C/evolution.xml:6309(para)
 msgid ""
-"Evolution allow you to choose the headers that you want to download so that "
-"you can reduce the download time and at the same time having control as to "
-"filter or move your mails around the way you like it. Evolution help you "
-"customize your IMAP Mail header preferences and thus save the download time. "
-"The IMAP Mail headers are as follows:"
-msgstr "Evolution ermöglicht es Ihnen zu wählen, welche Kopfzeilen heruntergeladen werden sollen. Dadurch kann die Downloadzeit verringert werden. Die Möglichkeiten hierbei sind:"
+"Evolution allows you to choose the headers that you want to download so that "
+"you can reduce the download time and filter or move your mail around the way "
+"you like it. Evolution help you customize your IMAP Mail header preferences "
+"and thus save the download time. The IMAP Mail header options are as follows:"
+msgstr ""
+"Evolution ermöglicht es Ihnen zu wählen, welche Kopfzeilen heruntergeladen "
+"werden sollen. Dadurch kann die Downloadzeit verringert werden. Die "
+"Möglichkeiten hierbei sind:"
 
-#: C/evolution.xml:6317(title)
+#: C/evolution.xml:6311(title)
 msgid "All Headers:"
 msgstr "Alle Kopfzeilen:"
 
-#: C/evolution.xml:6318(para)
+#: C/evolution.xml:6312(para)
 msgid ""
-"This include all the available IMAP Mail headers. By choosing this option, "
-"Evolution will download all the Headers for all the messages."
+"This includes all the available IMAP Mail headers. By choosing this option, "
+"Evolution will download all the headers for all the messages."
 msgstr ""
 "Dies umfasst alle verfügbaren IMAP-Kopfzeilen. Wenn diese Option ausgewählt "
 "ist werden alle verfügbaren Kopfzeilen für alle Nachrichten heruntergeladen."
 
-#: C/evolution.xml:6321(title)
+#: C/evolution.xml:6315(title)
 msgid "Basic Headers:"
 msgstr "Grundlegende Kopfzeilen:"
 
-#: C/evolution.xml:6322(para)
+#: C/evolution.xml:6316(para)
 msgid ""
 "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
 "Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
@@ -12582,16 +12390,16 @@ msgstr ""
 "abrufen und betrachten wollen, ohne nach Mailinglisten zu filtern, so wählen "
 "Sie diese Option, die für die meisten Benutzer empfohlen wird."
 
-#: C/evolution.xml:6325(title)
+#: C/evolution.xml:6319(title)
 msgid "Mailing List Headers:"
 msgstr "Gewöhnliche und Mailinglisten-Kopfzeilen:"
 
-#: C/evolution.xml:6326(para)
+#: C/evolution.xml:6320(para)
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
 "mailing-lists are also fetched. Mailing list headers will have the "
-"informations such as the mailing list ID, owner of the mailing list, and so "
+"informations such as the mailinglist-ID, owner of the mailing list, and so "
 "on with which you can create mailing list filters."
 msgstr ""
 "Wählen Sie diese Option, falls Sie nach Mailinglisten-Kopfzeilen (wie List-"
@@ -12600,24 +12408,24 @@ msgstr ""
 "Informationen wie die List-ID, den Besitzer der Mailingliste (Owner) usw., "
 "wodurch Sie spezielle Filter nach Mailinglisten erstellen können."
 
-#: C/evolution.xml:6328(para)
+#: C/evolution.xml:6322(para)
 msgid ""
-"This is the default Header preferences that comes with Evolution. When this "
+"This is the default Header preference that comes with Evolution. When this "
 "option is chosen, Evolution will download a basic set of headers (as "
 "described above) along with a set of headers that are needed for client-side "
 "filters based on mailing lists. If you do not have any filters on Evolution, "
-"it is recommended to switch to the \"Basic Headers Only\"option."
+"it is recommended to switch to the \"Basic Headers Only\" option."
 msgstr ""
 "Dies ist die Vorgabeeinstellung. Wenn dies gewählt wird, lädt Evolution die "
 "grundlegenden Kopfzeilen sowie eine Anzahl an Kopfzeilen, die für das "
 "Filtern von Mailinglisten benötigt werden herunter. Falls Sie keine Filter "
 "in Evolution benutzen, so empfehlen wir die Option »Grundlegende Kopfzeilen«."
 
-#: C/evolution.xml:6330(title)
+#: C/evolution.xml:6324(title)
 msgid "Custom Headers:"
 msgstr "Benutzerdefinierte Kopfzeilen:"
 
-#: C/evolution.xml:6331(para)
+#: C/evolution.xml:6325(para)
 msgid ""
 "These are the extra headers in addition to the above standard headers. You "
 "can add custom headers in addition to the standard headers. If you want to "
@@ -12631,37 +12439,33 @@ msgstr ""
 "möchten und nicht alle Kopfzeilen herunterladen möchten, entfernen oder "
 "fügen Sie hier die von Ihnen gewünschten einzelnen Kopfzeilen hinzu."
 
-#: C/evolution.xml:6334(para)
+#: C/evolution.xml:6328(para)
 msgid "This option may not be needed if you have chosen to download ALL Headers."
 msgstr ""
 "Diese Option wird gegebenenfalls nicht benötigt, falls Sie ausgewählt haben, "
 "dass alle Kopfzeilen heruntergeladen werden."
 
-#: C/evolution.xml:6336(para)
+#: C/evolution.xml:6330(para)
 msgid "To set the IMAP Mail headers:"
 msgstr "Um die IMAP-Kopfzeilen auszuwählen:"
 
-#: C/evolution.xml:6339(para)
-msgid "Select Edit &gt; Preferences."
-msgstr "Klicken Sie auf Bearbeiten, dann Einstellungen,"
-
-#: C/evolution.xml:6342(para)
+#: C/evolution.xml:6336(para)
 msgid "Select the IMAP account and click Edit to open the Account Editor."
 msgstr "Wählen Sie das IMAP-Konto aus und klicken Sie auf Bearbeiten."
 
-#: C/evolution.xml:6345(para)
+#: C/evolution.xml:6339(para)
 msgid ""
 "On the Account Editor, click IMAP Headers tab to open IMAP Headers to the "
 "Account Editor."
 msgstr "Klicken Sie auf den Reiter »IMAP-Kopfzeilen«."
 
-#: C/evolution.xml:6350(para)
+#: C/evolution.xml:6344(para)
 msgid "Click Fetch All Headers to download all the available header information."
 msgstr ""
 "Wählen Sie »Alle Kopfzeilen laden«, um alle verfügbaren Kopfzeilen-"
 "Informationen herunterzuladen. "
 
-#: C/evolution.xml:6352(para)
+#: C/evolution.xml:6346(para)
 msgid ""
 "The more headers you have, the more time it will consume to download. This "
 "option is not recommended."
@@ -12669,27 +12473,28 @@ msgstr ""
 "Je mehr Kopfzeilen Sie holen, desto mehr Zeit wird für das Herunterladen "
 "benötigt. Diese Option wird daher nicht empfohlen."
 
-#: C/evolution.xml:6356(para)
+#: C/evolution.xml:6350(para)
 msgid "Click Basic Headers to download basic headers."
 msgstr ""
 "Wählen Sie »Grundlegende Kopfzeilen«, um die grundlegende Kopfzeilen "
 "herunterzuladen."
 
-#: C/evolution.xml:6359(para)
+#: C/evolution.xml:6353(para)
 msgid "Click Basic and Mailing Headers to download both."
 msgstr ""
 "Wählen Sie »Gewöhnliche und Mailinglisten-Kopfzeilen«, um beide "
 "herunterzuladen."
 
-#: C/evolution.xml:6362(para)
+#: C/evolution.xml:6356(para)
 msgid "Click Add to add any predefined custom headers."
-msgstr "Klicken Sie auf Hinzufügen, um benutzerdefinierte Kopfzeilen hinzuzufügen."
+msgstr ""
+"Klicken Sie auf Hinzufügen, um benutzerdefinierte Kopfzeilen hinzuzufügen."
 
-#: C/evolution.xml:6365(para)
+#: C/evolution.xml:6359(para)
 msgid "Click Remove to remove the custom headers."
 msgstr "Klicken Sie auf Entfernen, um benutzerdefinierte Kopfzeilen zu entfernen."
 
-#: C/evolution.xml:6372(para)
+#: C/evolution.xml:6366(para)
 msgid ""
 "The Mail Preferences tool lets you choose how to display citations, how long "
 "to wait before marking a message as read, and other mail display settings."
@@ -12698,110 +12503,111 @@ msgstr ""
 "werden soll, wielange gewartet werden soll bis eine Nachricht als gelesen "
 "markiert wird, sowie weitere verschiedene Einstellungen."
 
-#: C/evolution.xml:6375(link) C/evolution.xml:6399(title)
+#: C/evolution.xml:6369(link) C/evolution.xml:6393(title)
 msgid "General Mail Settings"
 msgstr "Allgemeine E-Mail-Einstellungen"
 
-#: C/evolution.xml:6378(link) C/evolution.xml:6421(title)
+#: C/evolution.xml:6372(link) C/evolution.xml:6415(title)
 msgid "HTML Mail Preferences"
 msgstr "HTML-E-Mail-Einstellungen"
 
-#: C/evolution.xml:6381(link) C/evolution.xml:6439(title)
-msgid "Color Preferences"
-msgstr "Farb-Einstellungen"
+#: C/evolution.xml:6375(link) C/evolution.xml:6433(title)
+#, fuzzy
+msgid "Label Preferences"
+msgstr "E-Mail-Einstellungen"
 
-#: C/evolution.xml:6384(link) C/evolution.xml:6444(title)
+#: C/evolution.xml:6378(link) C/evolution.xml:6467(title)
 msgid "Mail Header Preferences"
 msgstr "Kopfzeilen-Einstellungen"
 
-#: C/evolution.xml:6387(link) C/evolution.xml:6456(title)
+#: C/evolution.xml:6381(link) C/evolution.xml:6479(title)
 msgid "Junk Mail Preferences"
 msgstr "Unerwünscht-Einstellungen"
 
-#: C/evolution.xml:6390(link) C/evolution.xml:6499(title)
+#: C/evolution.xml:6384(link) C/evolution.xml:6522(title)
 msgid "Automatic Contacts Preferences"
 msgstr "Automatische Kontakte-Einstellungen"
 
-#: C/evolution.xml:6393(link) C/evolution.xml:6505(title)
+#: C/evolution.xml:6387(link) C/evolution.xml:6528(title)
 msgid "Calendar and Tasks Preferences"
 msgstr "Kalender und Aufgaben-Einstellungen"
 
-#: C/evolution.xml:6396(para)
+#: C/evolution.xml:6390(para)
 msgid ""
-"For information on individual e-mail account settings, see <link linkend="
+"For information on individual email account settings, see <link linkend="
 "\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
 msgstr ""
 "Für Informationen zu den individuellen E-Mail-Konto-Einstellungen siehe "
 "<link linkend=\"config-prefs-mail-identity\">Arbeiten mit E-Mail-Konten</"
 "link>."
 
-#: C/evolution.xml:6400(para)
+#: C/evolution.xml:6394(para) C/evolution.xml:6550(para)
 msgid "The General page has the following options:"
 msgstr "Unter »Allgemein« können folgende Einstellungen getroffen werden:"
 
-#: C/evolution.xml:6402(title)
+#: C/evolution.xml:6396(title)
 msgid "Message Fonts:"
 msgstr "Nachrichtenschriften:"
 
-#: C/evolution.xml:6403(para)
+#: C/evolution.xml:6397(para)
 msgid ""
 "Normally, Evolution uses the same fonts as other GNOME applications. To "
 "choose different fonts, deselect Use the same fonts as other applications "
-"and select one font for standard typefaces and a second for monospace, "
-"terminal, or display."
+"and select one font for standard typefaces and a second for monospace."
 msgstr ""
-"Normalerweise nutzt Evolution die gleichen Schrfitarten wie andere GNOME-"
+"Normalerweise nutzt Evolution die gleichen Schriftarten wie andere GNOME-"
 "Anwendungen. Um andere Schriftarten auszuwählen, wählen Sie »Dieselben "
-"Schriften wie andere Anwendungen verwenden« ab und wählen Sie eine "
-"Schriftart für die Standard-Schrift sowie eine dicktengleiche Schrift für "
-"die Anzeige von Text-E-Mails."
+"Schriften wie andere Anwendungen verwenden« ab und wählen Sie eine Schriftart "
+"für die Standard-Schrift sowie eine dicktengleiche Schrift für die Anzeige "
+"von Text-E-Mails."
 
-#: C/evolution.xml:6406(title)
+#: C/evolution.xml:6400(title)
 msgid "Message Display:"
 msgstr "Nachrichtenanzeige:"
 
-#: C/evolution.xml:6407(para)
+#: C/evolution.xml:6401(para)
 msgid ""
 "Choose how long you want to wait before marking a message read, how to "
-"highlight quotations, and the default encoding. Enable ‘Fall back to "
-"threading message by subject' to group the messages as message threads. You "
-"can also set the limit to the number of addresses displayed in the message "
-"header by enabling ‘Shrink To/CC/BCC header to' option.You can also set the "
-"limit for rendering text content in the message you recive.By default, when "
-"you receive a message with text content more than 4096 Kilo Bytes, Evolution "
-"will not render the message in the preview pane. You can view unformatted "
-"text either inline or using an external application."
+"highlight quotations, and the default encoding. Enable <guilabel>Fall back "
+"to threading message by subject</guilabel> to group the messages as message "
+"threads. You can also set the limit to the number of addresses displayed in "
+"the message header by enabling <guilabel>Shrink To/CC/BCC header to</"
+"guilabel> option.You can also set the limit for rendering text content in "
+"the message you receive. By default, when you receive a message with text "
+"content more than 4096 Kilo Bytes, Evolution will not render the message in "
+"the preview pane. You can view unformatted text either inline or using an "
+"external application. You can also enable Magic spacebar and search folders."
 msgstr ""
 "Wählen Sie wie lange es dauern soll, bis eine geöffnete Nachricht als "
 "gelesen markiert wird, wie Zitate dargestellt werden sollen, sowie die "
-"Vorgabe-Zeichenkodierung. Wählen Sie »Zurückfallen auf betreffsbezogenes "
-"Threading der Nachrichten« damit Nachrichten als Threads dargestellt werden. "
-"Sie können auch die maximale Anzahl an Adressen angeben, die in der "
-"Nachrichtenvorschau angezeigt werden soll, indem Sie »Empfängerkopfzeilen "
-"verkleinern« auswählen. Sie können hier auch eine Grenze für das Darstellen "
-"von erhaltenen E-Mails setzen: Per Vorgabe stelle Evolution keine "
-"Nachrichten in der Nachrichtenvorschau dar, die größer als 4096 Kilobytes "
-"sind, da Evolution sonst zu lange für die Darstellung benötigen würde. Die "
-"Nachricht kann stattdessen unformattiert eingebettet oder mit einer anderen "
-"Anwendungen dargestellt werden."
-
-#: C/evolution.xml:6409(para)
+"Vorgabe-Zeichenkodierung. Wählen Sie <guilabel>Zurückfallen auf "
+"betreffsbezogenes Threading der Nachrichten</guilabel> damit Nachrichten als "
+"Threads dargestellt werden. Sie können auch die maximale Anzahl an Adressen "
+"angeben, die in der Nachrichtenvorschau angezeigt werden soll, indem Sie "
+"<guilabel>Empfängerkopfzeilen verkleinern</guilabel> auswählen. Sie können "
+"hier auch eine Grenze für das Darstellen von erhaltenen E-Mails setzen: Per "
+"Vorgabe stelle Evolution keine Nachrichten in der Nachrichtenvorschau dar, "
+"die größer als 4096 Kilobytes sind, da Evolution sonst zu lange für die "
+"Darstellung benötigen würde. Die Nachricht kann stattdessen unformattiert "
+"eingebettet oder mit einer anderen Anwendungen dargestellt werden."
+
+#: C/evolution.xml:6403(para)
 msgid ""
 "To group the messages as threads select View &gt; Group By threads or press "
-"Ctrl +T."
+"Ctrl+T."
 msgstr ""
 "Klicken Sie auf Ansicht &gt; Nach Threads gruppieren um die Thread-"
 "Sortierung ein- oder auszuschalten, oder drücken Sie Steuerung+T."
 
-#: C/evolution.xml:6411(title)
+#: C/evolution.xml:6405(title)
 msgid "Deleting Mail:"
 msgstr "Löschen von E-Mails:"
 
-#: C/evolution.xml:6412(para)
+#: C/evolution.xml:6406(para)
 msgid ""
 "Choose whether to delete messages automatically when quitting Evolution and "
 "how frequently, and whether you want to explicitly confirm the final "
-"deletion of messages.Select Confirm when expunging a folder to confirm the "
+"deletion of messages. Select Confirm when expunging a folder to confirm the "
 "final deletion. You can have four different options to set the frequency for "
 "deletion: Everytime, Once per day, Once per week, and Once per month."
 msgstr ""
@@ -12811,11 +12617,11 @@ msgstr ""
 "Möglichkeiten für die Häufigkeit des Müllordner-Leerens beim Beenden: Jedes "
 "Mal, Einmal pro Tag, Einmal pro Woche, und Einmal pro Monat."
 
-#: C/evolution.xml:6415(title)
+#: C/evolution.xml:6409(title)
 msgid "New Mail Notifications:"
 msgstr "Benachrichtigung bei neuen E-Mails:"
 
-#: C/evolution.xml:6416(para)
+#: C/evolution.xml:6410(para)
 msgid ""
 "Evolution can alert you to the arrival of new mail with a beep or by playing "
 "a sound file. Choose your alert noise, or select none, as you prefer. You "
@@ -12826,25 +12632,25 @@ msgstr ""
 "können auch auswählen, nicht über die Ankunft neuer Nachrichten informiert "
 "zu werden."
 
-#: C/evolution.xml:6422(para)
+#: C/evolution.xml:6416(para)
 msgid "The HTML Mail page has the following options:"
 msgstr "Der HTML-E-Mail-Reiter besitzt folgende Optionen:"
 
-#: C/evolution.xml:6424(title)
+#: C/evolution.xml:6418(title)
 msgid "Show Image Animations:"
 msgstr "Bildanimationen anzeigen:"
 
-#: C/evolution.xml:6425(para)
-msgid "Turns animation on or off."
-msgstr "Stellt Animationen an oder aus."
+#: C/evolution.xml:6419(para)
+msgid "Turns image animation (e.g. GIF files) on or off."
+msgstr "Stellt Bildanimationen (z.B. von GIF-Dateien) an oder aus."
 
-#: C/evolution.xml:6428(title)
+#: C/evolution.xml:6422(title)
 msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:"
 msgstr ""
 "Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
 "wünschen:"
 
-#: C/evolution.xml:6429(para)
+#: C/evolution.xml:6423(para)
 msgid ""
 "Some people do not like HTML mail, and you can set Evolution to warn you of "
 "this preference. This warning appears only when you send HTML mail to people "
@@ -12855,17 +12661,17 @@ msgstr ""
 "der in Ihren Kontakten als jemand aufgeführt wird, der keine HTML-E-Mails "
 "empfangen möchte."
 
-#: C/evolution.xml:6432(title)
+#: C/evolution.xml:6426(title)
 msgid "Loading Images:"
 msgstr "Laden von Bildern:"
 
-#: C/evolution.xml:6433(para)
+#: C/evolution.xml:6427(para)
 msgid ""
-"You can embed a image in an e-mail and have it load only when the message "
-"arrives. However, spammers can use image loading patterns to confirm “live” "
-"addresses and invade your privacy. You can elect to never load images "
-"automatically, to load images only if the sender is in your contacts, or "
-"always load images."
+"You can embed a image in an email and have it load only when the message "
+"arrives. However, spammers can use image loading patterns to confirm "
+"<quote>valid</quote> addresses and invade your privacy. You can elect to "
+"never load images automatically, to load images only if the sender is in "
+"your contacts, or always load images."
 msgstr ""
 "Ein Bild kann in eine E-Mail eingebettet werden und automatisch aus dem "
 "Internet geladen werden, wenn die nachricht geöffnet wird. Spam-Versender "
@@ -12875,28 +12681,73 @@ msgstr ""
 "falls sich der Absender in Ihren Kontakten befinden, oder Bilder immer "
 "geladen werden."
 
-#: C/evolution.xml:6435(para)
+#: C/evolution.xml:6429(para)
 msgid ""
 "If you have chosen not to load images automatically, you can choose to see "
 "the images in one message at a time by selecting View &gt; Load Images or "
-"press Ctrl +I."
+"press Ctrl+I."
 msgstr ""
 "Falls Sie ausgewählt haben, dass Bilder nie automatisch aus dem Internet "
 "geladen werden, können Sie diese Bilder nachträglich laden, indem Sie in der "
 "Menüleiste Ansicht &gt; Bilder laden auswählen oder Steuerung+I drücken."
 
-#: C/evolution.xml:6440(para)
+#: C/evolution.xml:6434(para)
+#, fuzzy
 msgid ""
-"The Mail Color preferences tool lets you select color labels for different "
-"kinds of messages. Click a color to change the color, or change the label "
-"associated with that color. Click revert to go back to previous settings."
+"The Label preferences option lets you add color labels for different kinds "
+"of messages. You can add, edit, or remove the labels. You can also assign "
+"colors to each label you create. You cannot remove the default labels."
 msgstr ""
 "Unter »Farben« können Sie verschiedene farbige Beschriftungen für "
 "verschiedene Nachrichten auswählen. Klicken Sie auf eine Farbe, um die Farbe "
 "zu ändern, oder ändern Sie die zugehörige Beschriftung. Klicken Sie auf "
 "»Zurücksetzen«, um zu den vorherigen Einstellungen zurückzukehren."
 
+#: C/evolution.xml:6436(para)
+#, fuzzy
+msgid "To create a label:"
+msgstr "Einen neuen Ordner erzeugen:"
+
+#: C/evolution.xml:6439(para)
+msgid "Click Add and specify the name in the Label Name dialog box."
+msgstr ""
+
+#: C/evolution.xml:6442(para)
+#, fuzzy
+msgid "Click the color tab and select a color, then click OK."
+msgstr "Wählen Sie die gewünschte Farbe und klicken Sie auf OK."
+
 #: C/evolution.xml:6445(para)
+msgid "To edit label properties:"
+msgstr ""
+
+#: C/evolution.xml:6448(para)
+#, fuzzy
+msgid "Select the label and click Edit."
+msgstr "Wählen Sie die gewünschte Farbe und klicken Sie auf OK."
+
+#: C/evolution.xml:6451(para)
+msgid "Edit name and color, then click OK."
+msgstr "Bearbeiten Sie Namen und Farbe und klicken Sie auf OK."
+
+#: C/evolution.xml:6454(para)
+msgid "To assign a label to a specific email message:"
+msgstr ""
+
+#: C/evolution.xml:6457(para)
+msgid "Right-click the message from the message preview."
+msgstr ""
+"Klicken Sie mit der rechten Maustaste auf die Nachricht in der "
+"Nachrichtenvorschau."
+
+#: C/evolution.xml:6460(para)
+#, fuzzy
+msgid "Click Label and select the desired label for the message."
+msgstr ""
+"Wählen Sie den Ordner aus, in dem verschickte Nachrichten gespeichert werden "
+"sollen."
+
+#: C/evolution.xml:6468(para)
 msgid ""
 "The headers on an incoming message are the information about the message "
 "that isn't the content of the message itself, such as the sender and the "
@@ -12911,11 +12762,11 @@ msgstr ""
 "auch weitere Kopfzeilen zu dieser Liste hinzufügen oder entfernen, die "
 "Vorgabe-Kopfzeilen können allerdings nicht entfernt werden."
 
-#: C/evolution.xml:6447(title)
+#: C/evolution.xml:6470(title)
 msgid "Sender Photograph:"
 msgstr "Photo des Absenders:"
 
-#: C/evolution.xml:6448(para)
+#: C/evolution.xml:6471(para)
 msgid ""
 "This feature adds support for viewing the photograph of the sender at the "
 "right side of the preview pane."
@@ -12923,7 +12774,7 @@ msgstr ""
 "Diese Funktion ermöglicht die Anzeige einer Photografie des Absenders im "
 "rechten Bereich der Nachrichtenvorschau."
 
-#: C/evolution.xml:6450(para)
+#: C/evolution.xml:6473(para)
 msgid ""
 "To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences "
 "&gt; Headers &gt; Show the photograph of sender in the email preview. "
@@ -12933,25 +12784,27 @@ msgstr ""
 "&gt; E-Mail-Einstellungen &gt; Kopfzeilen &gt; Photo des Absenders in der "
 "Nachrichtenvorschau anzeigen aus."
 
-#: C/evolution.xml:6451(para)
+#: C/evolution.xml:6474(para)
 msgid ""
 "By default it searches only in the local addressbooks enabled for "
-"autocompletion. If you deselect the option ‘Search for sender photograph "
-"only in the local addressbook', it searches in all the addressbooks enabled "
-"for autocompletion. If there are multiple matches for the same contact, it "
-"always takes the first one. Consider a contact that has multiple matches - "
-"the first one with a photograph and the second without a photo. Here, "
-"Evolution takes the first contact regardless of it not having a photograph."
+"autocompletion. If you deselect the option <guilabel>Search for sender "
+"photograph only in the local addressbook</guilabel>, it searches in all the "
+"addressbooks enabled for autocompletion. If there are multiple matches for "
+"the same contact, it always takes the first one. Consider a contact that has "
+"multiple matches - the first one with a photograph and the second without a "
+"photo. Here, Evolution takes the first contact regardless of it not having a "
+"photograph."
 msgstr ""
 "Per Vorgabe wird nur in den lokalen Adressbüchern gesucht, die für die Auto-"
-"Vervollständigung markiert sind. Wenn Sie die Option »Nach Photo des "
-"Absenders nur in den lokalen Adressbüchern suchen« abwählen, so sucht "
-"Evolution in allen Adressbüchern, die für die Auto-Vervollständigung "
-"markiert sind. Falls es mehrere Treffer für den selben Kontakt gibt, so wird "
-"immer der erste Treffer verwendet, egal ob beim zweiten Treffer "
-"gegebenenfalls ein Photo vorhanden ist und beim ersten Treffer nicht."
+"Vervollständigung markiert sind. Wenn Sie die Option <guilabel>Nach Photo "
+"des Absenders nur in den lokalen Adressbüchern suchen</guilabel> abwählen, "
+"so sucht Evolution in allen Adressbüchern, die für die Auto-"
+"Vervollständigung markiert sind. Falls es mehrere Treffer für den selben "
+"Kontakt gibt, so wird immer der erste Treffer verwendet, egal ob beim "
+"zweiten Treffer gegebenenfalls ein Photo vorhanden ist und beim ersten "
+"Treffer nicht."
 
-#: C/evolution.xml:6452(para)
+#: C/evolution.xml:6475(para)
 msgid ""
 "This feature is disabled by default as it causes delay in fetching the "
 "messages."
@@ -12959,43 +12812,42 @@ msgstr ""
 "Diese Funktion ist standardmäßig deaktiviert, da Sie das Abrufen von E-Mails "
 "verlangsamt."
 
-#: C/evolution.xml:6457(para)
+#: C/evolution.xml:6480(para)
 msgid ""
-"You can check your incoming messages for junk content using Bogofilter or/"
-"and SpamAssassin tool with trainable Bayesian filters.Note that you need to "
-"enable the respective junk plugins to enable junk filtering."
+"You can check your incoming messages for junk content by using Bogofilter "
+"and SpamAssassin* tools, which have trainable Bayesian filters. You need to "
+"enable the Junk plugins to start filtering junk mail."
 msgstr ""
 "Sie können eingehende Nachrichten auf Ihre Unerwünschtheit prüfen, indem Sie "
 "SpamAssassin* und/oder Bogofilter* mit trainierbaren Bayes-Filtern benutzen. "
 "Beachten Sie, dass die jeweiligen Plugins aktiviert sein müssen, um das "
 "Filtern zu aktivieren."
 
-#: C/evolution.xml:6458(para)
-msgid "To enable junk filtering using SpamAssassin and/or Bogofilter,"
-msgstr ""
-"Um das Filtern unerwünschter Nachrichten mit SpamAssassin und/oder "
-"Bogofilter zu aktivieren,"
+#: C/evolution.xml:6481(para)
+#, fuzzy
+msgid "To enable Junk plugins:"
+msgstr "Vorgabe-Unerwünscht-Plugin:"
 
-#: C/evolution.xml:6461(para)
+#: C/evolution.xml:6484(para)
 msgid "Select Edit &gt; Plugins"
 msgstr "Klicken Sie auf Bearbeiten &gt; Plugins."
 
-#: C/evolution.xml:6464(para)
-msgid "Select Bogofilter junk plugin and SpamAssassin junk plugin."
+#: C/evolution.xml:6487(para)
+msgid ""
+"Select the junk plugins you want. You can select either Bogofilter or "
+"SpamAssassin, or you can select both."
 msgstr ""
-"Aktivieren Sie das Bogofilter junk plugin oder SpamAssassin-Unerwünscht-"
-"Plugin."
 
-#: C/evolution.xml:6468(title)
+#: C/evolution.xml:6491(title)
 msgid "General:"
 msgstr "Allgemein:"
 
-#: C/evolution.xml:6469(para)
+#: C/evolution.xml:6492(para)
+#, fuzzy
 msgid ""
-"You can enable checking incoming mails for junk contents and also decide how "
-"often you want to delete junk mails on exit. You also have the option to "
-"choose either SpamAssassin or Bogofilter or both. Click Check incoming mail "
-"for junk."
+"You can check incoming email for junk contents and also decide how often you "
+"want to delete junk mail. You also have the option to choose either "
+"SpamAssassin or Bogofilter, or you can select both."
 msgstr ""
 "Sie können das Filtern unerwünschter Nachrichten aktivieren und entscheiden, "
 "wie oft unerwünschte Nachrichten beim Beenden von Evolution endgültig "
@@ -13003,39 +12855,40 @@ msgstr ""
 "Bogofilter entscheiden, oder beide Anwendungen benutzen. Klicken Sie auf "
 "»Eingehende E-Mail auf Unerwünschtheit prüfen«."
 
-#: C/evolution.xml:6472(title)
+#: C/evolution.xml:6495(title)
 msgid "Checking Incoming Mail for Junk:"
 msgstr "Eingehende E-Mail auf Unerwünschtheit prüfen:"
 
-#: C/evolution.xml:6473(para)
+#: C/evolution.xml:6496(para)
 msgid "This option turns automatic junk mail filtering on or off."
 msgstr ""
 "Diese Option aktiviert oder deaktiviert die automatische Prüfung auf "
 "Unerwünschtheit."
 
-#: C/evolution.xml:6476(title)
-msgid "Delete junk mails on exit:"
+#: C/evolution.xml:6499(title)
+msgid "Delete junk mail on exit:"
 msgstr "Unerwünscht-Ordner beim Beenden leeren:"
 
-#: C/evolution.xml:6477(para)
+#: C/evolution.xml:6500(para)
 msgid ""
-"Select Delete junk messages on exit and also specify when to delete the junk "
-"messages from the options (Every time, Once per day, Once per week, Once per "
-"month)."
+"This option deletes junk messages when you exit. You can also specify when "
+"to delete the junk messages (every time, once per day, once per week, once "
+"per month)."
 msgstr ""
 "Wählen Sie »Unerwünscht-Ordner beim Beenden leeren« und wählen Sie aus, wie "
 "oft und wann dies geschehen soll (Jedes Mal, Einmal pro Tag, Einmal pro "
 "Woche, Einmal pro Monat)."
 
-#: C/evolution.xml:6480(title)
+#: C/evolution.xml:6503(title)
 msgid "Default junk plugin:"
 msgstr "Vorgabe-Unerwünscht-Plugin:"
 
-#: C/evolution.xml:6481(para)
+#: C/evolution.xml:6504(para)
 msgid ""
-"Select SpamAssassin or/and Bogofilter as your junk filter. You can view them "
-"only if you have enabled the respective plugins. When you select any option, "
-"it also reports if the underlying binary is available or not."
+"Select either SpamAssassin or Bogofilter, or both, as your junk filter. You "
+"can view them only if you have enabled the respective plugins. When you "
+"select any option, it also reports if the underlying binary is available or "
+"not."
 msgstr ""
 "Wählen Sie SpamAssassin oder Bogofilter als Ihren Standard-Filter für "
 "unerwünschte Nachrichten aus. Diese Auswahl ist nur verfügbar, falls die "
@@ -13043,29 +12896,28 @@ msgstr ""
 "haben wird Ihnen zudem mitgeteilt, ob das jeweils hierfür benötigte "
 "Programmpaket installiert ist."
 
-#: C/evolution.xml:6485(title)
+#: C/evolution.xml:6508(title)
 msgid "SpamAssassin Options:"
 msgstr "SpamAssassin-Optionen:"
 
-#: C/evolution.xml:6486(para)
+#: C/evolution.xml:6509(para)
 msgid ""
-"Remote test performs filtering junk mails on remote servers. It also "
-"includes online tests, like checking for blacklisted message senders and "
-"ISPs."
+"Remote Test performs junk mail filtering on remote servers. It also includes "
+"online tests, like checking for blacklisted message senders and ISPs."
 msgstr ""
 "»Zusätzliche Ferntests durchführen« nutzt zusätzliche Tests, für die eine "
 "Netzwerkverbindung benötigt wird, so zum Beispiel ob eine Nachricht in einer "
 "Liste bekannter unerwünschter Nachrichten enthalten ist, oder ob der "
 "Absender auf einer schwarzen Liste von Anti-Spam-Organisationen steht."
 
-#: C/evolution.xml:6488(para)
+#: C/evolution.xml:6511(para)
 msgid ""
 "This option uses tests that require a network connection, such as checking "
 "to see if a message is in a list of known junk messages, or if the sender or "
-"gateway are blacklisted by anti-spam organizations.Online tests can make "
+"gateway are blacklisted by anti-spam organizations. Online tests can make "
 "filtering slower, because remote tests add to the amount of time it takes to "
-"check for junk mail, but increase accuracy. When you select this option, you "
-"do not need to do any additional setup to make this work."
+"check for junk mail, but they increase accuracy. When you select this "
+"option, you do not need to do any additional setup."
 msgstr ""
 "Diese Option nutzt zusätzliche Tests, für die eine Netzwerkverbindung "
 "benötigt wird, so zum Beispiel ob eine Nachricht in einer Liste bekannter "
@@ -13076,26 +12928,26 @@ msgstr ""
 "Wenn Sie diese Option auswählen brauchen Sie keine weiteren Einstellungen zu "
 "treffen, damit die Ferntests funktionieren."
 
-#: C/evolution.xml:6490(title)
+#: C/evolution.xml:6513(title)
 msgid "Bogofilter Options:"
 msgstr "Bogofilter-Optionen:"
 
-#: C/evolution.xml:6491(para)
+#: C/evolution.xml:6514(para)
 msgid ""
-"Select Convert mail text to unicode to enable unicode based filtering. For "
-"more information on Bogofilter, see <ulink url=\"http://bogofilter."
+"Select Convert mail text to Unicode to enable Unicode* filtering. For more "
+"information on Bogofilter, see the <ulink url=\"http://bogofilter."
 "sourceforge.net/\">Bogofilter site</ulink>."
 msgstr ""
-"Wählen Sie »E-Mail-Text nach Unicode konvertieren«, um Unicode-basiertes "
+"Wählen Sie »E-Mail-Text nach Unicode konvertieren«, um Unicode*-basiertes "
 "Filtern zu verwenden. Für weitere Informationen über Bogofilter siehe die "
 "<ulink url=\"http://bogofilter.sourceforge.net/\">Bogofilter-Webseite</"
 "ulink>."
 
-#: C/evolution.xml:6494(para)
+#: C/evolution.xml:6517(para)
 msgid ""
 "Check new messages for junk contents option under Edit &gt; Preferences &gt; "
-"Mail Accounts &gt; Edit &gt; Receiving option is enabled only for IMAP. "
-"Check incoming mail for junk option under Edit &gt; Prefernces &gt; Mail "
+"Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. "
+"Check incoming mail for junk option under Edit &gt; Preferences &gt; Mail "
 "Preferences &gt; Junk &gt; General refers only to POP and Local Delivery."
 msgstr ""
 "»Neue Nachrichten auf unerwünschten Inhalt prüfen« unter Bearbeiten &gt; "
@@ -13104,7 +12956,7 @@ msgstr ""
 "prüfen« unter Bearbeiten &gt; Einstellungen &gt; E-Mail-Einstellungen &gt; "
 "Unerwünscht bezieht sich nur auf POP und Lokale Auslieferung."
 
-#: C/evolution.xml:6500(para)
+#: C/evolution.xml:6523(para)
 msgid ""
 "There are two items in this section: Automatic Contacts automatically adds "
 "people that you respond to into your address book. You can select the "
@@ -13114,7 +12966,7 @@ msgstr ""
 "Personen zu Ihrem Adressbuch hinzu, auf deren E-Mails Sie antworten. Sie "
 "können das gewünschte Vorgabe-Adressbuch aus der Auswahlliste auswählen."
 
-#: C/evolution.xml:6501(para)
+#: C/evolution.xml:6524(para)
 msgid ""
 "Instant Messaging Contacts periodically synchronizes contact information and "
 "images with your instant messaging program. Currently this only works with "
@@ -13127,7 +12979,7 @@ msgstr ""
 "darf nicht schreibgeschützt sein, damit diese beiden Funktionen "
 "funktionieren."
 
-#: C/evolution.xml:6506(para)
+#: C/evolution.xml:6529(para)
 msgid ""
 "Allows you to delete messages after you have acted on an appointment. It "
 "also allows you to select calendars to search for meeting conflicts."
@@ -13136,35 +12988,31 @@ msgstr ""
 "geantwortet haben, und die Auswahl der Kalender, die nach "
 "Besprechungskonflikten (also zeitgleichen Terminen) durchsucht werden sollen."
 
-#: C/evolution.xml:6512(para)
+#: C/evolution.xml:6535(para)
 msgid ""
 "There are three tabs for message composer settings where you can set the "
-"composer preferences. The General tab covers shortcuts and assorted "
-"behavior, the Signature tab sets your signature, and the Spell Checking tab "
-"controls spell checking."
+"composer preferences. The General tab covers assorted behavior, the "
+"Signature tab sets your signature, and the Spell Checking tab controls spell "
+"checking."
 msgstr ""
 "Editoreinstellungen können in drei Reitern vorgenommen werden: Der "
 "»Allgemein«-Reiter behandelt Weiterleitungs- und Antwortstil, unter "
-"»Signaturen« können Sie Ihre Signaturen bearbeiten, und "
-"»Rechtschreibprüfung« behandelt die automatische Prüfung der Rechtschreibung."
+"»Signaturen« können Sie Ihre Signaturen bearbeiten, und »Rechtschreibprüfung« "
+"behandelt die automatische Prüfung der Rechtschreibung."
 
-#: C/evolution.xml:6518(link) C/evolution.xml:6558(title)
+#: C/evolution.xml:6541(link) C/evolution.xml:6581(title)
 msgid "Signature"
 msgstr "Signaturen"
 
-#: C/evolution.xml:6521(link) C/evolution.xml:6563(title)
+#: C/evolution.xml:6544(link) C/evolution.xml:6586(title)
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: C/evolution.xml:6527(para)
-msgid "In the General tab, you can set the following options:"
-msgstr "Im »Allgemein«-Reiter können folgende Einstellungen getroffen werden:"
-
-#: C/evolution.xml:6529(title)
+#: C/evolution.xml:6552(title)
 msgid "Default Behavior:"
 msgstr "Vorgabeverhalten:"
 
-#: C/evolution.xml:6530(para)
+#: C/evolution.xml:6553(para)
 msgid ""
 "Choose how to normally forward and reply to messages, what character set "
 "they will use, whether they are in HTML, and whether that HTML can contain "
@@ -13174,7 +13022,7 @@ msgstr ""
 "Nachrichten, welcher zeichensatz benutzt werden soll, ob HTML benutzt werden "
 "soll, und ob die Emoticons grafisch formatiert werden sollen."
 
-#: C/evolution.xml:6532(para)
+#: C/evolution.xml:6555(para)
 msgid ""
 "You can forward messages either as an attachment or inline, or else as "
 "quoted. Choose reply style from the drop-down list: Quote original message, "
@@ -13186,11 +13034,11 @@ msgstr ""
 "zitieren«, »Originalnachricht anhängen« oder »Originalnachricht inline "
 "weiterleiten«."
 
-#: C/evolution.xml:6534(title)
+#: C/evolution.xml:6557(title)
 msgid "Top Posting Options:"
 msgstr "Top-Posting-Optionen:"
 
-#: C/evolution.xml:6535(para)
+#: C/evolution.xml:6558(para)
 msgid ""
 "When replying, you can choose where to place your signature in the message. "
 "You can place the signature either above the original message or at the end "
@@ -13204,31 +13052,31 @@ msgstr ""
 "nicht empfohlen, da das Setzen der Signatur an eine andere Stelle als das "
 "Ende der Nachricht nicht den Gebräuchen entspricht."
 
-#: C/evolution.xml:6538(title) C/evolution.xml:6610(title)
+#: C/evolution.xml:6561(title) C/evolution.xml:6634(title)
 msgid "Alerts:"
 msgstr "Alarme:"
 
-#: C/evolution.xml:6539(para)
+#: C/evolution.xml:6562(para)
 msgid "There are two optional alerts you can select:"
 msgstr "Sie können zwei optionale Warnungen auswählen:"
 
-#: C/evolution.xml:6544(title)
+#: C/evolution.xml:6567(title)
 msgid "Prompt When Sending Messages With an Empty Subject Line:"
 msgstr "Nachfrage beim Abschicken von Nachrichten mit leerem Betreff:"
 
-#: C/evolution.xml:6545(para)
+#: C/evolution.xml:6568(para)
 msgid "The composer warns you if you try to send a message without a subject."
 msgstr ""
 "Der Editor warnt Sie, falls Sie versuchen eine E-Mail ohne Betreffzeile zu "
 "verschicken."
 
-#: C/evolution.xml:6550(title)
+#: C/evolution.xml:6573(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich Blindkopie-Empfängern "
 "nachfragen:"
 
-#: C/evolution.xml:6551(para)
+#: C/evolution.xml:6574(para)
 msgid ""
 "The composer warns you if you try to send a message that has only Bcc "
 "recipients. This is important because some mail servers fail to transmit "
@@ -13240,10 +13088,11 @@ msgstr ""
 "scheitern, falls nicht zumindest ein Empfänger definiert ist, der für alle "
 "Empfänger sichtbar ist."
 
-#: C/evolution.xml:6559(para)
+#: C/evolution.xml:6582(para)
+#, fuzzy
 msgid ""
 "The signature editor allows you to create several different signatures in "
-"plain text or in HTML, and to specify which of them will be added to e-mail "
+"plain text or in HTML, and to specify which of them will be added to email "
 "you create in the message composer. If you prefer to use an alternate "
 "signature or none at all, you can select it from the mail composer itself."
 msgstr ""
@@ -13252,92 +13101,90 @@ msgstr ""
 "Sie eine andere Signatur als die Vorgabe-Signatur oder gar keine benutzen "
 "möchten, so können Sie dies im Nachrichten-Editor selbst auswählen."
 
-#: C/evolution.xml:6564(para)
+#: C/evolution.xml:6587(para)
 msgid ""
-"To choose a spell-checking language, select it here. You must install the "
-"gnome-spell package, available through ZENworks® Linux Management, for spell-"
-"checking to be available in Evolution. Additional dictionaries are also "
-"available through Red Carpet® and are detected automatically if you have "
-"installed them. You must also install the aspell package. If this is the "
-"case, please contact your packager. To have the composer automatically check "
-"your spelling while you type, select Check Spelling While I Type. You can "
-"set the color for misspelled words."
+"To choose a spell-checking language, select it here. You must install gnome-"
+"spell, aspell, and an aspell language package (like for example aspell-en "
+"for english language) for spell-checking to be available in Evolution. "
+"Additional dictionaries are available through your package manager and are "
+"detected automatically if you have installed them. To have the composer "
+"automatically check your spelling while you type, select Check Spelling "
+"While I Type. You can set the color for misspelled words."
 msgstr ""
 "Wenn die Rechtschreibung für eine Sprache geprüft werden soll, so wählen Sie "
-"dies hier aus. Hierfür müssen die Pakete »gnome-spell« und »aspell« sowie "
-"ein aspell-Sprachpaket, wie zum Beispiel »aspell-de« für deutsch, "
-"installiert sein. Damit im E-Mail-Editor während des Schreibens automatisch "
-"falsche Begriffe unterstrichen werden, wählen Sie »Rechtschreibprüfung "
-"während der Eingabe durchführen« aus. Sie können hier auch die Farbe für "
-"falsch geschriebene Wörter bestimmen."
-
-#: C/evolution.xml:6570(para)
-msgid "The calendar configuration tool has four pages:"
-msgstr "Die Kalender-Einstellungen besitzen vier Reiter:"
-
-#: C/evolution.xml:6576(link) C/evolution.xml:6616(title)
+"dies hier aus. Hierfür müssen die Pakete »gnome-spell« und »aspell« sowie ein "
+"aspell-Sprachpaket, wie zum Beispiel »aspell-de« für deutsch, installiert "
+"sein. Damit im E-Mail-Editor während des Schreibens automatisch falsche "
+"Begriffe unterstrichen werden, wählen Sie »Rechtschreibprüfung während der "
+"Eingabe durchführen« aus. Sie können hier auch die Farbe für falsch "
+"geschriebene Wörter bestimmen."
+
+#: C/evolution.xml:6594(para)
+msgid "The calendar configuration tool has several pages:"
+msgstr "Die Kalender-Einstellungen besitzen mehrere Reiter:"
+
+#: C/evolution.xml:6600(link) C/evolution.xml:6640(title)
 msgid "Display"
 msgstr "Anzeigen"
 
-#: C/evolution.xml:6579(link) C/evolution.xml:6649(title)
+#: C/evolution.xml:6603(link) C/evolution.xml:6673(title)
 msgid "Alarms"
 msgstr "Alarme"
 
-#: C/evolution.xml:6582(link) C/evolution.xml:6662(title)
+#: C/evolution.xml:6606(link) C/evolution.xml:6686(title)
 msgid "Calendar Publishing"
 msgstr "Kalenderveröffentlichung"
 
-#: C/evolution.xml:6588(para)
+#: C/evolution.xml:6612(para)
 msgid "The General page lets you set the following options:"
 msgstr "Unter »Allgemein« können folgende Einstellungen getroffen werden:"
 
-#: C/evolution.xml:6590(title)
+#: C/evolution.xml:6614(title)
 msgid "Time Zone:"
 msgstr "Zeitzone:"
 
-#: C/evolution.xml:6591(para)
+#: C/evolution.xml:6615(para)
 msgid "The city you're located in, to specify your time zone."
 msgstr "Die Stadt in der Sie sich befinden, um Ihre Zeitzone zu definieren."
 
-#: C/evolution.xml:6594(title)
+#: C/evolution.xml:6618(title)
 msgid "Time Format:"
 msgstr "Zeitformat:"
 
-#: C/evolution.xml:6595(para)
+#: C/evolution.xml:6619(para)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Wählen Sie zwischen 12-Stunden (AM/PM)- und 24-Stunden-Format."
 
-#: C/evolution.xml:6598(title)
+#: C/evolution.xml:6622(title)
 msgid "Week Starts:"
 msgstr "Woche beginnt am:"
 
-#: C/evolution.xml:6599(para)
+#: C/evolution.xml:6623(para)
 msgid "Select the day to display as the first in each week."
 msgstr "Wählen Sie den Wochentag aus, der der erste Tag in jeder Woche ist."
 
-#: C/evolution.xml:6602(title)
+#: C/evolution.xml:6626(title)
 msgid "Day Begins:"
 msgstr "Tag beginnt:"
 
-#: C/evolution.xml:6603(para)
+#: C/evolution.xml:6627(para)
 msgid ""
 "For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can "
-"select your preferred hours to make sure that all your events are displayed "
-"properly."
+"select your preferred hours."
 msgstr ""
 "Für Evolution beginnt ein normaler Werktag um 9 Uhr und endet um 17 Uhr. Sie "
 "können hier Ihre eigenen bevorzugten Stunden eintragen, so dass alle Termine "
 "korrekt dargestellt werden."
 
-#: C/evolution.xml:6606(title)
+#: C/evolution.xml:6630(title)
 msgid "Day Ends:"
 msgstr "Tag endet:"
 
-#: C/evolution.xml:6607(para)
+#: C/evolution.xml:6631(para)
 msgid "Sets the end of a normal workday."
 msgstr "Bestimmt das Ende eines normalen Werktages."
 
-#: C/evolution.xml:6611(para)
+#: C/evolution.xml:6635(para)
 msgid ""
 "If you want to be warned before you delete any appointment, or to have a "
 "reminder automatically appear for each event, select the options here."
@@ -13346,7 +13193,7 @@ msgstr ""
 "automatisch einen Alarm für jedes Ereignis erhalten möchten, so wählen Sie "
 "diese Optionen hier aus."
 
-#: C/evolution.xml:6617(para)
+#: C/evolution.xml:6641(para)
 msgid ""
 "The Display page lets you choose how your appointments and tasks appear in "
 "your calendar."
@@ -13354,11 +13201,11 @@ msgstr ""
 "Im Reiter »Anzeigen« können Sie die entscheiden, wie Termine und Aufgaben "
 "dargestellt werden sollen."
 
-#: C/evolution.xml:6619(title)
+#: C/evolution.xml:6643(title)
 msgid "Time Divisions:"
 msgstr "Zeitunterteilungen:"
 
-#: C/evolution.xml:6620(para)
+#: C/evolution.xml:6644(para)
 msgid ""
 "Sets the time increments shown as fine lines on the daily view in the "
 "calendar."
@@ -13366,11 +13213,11 @@ msgstr ""
 "Bestimmt die Zeitabschnitte, die als dünne Linien in der Tagesansicht im "
 "Kalender dargestellt werden."
 
-#: C/evolution.xml:6623(title)
+#: C/evolution.xml:6647(title)
 msgid "Show appointment end times in week and month views:"
 msgstr "Endzeiten von Terminen in Wochen- und Monatsansicht anzeigen:"
 
-#: C/evolution.xml:6624(para)
+#: C/evolution.xml:6648(para)
 msgid ""
 "If there is space, Evolution shows the end times in the week and month views "
 "for each appointment."
@@ -13378,11 +13225,11 @@ msgstr ""
 "Falls Platz vorhanden ist, zeigt Evolution die Endzeiten in der Wochen- und "
 "Monatsansicht für jeden Termin dar."
 
-#: C/evolution.xml:6627(title)
+#: C/evolution.xml:6651(title)
 msgid "Compress weekends in month view:"
 msgstr "Wochenende in Monatsansicht komprimieren:"
 
-#: C/evolution.xml:6628(para)
+#: C/evolution.xml:6652(para)
 msgid ""
 "Select this option to display weekends in one box instead of two in the "
 "month view."
@@ -13390,37 +13237,37 @@ msgstr ""
 "Wählen Sie diese Option, wenn Wochenenden als eine Box in der Monatsansicht "
 "dargestellt werden sollen."
 
-#: C/evolution.xml:6631(title)
+#: C/evolution.xml:6655(title)
 msgid "Show week numbers in date navigator:"
 msgstr "Wochennummern im Datumsnavigator anzeigen:"
 
-#: C/evolution.xml:6632(para)
+#: C/evolution.xml:6656(para)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr ""
 "Zeigt die Wochennummer neben der jeweiligen Woche im kleinen Kalender in der "
 "Seitenleiste an."
 
-#: C/evolution.xml:6635(title)
+#: C/evolution.xml:6659(title)
 msgid "Tasks due today:"
 msgstr "Heute fällige Aufgaben:"
 
-#: C/evolution.xml:6636(para)
+#: C/evolution.xml:6660(para)
 msgid "Select the color for tasks due today."
 msgstr "Wählt die Farbe für heute fällige Aufgabe aus."
 
-#: C/evolution.xml:6639(title)
+#: C/evolution.xml:6663(title)
 msgid "Overdue tasks:"
 msgstr "Überfällige Aufgaben:"
 
-#: C/evolution.xml:6640(para)
+#: C/evolution.xml:6664(para)
 msgid "Select the color for overdue tasks."
 msgstr "Wählt die Farbe für überfällige Aufgaben aus."
 
-#: C/evolution.xml:6643(title)
+#: C/evolution.xml:6667(title)
 msgid "Hide completed tasks after:"
 msgstr "Erledigte Aufgaben verbergen nach:"
 
-#: C/evolution.xml:6644(para)
+#: C/evolution.xml:6668(para)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you don't select this option, "
@@ -13431,11 +13278,11 @@ msgstr ""
 "Wenn Sie diese Option nicht auswählen, bleiben erledigte Aufgaben in Ihrer "
 "Aufgabenliste, als erledigt markiert."
 
-#: C/evolution.xml:6651(title)
+#: C/evolution.xml:6675(title)
 msgid "Select the Calendars for Alarm Notification:"
 msgstr "Kalender für Alarmbenachrichtigung auswählen:"
 
-#: C/evolution.xml:6652(para)
+#: C/evolution.xml:6676(para)
 msgid ""
 "Select the calendars for which you want an alarm notification. If you don't "
 "select the calendar, you will not have an alarm notification for any event "
@@ -13445,23 +13292,15 @@ msgstr ""
 "Sie keinen Kalender auswählen, erhalten Sie keine Erinnerungen für jegliche "
 "Termine im jeweiligen Kalender."
 
-#: C/evolution.xml:6657(title)
+#: C/evolution.xml:6681(title)
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
-#: C/evolution.xml:6658(para)
-msgid ""
-"Allows you to specify a template to use while posting your Free/Buy "
-"information to a server."
-msgstr ""
-"Ermöglicht es eine Vorlage zu nutzen, wenn Sie "
-"Verfügungbarkeitsinformationen auf einem Server veröffentlichen."
-
-#: C/evolution.xml:6664(title)
+#: C/evolution.xml:6688(title)
 msgid "Publishing:"
 msgstr "Kalenderveröffentlichung:"
 
-#: C/evolution.xml:6665(para)
+#: C/evolution.xml:6689(para)
 msgid ""
 "Allows you to select a URL to post your calendar information to. When you "
 "add a URL, you can specify the publishing location, the frequency of "
@@ -13472,7 +13311,7 @@ msgstr ""
 "hinzufügen, können Sie den Ort selbst, die Häufigkeit der Aktualisierung, "
 "den zu veröffentlichenden Kalender und die Legitimierung bestimmen."
 
-#: C/evolution.xml:6672(para)
+#: C/evolution.xml:6696(para)
 msgid ""
 "Evolution allows you to add certificates for yourself as well as for "
 "contacts. This allows you to communicate with others securely over an "
@@ -13485,25 +13324,24 @@ msgstr ""
 "Sie Ihre Identität gegenüber dem Kontakt bestätigen können. Diese "
 "Einstellungen beziehen sich nur auf S/MIME-Verschölüsselung."
 
-#: C/evolution.xml:6674(title)
+#: C/evolution.xml:6698(title)
 msgid "Your Certificates:"
 msgstr "Ihre Zertifikate:"
 
-#: C/evolution.xml:6675(para)
+#: C/evolution.xml:6699(para)
 msgid ""
 "Click the Your Certificates tab to display a list of certificates that you "
-"own. You can import, view, back up and delete your certificates from this "
-"page."
+"own. You can import, view and delete your certificates from this page."
 msgstr ""
 "Klicken Sie auf den »Ihre Zertifikate«-Reiter, um eine Liste der Zertifikate "
 "angezeigt zu bekommen, welche Sie besitzen. Sie können auf dieser Seite "
-"Zertifikate anschauen, sichern und löschen."
+"Zertifikate importieren, anschauen und löschen."
 
-#: C/evolution.xml:6678(title)
+#: C/evolution.xml:6702(title)
 msgid "Contact Certificates:"
 msgstr "Kontaktzertifikate:"
 
-#: C/evolution.xml:6679(para)
+#: C/evolution.xml:6703(para)
 msgid ""
 "Click the Contact Certificates tab to display a list of certificates that "
 "you have for contacts. These certificates allow you to decrypt messages as "
@@ -13516,11 +13354,11 @@ msgstr ""
 "das Prüfen von signierten Nachrichten. Sie können auf dieser Seite "
 "Zertifikate importieren, anschauen, bearbeiten und löschen."
 
-#: C/evolution.xml:6682(title)
+#: C/evolution.xml:6706(title)
 msgid "Authorities:"
 msgstr "Zertifizierungsstellen:"
 
-#: C/evolution.xml:6683(para)
+#: C/evolution.xml:6707(para)
 msgid ""
 "Click the Authorities tab to display a list of trusted certificate "
 "authorities who verify that the certificate you have is valid. You can "
@@ -13532,71 +13370,67 @@ msgstr ""
 "können auf dieser Seite Zertifizierungsstellen importieren, anschauen, "
 "bearbeiten und löschen."
 
-#: C/evolution.xml:6688(title)
-msgid "<computeroutput/>Contact Management"
-msgstr "<computeroutput/>Verwaltung von Kontakten"
-
-#: C/evolution.xml:6689(para)
+#: C/evolution.xml:6713(para)
 msgid "There are two main tasks for configuring contact information:"
 msgstr "Die zwei wichtigsten Funktionen des Adressbuchs sind:"
 
-#: C/evolution.xml:6692(link) C/evolution.xml:6700(title)
+#: C/evolution.xml:6716(link) C/evolution.xml:6724(title)
 msgid "Creating a Contact"
 msgstr "Einen Kontakt hinzufügen"
 
-#: C/evolution.xml:6695(link) C/evolution.xml:6722(title)
+#: C/evolution.xml:6719(link) C/evolution.xml:6746(title)
 msgid "Creating an Address Book"
 msgstr "Ein Adressbuch erzeugen"
 
-#: C/evolution.xml:6701(para)
+#: C/evolution.xml:6725(para)
 msgid "To add a new contact list, either local or remote:"
 msgstr "Um eine neue Kontaktliste hinzuzufügen (entweder lokal oder entfernt):"
 
-#: C/evolution.xml:6704(para)
+#: C/evolution.xml:6728(para)
 msgid "Click Contacts in the Switcher."
 msgstr "Klicken Sie auf den »Kontakte«-Knopf unten links."
 
-#: C/evolution.xml:6707(para)
+#: C/evolution.xml:6731(para)
 msgid "Click the down-arrow next to New."
 msgstr "Klicken Sie auf den nach unten zeigenden Pfeil neben »Neu«."
 
-#: C/evolution.xml:6710(para)
+#: C/evolution.xml:6734(para)
 msgid "Select Contact List."
 msgstr "Wählen Sie »Kontaktliste« aus."
 
-#: C/evolution.xml:6713(para)
+#: C/evolution.xml:6737(para)
 msgid "Type a name and location for the Address Book."
 msgstr "Geben Sie einen Namen und einen Ort für das Adressbuch ein."
 
-#: C/evolution.xml:6725(para)
+#: C/evolution.xml:6749(para)
 msgid "Click File &gt; New &gt; Address Book."
 msgstr "Klicken Sie auf Datei &gt; Neu &gt; Adressbuch."
 
-#: C/evolution.xml:6728(para)
+#: C/evolution.xml:6752(para)
 msgid "Select the type of Address Book."
 msgstr "Wählen Sie den Adressbuch-Typen aus:"
 
-#: C/evolution.xml:6730(title)
+#: C/evolution.xml:6754(title)
 msgid "On This Computer:"
 msgstr "Auf diesem Computer:"
 
-#: C/evolution.xml:6731(para)
+#: C/evolution.xml:6755(para)
 msgid "Creates a local address book on the computer."
 msgstr "Erzeugt ein lokales Adressbuch auf Ihrem Computer."
 
-#: C/evolution.xml:6734(title)
+#: C/evolution.xml:6758(title)
 msgid "On LDAP Server:"
 msgstr "Auf LDAP-Server:"
 
-#: C/evolution.xml:6735(para)
+#: C/evolution.xml:6759(para)
 msgid "Creates an address book on the LDAP server."
 msgstr "Erzeugt ein Adressbuch auf dem LDAP-Server."
 
-#: C/evolution.xml:6738(title)
+#: C/evolution.xml:6762(title)
 msgid "Specific Account:"
 msgstr "Individuelles Konto:"
 
-#: C/evolution.xml:6739(para)
+#: C/evolution.xml:6763(para)
 msgid ""
 "If you have an account that allows you to create an address book on that "
 "server, you can select that account."
@@ -13604,51 +13438,52 @@ msgstr ""
 "Falls Sie ein Konto haben, das Ihnen das Erzeugen eines Adressbuchs auf dem "
 "Server gestattet, so können Sie dieses Konto auswählen."
 
-#: C/evolution.xml:6743(para)
+#: C/evolution.xml:6767(para)
 msgid ""
-"If you selected On This Computer, specify the name of the computer, and "
+"If you selected On This Computer, specify the name of the address book, and "
 "choose whether you want to the new address book as your default folder."
 msgstr ""
 "Falls Sie »Auf diesem Computer« ausgewählt haben, so geben Sie einen Namen "
 "für das Adressbuch ein und wählen Sie, ob das neue Adressbuch als "
 "Vorgabeordner genutzt werden soll."
 
-#: C/evolution.xml:6745(para)
+#: C/evolution.xml:6769(para)
 msgid ""
-"If you are creating an <link linkend=\"ldap\">LDAP</link> server, enter the "
-"server information as requested by the assistant:"
+"If you are creating an address book on an <link linkend=\"ldap\">LDAP</link> "
+"server, enter the server information as requested by the assistant:"
 msgstr ""
 "Falls Sie »Auf <link linkend=\"ldap\">LDAP</link>-Server« gewählt haben, "
 "geben Sie die gefragten Informationen ein:"
 
-#: C/evolution.xml:6747(title)
+#: C/evolution.xml:6771(title)
 msgid "Server Name:"
 msgstr "Server:"
 
-#: C/evolution.xml:6748(para)
+#: C/evolution.xml:6772(para)
 msgid "The Internet address of the contact server you are using."
 msgstr "Die Internet-Adresse des Kontakte-Servers, den Sie nutzen möchten."
 
-#: C/evolution.xml:6751(title)
+#: C/evolution.xml:6775(title)
 msgid "Login Method:"
 msgstr "Anmeldemethode:"
 
-#: C/evolution.xml:6752(para)
+#: C/evolution.xml:6776(para)
+#, fuzzy
 msgid ""
-"Specify whether your login is anonymous, uses an e-mail address, or uses a "
-"distinguished name. If the login is not anonymous, specify the e-mail "
-"address or distinguished name (DN) required by the server."
+"Specify whether your login is anonymous, uses an email address, or uses a "
+"distinguished name. If the login is not anonymous, specify the email address "
+"or distinguished name (DN) required by the server."
 msgstr ""
 "Wählen Sie ob Ihre Anmeldung anonym, per E-Mail-Adresse, oder mit einem "
 "Eindeutigen Namen (Distinguished Name, DN) geschehen soll. Falls die "
 "Anmeldung nicht anonym ist, geben Sie die E-Mail-Adresse oder den "
 "Eindeutigen Namen an."
 
-#: C/evolution.xml:6755(title)
+#: C/evolution.xml:6779(title)
 msgid "Port:"
 msgstr "Port:"
 
-#: C/evolution.xml:6756(para)
+#: C/evolution.xml:6780(para)
 msgid ""
 "The Internet port Evolution connects to in order to access the LDAP "
 "database. This is normally 389."
@@ -13656,28 +13491,22 @@ msgstr ""
 "Der Internet-Port, den Evolution benutzt um auf die LDAP-Datenbank "
 "zuzugreifen. Dies ist normalerweise der Port 389."
 
-#: C/evolution.xml:6759(title)
+#: C/evolution.xml:6783(title)
 msgid "Use SSL/TLS:"
 msgstr "Sichere Verbindung verwenden:"
 
-#: C/evolution.xml:6760(para)
+#: C/evolution.xml:6784(para)
 msgid ""
-"SSL and TLS are security mechanisms. If you select Always, Evolution does "
-"not connect unless secure connections are available. The default value is "
-"Whenever Possible, which uses secure connections if they are available, but "
-"does not cause failure if they are not."
+"SSL and TLS are security mechanisms. If you select No Encryption, Evolution "
+"will send your password unencrypted. By using SSL or TLS, a secure "
+"connection will be used and your password will be sent encrypted."
 msgstr ""
-"SSL und TLS sind Sicherheitsmechanismen. Wenn Sie »Immer« auswählen, so "
-"verbindet sich Evolution nicht mit dem Server, wenn keine sichere Verbindung "
-"möglich ist. Der Vorgabewert ist »Immer, wenn möglich«, der eine sichere "
-"Verbindung nutzt falls diese verfügbar ist, und ansonsten eine unsichere "
-"(nicht-verschlüsselte) Verbindung benutzt."
 
-#: C/evolution.xml:6763(title)
+#: C/evolution.xml:6787(title)
 msgid "Details: Search Base:"
 msgstr "Details: Suchbasis:"
 
-#: C/evolution.xml:6764(para)
+#: C/evolution.xml:6788(para)
 msgid ""
 "The <link linkend=\"search-base\">search base</link> is the starting point "
 "for a directory search. Contact your network administrator for information "
@@ -13687,11 +13516,11 @@ msgstr ""
 "eine Verzeichnissuche beginnt. Kontaktieren Sie Ihren Netzwerkadministrator "
 "für Informationen über die richtigen Einstellungen."
 
-#: C/evolution.xml:6767(title)
+#: C/evolution.xml:6791(title)
 msgid "Search Scope:"
 msgstr "Suchbereich:"
 
-#: C/evolution.xml:6768(para)
+#: C/evolution.xml:6792(para)
 msgid ""
 "The <link linkend=\"search-scope\">search scope</link> is the breadth of a "
 "given search. The following options are available:"
@@ -13700,27 +13529,27 @@ msgstr ""
 "Sie bei der Suche im Verzeichnisbaum absteigen wollen. Die folgende "
 "Möglichkeiten sind verfügbar:"
 
-#: C/evolution.xml:6773(title)
+#: C/evolution.xml:6797(title)
 msgid "One:"
 msgstr "One:"
 
-#: C/evolution.xml:6774(para)
+#: C/evolution.xml:6798(para)
 msgid "Searches the Search Base and one entry below it."
 msgstr "Dursucht lediglich die Ebene unterhalb des Ausgangspunktes der Suche."
 
-#: C/evolution.xml:6779(title)
+#: C/evolution.xml:6803(title)
 msgid "Sub:"
 msgstr "Sub:"
 
-#: C/evolution.xml:6780(para)
+#: C/evolution.xml:6804(para)
 msgid "Searches the Search Base and all entries below it."
 msgstr "Durchsucht alle Einträge unterhalb des Suchbereichs."
 
-#: C/evolution.xml:6785(title)
+#: C/evolution.xml:6809(title)
 msgid "Timeout (minutes):"
 msgstr "Zeitüberschreitung (in Minuten):"
 
-#: C/evolution.xml:6786(para)
+#: C/evolution.xml:6810(para)
 msgid ""
 "The maximum time Evolution attempts to download data from the server before "
 "giving up."
@@ -13728,11 +13557,11 @@ msgstr ""
 "Die maximale Zeit in Minuten, die Evolution versuchen soll Daten vom Server "
 "herunterzuladen, bevor Evolution aufgibt."
 
-#: C/evolution.xml:6791(title)
+#: C/evolution.xml:6815(title)
 msgid "Download Limit:"
 msgstr "Download-Limit:"
 
-#: C/evolution.xml:6792(para)
+#: C/evolution.xml:6816(para)
 msgid ""
 "The maximum number of results for a given search. Most servers refuse to "
 "send more than 500, but you can set the number lower if you want to shorten "
@@ -13743,11 +13572,11 @@ msgstr ""
 "heruntersetzen falls Sie bei sehr allgemeine Suchen weniger Daten "
 "herunterladen möchten."
 
-#: C/evolution.xml:6797(title)
+#: C/evolution.xml:6821(title)
 msgid "Display Name:"
 msgstr "Anzeigename:"
 
-#: C/evolution.xml:6798(para)
+#: C/evolution.xml:6822(para)
 msgid ""
 "The name you want to use as a label for this folder. It can be any name you "
 "choose."
@@ -13755,31 +13584,30 @@ msgstr ""
 "Der Name, der für diesen Ordner benutzt werden soll. Dieser kann frei "
 "ausgewählt werden."
 
-#: C/evolution.xml:6803(title)
+#: C/evolution.xml:6827(title)
 msgid "Search Filter:"
 msgstr "Suchfilter:"
 
-#: C/evolution.xml:6804(para)
+#: C/evolution.xml:6828(para)
 msgid "The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 "Hier kann der Suchfilter für alle LDAP-Anfragen bestimmt werden. Zum "
 "Beispiel:"
 
-#: C/evolution.xml:6806(para)
+#: C/evolution.xml:6830(para)
 msgid ""
 "ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists "
-"only the user objects.Filter (|(ObjectClass=User)"
-"(ObjectClass=groupOfNames)): Retrieves the User and Contact List objects."
-"(&amp;(mail=*)(ObjectClass=*)): Lists the objects associated with the e-mail "
-"addresses."
+"only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): "
+"Retrieves the User and Contact List objects.(&amp;(mail=*)(ObjectClass=*)): "
+"Lists the objects associated with the email addresses."
 msgstr ""
 "ObjectClass=*: Listet alle Objekte auf dem Server auf. ObjectClass=User: "
-"Listet nur Benutzer auf. Filter (&verbar;(ObjectClass=User)"
+"Listet nur Benutzer auf. Filter (|(ObjectClass=User)"
 "(ObjectClass=groupOfNames)): Listed Benutzer und Kontaktlisten auf. (&amp;"
 "(mail=*)(ObjectClass=*)): Listet alle Objekte auf, die mit einer E-Mail-"
 "Adresse assoziiert sind."
 
-#: C/evolution.xml:6808(para)
+#: C/evolution.xml:6832(para)
 msgid ""
 "If you change any LDAP address book configurations, Evolution and the "
 "Evolution Data Server need to be restarted in order to see the changes."
@@ -13788,7 +13616,7 @@ msgstr ""
 "der Evolution-Data-Server neugestartet werden, damit diese Änderungen "
 "sichtbar werden."
 
-#: C/evolution.xml:6811(para)
+#: C/evolution.xml:6835(para)
 msgid ""
 "If you are creating the address book for a specific account, type the name "
 "of the address book if you want the address book stored locally when "
@@ -13799,38 +13627,77 @@ msgstr ""
 "gespeichert werden soll, und falls das Adressbuch der Vorgabeordner sein "
 "soll."
 
-#: C/evolution.xml:6823(para)
+#: C/evolution.xml:6846(para)
+msgid ""
+"Evolution allows you to view the error logs and set the display duration for "
+"the error messages that appear in the statusbar. When an error occurs, "
+"statusbar displays the error message for the specified time, then it is "
+"moved to the debug file."
+msgstr ""
+
+#: C/evolution.xml:6849(para)
+msgid "From the Help menu, select Debug Logs."
+msgstr ""
+
+#: C/evolution.xml:6853(para)
+#, fuzzy
+msgid "Specify the display duration for the error messages."
+msgstr "Wählen Sie den Ort für die Veröffentlichung aus."
+
+#: C/evolution.xml:6854(para)
+#, fuzzy
+msgid "The messages remain in the statusbar for this specified time."
+msgstr ""
+"Durchsucht den Inhalt und alle Kopfzeilen der Nachricht nach dem angegebenen "
+"Text."
+
+#: C/evolution.xml:6858(para)
+#, fuzzy
+msgid ""
+"The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
+"> icon indicates that the error message is a warning. The <inlinegraphic "
+"format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> icon indicates an "
+"informational message."
+msgstr ""
+"Um alle Adressen zu sehen, klicken Sie auf das <inlinegraphic format=\"PNG\" "
+"fileref=\"figures/plus.png\"/> Symbol oder auf &rsquo;...&rsquo; in der "
+"Nachrichtenvorschau. Um wieder zu verkleinern, klicken Sie auf das "
+"<inlinegraphic format=\"PNG\" fileref=\"figures/minus.png\"/> Symbol in der "
+"Nachrichtenvorschau."
+
+#: C/evolution.xml:6865(para)
 msgid ""
 "Synchronization presents you with three issues you need to address. First, "
 "you need to enable synchronization. Second, your computer needs to recognize "
-"and access your handheld. At this time, Evolution™ only supports Palm OS "
-"devices like the PalmPilot* and the Handspring Visor. Third, you should "
-"decide what sort of synchronization behavior you want."
+"and access your handheld. At this time, <trademark>Evolution</trademark> "
+"only supports Palm OS devices like the PalmPilot* and the Handspring Visor. "
+"Third, you should decide what sort of synchronization behavior you want."
 msgstr ""
 "Dieses Kapitel behandelt drei Themen: Erstens: Das Aktivieren der "
 "Synchronisation. Zweitens muss der Computer das tragbare Gerät erkennen und "
-"darauf zugreifen können. Momentan unterstützt Evolution&trade; nur Geräte, "
+"darauf zugreifen können. Momentan unterstützt <trademark>Evolution</trademark> "
+"nur Geräte, "
 "auf den Palm OS läuft, wie zum Beispiel den PalmPilot* oder den Handspring "
 "Visor. Drittens müssen Sie entscheiden, was genau synchronisiert werden soll."
 
-#: C/evolution.xml:6826(link) C/evolution.xml:6837(title)
+#: C/evolution.xml:6868(link) C/evolution.xml:6879(title)
 msgid "Enabling Synchronization"
 msgstr "Aktivieren der Synchronisation"
 
-#: C/evolution.xml:6829(link) C/evolution.xml:6842(title)
+#: C/evolution.xml:6871(link) C/evolution.xml:6884(title)
 msgid "Selecting Conduits"
 msgstr "Conduits auswählen"
 
-#: C/evolution.xml:6832(link) C/evolution.xml:6865(title)
+#: C/evolution.xml:6874(link) C/evolution.xml:6907(title)
 msgid "Synchronizing Information"
 msgstr "Informationen synchronisieren"
 
-#: C/evolution.xml:6838(para)
+#: C/evolution.xml:6880(para)
 msgid ""
 "If you haven't used a handheld device with your computer before, you need to "
 "run the GNOME Control Center by clicking System &gt; Settings, and make sure "
 "that Pilot Link is properly configured. Make sure that you have read and "
-"write permissions on the device, which is normally n /dev/pilot. If that "
+"write permissions on the device, which is normally in /dev/pilot. If that "
 "does not work, check in /dev/ttyS0 if you have a serial connection, or in /"
 "dev/ttyUSB1 for a USB connection. You can do this by becoming root and "
 "adding your username to the group that owns this device node. For a USB "
@@ -13849,7 +13716,7 @@ msgstr ""
 "Gerätes werden zwei Dateien erstellt, ttyUSB0 und ttyUSB1. Die zweite Datei "
 "wird genutzt, um das Gerät zu konfigurieren."
 
-#: C/evolution.xml:6843(para)
+#: C/evolution.xml:6885(para)
 msgid ""
 "After your computer and your Palm OS device are communicating, select the "
 "<link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits "
@@ -13865,7 +13732,7 @@ msgstr ""
 "für Kontakte in Ihrem Adressbuch; ECalendar für Ihre Kalender; und ETodo für "
 "Ihre Aufgabenliste."
 
-#: C/evolution.xml:6844(para)
+#: C/evolution.xml:6886(para)
 msgid ""
 "Click Enable, then click Settings to change what the conduit does when "
 "activated. Your options can vary depending on the conduit, but typically "
@@ -13875,19 +13742,19 @@ msgstr ""
 "bestimmen was das Conduit nach Aktivierung tun soll. Diese Optionen "
 "unterscheiden sich je nach Conduit, sind aber üblicherweise folgende:"
 
-#: C/evolution.xml:6846(title)
+#: C/evolution.xml:6888(title)
 msgid "Disabled:"
 msgstr "Deaktiviert:"
 
-#: C/evolution.xml:6847(para)
+#: C/evolution.xml:6889(para)
 msgid "Do nothing."
 msgstr "Nichts tun."
 
-#: C/evolution.xml:6850(title)
+#: C/evolution.xml:6892(title)
 msgid "Synchronize:"
 msgstr "Synchronisieren/Abgleichen:"
 
-#: C/evolution.xml:6851(para)
+#: C/evolution.xml:6893(para)
 msgid ""
 "Copy new data from the computer to the handheld, and from the handheld to "
 "the computer. Remove items that were on both systems but have been deleted "
@@ -13897,25 +13764,25 @@ msgstr ""
 "Gerät auf den Computer. Entfernt Elemente, die auf beiden Systemen waren "
 "aber seit der letzten Synchronisation auf einem System gelöscht wurden."
 
-#: C/evolution.xml:6854(title)
+#: C/evolution.xml:6896(title)
 msgid "Copy From Pilot:"
 msgstr "Vom Pilot kopieren:"
 
-#: C/evolution.xml:6855(para)
+#: C/evolution.xml:6897(para)
 msgid "If there is any new data on the handheld device, copy it to the computer."
 msgstr ""
 "Falls neue Daten auf dem tragbaren Gerät vorhanden sind werden diese auf den "
 "Computer kopiert."
 
-#: C/evolution.xml:6858(title)
+#: C/evolution.xml:6900(title)
 msgid "Copy To Pilot:"
 msgstr "Auf den Pilot kopieren:"
 
-#: C/evolution.xml:6859(para)
+#: C/evolution.xml:6901(para)
 msgid "Copy new data from the computer to the handheld."
 msgstr "Neue Daten werden vom Computer auf das tragbare Gerät kopiert."
 
-#: C/evolution.xml:6861(para)
+#: C/evolution.xml:6903(para)
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
 "not sure, use Synchronize."
@@ -13924,7 +13791,7 @@ msgstr ""
 "wollen. Falls Sie sich nicht sicher sind, so benutzen Sie »Synchronisieren/"
 "Abgleichen«."
 
-#: C/evolution.xml:6866(para)
+#: C/evolution.xml:6908(para)
 msgid ""
 "Use the following procedure to synchronize the data on your Palm OS device "
 "with the data you store in Evolution."
@@ -13932,22 +13799,22 @@ msgstr ""
 "Befolgen Sie folgende Schritte um Daten zwischen Ihrem Palm OS-Gerät und "
 "Evolution abzugleichen:"
 
-#: C/evolution.xml:6867(para)
+#: C/evolution.xml:6909(para)
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
-"the <command>evolution</command> directory inside your home directory."
+"the <command>.evolution</command> directory inside your home directory."
 msgstr ""
 "Falls Sie eine Sicherheitskopie Ihrer Evolution-Daten machen möchten, bevor "
 "Sie synchronisieren, so kopieren Sie das <command>.evolution</command>-"
 "Verzeichnis in Ihrem Heimatverzeichnis."
 
-#: C/evolution.xml:6870(para)
+#: C/evolution.xml:6912(para)
 msgid "Put your handheld device in its cradle and press the HotSync button."
 msgstr ""
-"Stecken Sie das tragbare Gerät in die Halterung und drücken Sie den "
-"»HotSync«-Knopf."
+"Stecken Sie das tragbare Gerät in die Halterung und drücken Sie den »HotSync«-"
+"Knopf."
 
-#: C/evolution.xml:6871(para)
+#: C/evolution.xml:6913(para)
 msgid ""
 "If you use Palm OS v. 4.0 and have password protection turned on for your "
 "handheld device, you might encounter trouble synchronizing. If this happens, "
@@ -13960,25 +13827,26 @@ msgstr ""
 "Passwortschutz für Ihr tragbares Gerät ab, synchronisieren Sie es mit dem "
 "Computer, und aktivieren Sie dann wieder den Passwortschutz."
 
-#: C/evolution.xml:6874(para)
+#: C/evolution.xml:6916(para)
 msgid ""
 "If you have followed the setup instructions properly, your Palm OS device "
 "will synchronize data with Evolution."
 msgstr "Nun sollte Ihr Palm-OS-Gerät Daten mit Evolution synchronisieren."
 
-#: C/evolution.xml:6880(para)
+#: C/evolution.xml:6922(para)
 msgid ""
 "If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
-"helps you switch to Evolution™."
+"helps you switch to <trademark>Evolution</trademark>."
 msgstr ""
 "Falls Sie Microsoft Outlook, aber nicht Microsoft Exchange benutzen, so "
-"hilft Ihnen dieses Kapitel dabei, zu Evolution&trade; zu wechseln."
+"hilft Ihnen dieses Kapitel dabei, zu <trademark>Evolution</trademark> zu "
+"wechseln."
 
-#: C/evolution.xml:6883(title)
+#: C/evolution.xml:6925(title)
 msgid "Migrating Local Outlook Mail Folders"
 msgstr "Lokale Outlook-E-Mail-Ordner migrieren"
 
-#: C/evolution.xml:6884(para)
+#: C/evolution.xml:6926(para)
 msgid ""
 "Exchange and IMAP mail is stored on the server, so you do not need to "
 "migrate it to your Linux* partition. However, if you have stored mail on "
@@ -13989,11 +13857,12 @@ msgstr ""
 "Mails auf Ihrem Computer gespeichert haben, möchten Sie auf diese sicherlich "
 "auch in Evolution zugreifen können."
 
-#: C/evolution.xml:6885(para)
+#: C/evolution.xml:6927(para)
 msgid "First, while using Windows, prepare your messages for import:"
-msgstr "Bereiten Sie zunächst Ihre Nachrichten unter Windows für das Importieren vor."
+msgstr ""
+"Bereiten Sie zunächst Ihre Nachrichten unter Windows für das Importieren vor."
 
-#: C/evolution.xml:6888(para)
+#: C/evolution.xml:6930(para)
 msgid ""
 "Clean up your mail. Delete messages and folders you do not need, and click "
 "File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, "
@@ -14004,7 +13873,7 @@ msgstr ""
 "Extras &gt; Komprimieren um alte, als gelöscht markierte Nachrichten aus "
 "Ihrer PST-Datei zu entfernen."
 
-#: C/evolution.xml:6891(para)
+#: C/evolution.xml:6933(para)
 msgid ""
 "If you nest your folders one inside another, you might want to rename "
 "subfolders so that you can tell which folder they belong to. You must re-"
@@ -14015,7 +13884,7 @@ msgstr ""
 "gehören. Sie müssen Ihre Unterordner neu einrichten, nachdem Sie die Ordner "
 "in Evolution geladen haben."
 
-#: C/evolution.xml:6894(para)
+#: C/evolution.xml:6936(para)
 msgid ""
 "Import the files into Mozilla Mail (or another mailer, such as Netscape or "
 "Eudora, that uses the standard mbox format)."
@@ -14023,7 +13892,7 @@ msgstr ""
 "Importieren Sie die Dateien in Mozilla Mail (oder einem anderen E-Mail-"
 "Programm wie Netscape oder Eudora, welches das Standard-mbox-Format benutzt)."
 
-#: C/evolution.xml:6895(para)
+#: C/evolution.xml:6937(para)
 msgid ""
 "Linux mailers cannot do this task, because it requires a library available "
 "only under Windows. In Mozilla, import by selecting Window Mail &amp; "
@@ -14034,7 +13903,7 @@ msgstr ""
 "Importieren Sie in Mozilla, indem Sie Window Mail &amp; Newsgroups Tools "
 "Import auswählen."
 
-#: C/evolution.xml:6898(para)
+#: C/evolution.xml:6940(para)
 msgid ""
 "Mozilla creates a set of files in the directory<command> Windows"
 "\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail"
@@ -14046,20 +13915,20 @@ msgstr ""
 "\\Mail\\Local Folders\\OutlookMail\\</command>. Die benötigten Dateien sind "
 "diejenigen, die keine Dateiendung besitzen."
 
-#: C/evolution.xml:6899(para)
+#: C/evolution.xml:6941(para)
 msgid ""
-"If you are using Windows XP or Windows 2000, your Windows hard drive is "
-"probably in the NTFS format, which some Linux systems cannot read without "
-"additional software. You might find it simpler to copy the mail folders to a "
-"different drive or to burn a CD."
+"If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows "
+"hard drive is probably in the NTFS format, which some Linux systems cannot "
+"read without additional software. You might find it simpler to copy the mail "
+"folders to a different drive or to burn a CD."
 msgstr ""
-"Falls Sie Windows XP, 2000 oder Vista nutzen, so ist ihre Windows-Festplatte "
-"wahrscheinlich im NTFS-Format, welches von einigen Linux-Systemen nicht ohne "
-"zusätzliche Software gelesen werden kann. In diesem Fall kann es einfacher "
-"sein, die E-Mail-Ordner auf ein anderes Laufwerk zu kopieren, oder eine CD "
-"zu brennen."
+"Falls Sie Windows Vista*, Windows XP* oder Windows 2000* nutzen, so ist ihre "
+"Windows-Festplatte wahrscheinlich im NTFS-Format, welches von einigen Linux-"
+"Systemen nicht ohne zusätzliche Software gelesen werden kann. In diesem Fall "
+"kann es einfacher sein, die E-Mail-Ordner auf ein anderes Laufwerk zu "
+"kopieren, oder eine CD zu brennen."
 
-#: C/evolution.xml:6900(para)
+#: C/evolution.xml:6942(para)
 msgid ""
 "When you have your mail in a format Evolution can understand, reboot to "
 "Linux. Then continue with the following procedure. To create new folders for "
@@ -14069,85 +13938,87 @@ msgstr ""
 "verstanden wird, so starten Sie Linux. Fahren Sie dann mit folgenden "
 "Schritten fort: Um neue Ordner für Ihre Dateien zu erstellen:"
 
-#: C/evolution.xml:6903(para)
+#: C/evolution.xml:6945(para)
 msgid "Mount your Windows drive or the disk where you saved the mail files."
 msgstr ""
 "Binden Sie Ihr Windows-Laufwerk oder Ihre CD ein, auf der Sie Ihre E-Mail-"
 "Dateien gespeichert haben."
 
-#: C/evolution.xml:6906(para)
-msgid "Copy all the mail files into your home directory or another convenient place."
+#: C/evolution.xml:6948(para)
+msgid ""
+"Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 "Kopieren Sie alle E-Mail-Dateien in Ihr Heimatverzeichnis oder einen anderen "
 "gewünschten Ort."
 
-#: C/evolution.xml:6909(para)
+#: C/evolution.xml:6951(para)
 msgid "Start Evolution."
 msgstr "Starten Sie Evolution."
 
-#: C/evolution.xml:6912(para)
-msgid "Select File &gt; New Folder to create the folders you want."
+#: C/evolution.xml:6954(para)
+msgid "Select File &gt; New &gt; Mail Folder to create the folders you want."
 msgstr ""
-"Wählen Sie Datei &gt; Neu &gt; Verzeichnis um die von Ihnen gewünschten "
+"Wählen Sie Datei &gt; Neu &gt; E-Mail-Ordner um die von Ihnen gewünschten "
 "Ordner zu erstellen."
 
-#: C/evolution.xml:6915(para)
+#: C/evolution.xml:6957(para)
 msgid "To import the data files:"
 msgstr "Um die Dateien zu importieren:"
 
-#: C/evolution.xml:6918(para)
+#: C/evolution.xml:6960(para)
 msgid "In Evolution, open the File Import assistant by clicking File &gt; Import."
 msgstr ""
 "Öffnen Sie den Import-Assistenten in Evolution, indem Sie auf Datei &gt; "
 "Importieren klicken."
 
-#: C/evolution.xml:6921(para)
-msgid "Click Next, then select Import A Single File."
+#: C/evolution.xml:6963(para)
+msgid "Click Next, then select Import a single file."
 msgstr "Klicken Sie auf Vor, und wählen Sie Eine einzelne Datei importieren."
 
-#: C/evolution.xml:6924(para)
-msgid "Leave the file type as Automatic, then click Browse to select the data file."
+#: C/evolution.xml:6966(para)
+msgid "Click on the filechooser to select the data file."
 msgstr "Wählen Sie die Datei aus."
 
-#: C/evolution.xml:6925(para)
+#: C/evolution.xml:6967(para)
 msgid "Remember, the data files are the files that have no file extension."
 msgstr "Zur Erinnerung: Die Dateien sind Dateien die keine Dateiendung haben."
 
-#: C/evolution.xml:6928(para)
+#: C/evolution.xml:6970(para)
 msgid "Select the folder where you want to put the imported data file."
 msgstr "Wählen Sie den Ordner aus, in den die Daten importiert werden sollen."
 
-#: C/evolution.xml:6934(para)
+#: C/evolution.xml:6976(para)
 msgid "Repeat the import steps until you have imported all your mail."
 msgstr "Wiederholen Sie diese Schritte, bis all Ihre E-Mails importiert sind."
 
-#: C/evolution.xml:6942(para)
+#: C/evolution.xml:6984(para)
 msgid ""
 "You can print this section to use it as a quick reference for most of the "
-"things you want to do with Evolution™. You can also find this information by "
-"selecting Help &gt; Quick Reference in the Menubar."
+"things you want to do with <trademark>Evolution</trademark>. You can also "
+"find this information by selecting Help &gt; Quick Reference in the Menubar."
 msgstr ""
 "Sie können diesen Bereich drucken, um ihn als Kurzreferenz für die "
-"wichtigsten Dinge in Evolution&trade; benutzen. Sie können diese "
-"Informationen auch in der Menüleiste unter Hilfe &gt; Kurzreferenz aufrufen."
+"wichtigsten Dinge in <trademark>Evolution</trademark> benutzen. Sie können "
+"diese Informationen auch in der Menüleiste unter Hilfe &gt; Kurzreferenz "
+"aufrufen."
 
-#: C/evolution.xml:6945(link) C/evolution.xml:6959(title)
+#: C/evolution.xml:6987(link) C/evolution.xml:7001(title)
 msgid "Opening or Creating Items"
 msgstr "Öffnen und Erstellen von Elementen"
 
-#: C/evolution.xml:6948(link) C/evolution.xml:6984(title)
+#: C/evolution.xml:6990(link) C/evolution.xml:7026(title)
 msgid "Mail Tasks"
 msgstr "E-Mail-Aufgaben"
 
-#: C/evolution.xml:6954(link) C/evolution.xml:7034(title)
+#: C/evolution.xml:6996(link) C/evolution.xml:7076(title)
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: C/evolution.xml:6962(title)
+#: C/evolution.xml:7004(title)
 msgid "New Item:"
 msgstr "Neues Element:"
 
-#: C/evolution.xml:6963(para)
+#: C/evolution.xml:7005(para)
 msgid ""
 "Press Ctrl+N to open a new item for whatever part of Evolution you're "
 "working in. In mail, this means you create a new message. If you're looking "
@@ -14159,52 +14030,53 @@ msgstr ""
 "eine neue Nachricht, im Adressbuch erzeugt Steuerung+N einen neuen Kontakt, "
 "und im Kalender einen neuen Termin."
 
-#: C/evolution.xml:6966(title)
-msgid "Creating a New E-mail Message:"
+#: C/evolution.xml:7008(title)
+msgid "Creating a New Email Message:"
 msgstr "Eine neue E-Mail-Nachricht erzeugen:"
 
-#: C/evolution.xml:6967(para)
-msgid "Use File &gt; New &gt; Mail Message or Shift+Ctrl+M."
+#: C/evolution.xml:7009(para)
+msgid "Click File &gt; New &gt; Mail Message or Shift+Ctrl+M."
 msgstr ""
 "Klicken Sie auf Datei &gt; Neu &gt; E-Mail-Nachricht oder drücken Sie "
 "Umschalttaste+Steuerung+M."
 
-#: C/evolution.xml:6970(title) C/evolution.xml:7023(title)
+#: C/evolution.xml:7012(title) C/evolution.xml:7065(title)
 msgid "Creating a New Appointment:"
 msgstr "Einen neuen Termin erzeugen:"
 
-#: C/evolution.xml:6971(para) C/evolution.xml:7024(para)
-msgid "Use File &gt; New Appointment or Shift+Ctrl+A."
+#: C/evolution.xml:7013(para) C/evolution.xml:7066(para)
+msgid "Click File &gt; New &gt; Appointment or Shift+Ctrl+A."
 msgstr ""
 "Klicken Sie auf Datei &gt; Neu &gt; Termin oder drücken Sie Umschalttaste"
 "+Steuerung+A."
 
-#: C/evolution.xml:6974(title)
+#: C/evolution.xml:7016(title)
 msgid "Entering a New Contact:"
 msgstr "Einen neuen Kontakt eintragen:"
 
-#: C/evolution.xml:6975(para)
+#: C/evolution.xml:7017(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
-"address card. You can also use File &gt; New Contact or Shift+Ctrl+C."
+"address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C."
 msgstr ""
 "Doppelklicken Sie mit der linken Maustaste in einen freien Bereich in der "
 "Kontaktliste um einen neuen Kontakt hinzuzufügen. Sie können auch auf Datei "
 "&gt; Neu &gt; Kontakt klicken oder Umschalttaste+Steuerung+C drücken."
 
-#: C/evolution.xml:6978(title) C/evolution.xml:7028(title)
+#: C/evolution.xml:7020(title) C/evolution.xml:7070(title)
 msgid "Creating a New Task:"
 msgstr "Eine neue Aufgabe erstellen:"
 
-#: C/evolution.xml:6979(para)
-msgid "File &gt; New Task or Shift+Ctrl+T."
-msgstr "Datei &gt; Neu &gt; Aufgabe oder Umschalttaste+Steuerung+T."
+#: C/evolution.xml:7021(para) C/evolution.xml:7071(para)
+msgid "Click File &gt; New &gt; Task or Shift+Ctrl+T."
+msgstr ""
+"Klicken Sie auf Datei &gt; Neu &gt; Aufgabe oder Umschalttaste+Steuerung+T."
 
-#: C/evolution.xml:6986(title)
+#: C/evolution.xml:7028(title)
 msgid "Send and Receive Mail:"
 msgstr "Verschicken und Abrufen von E-Mails:"
 
-#: C/evolution.xml:6987(para)
+#: C/evolution.xml:7029(para)
 msgid ""
 "Press F9, click the Send/Receive button in the toolbar, or click File &gt; "
 "Send/Receive."
@@ -14212,11 +14084,11 @@ msgstr ""
 "Drücken Sie F9, klicken Sie auf den Verschicken/Abrufen-Knopf in der "
 "Werkzeugleiste, oder klicken Sie auf Datei &gt; Verschicken/Abrufen."
 
-#: C/evolution.xml:6990(title)
+#: C/evolution.xml:7032(title)
 msgid "Navigating the Message List with the Keyboard:"
 msgstr "Sich mit der Tastatur in der Nachrichtenliste bewegen:"
 
-#: C/evolution.xml:6991(para)
+#: C/evolution.xml:7033(para)
 msgid ""
 "Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the "
 "previous unread message. Use the arrow keys to move up and down in the list "
@@ -14228,21 +14100,21 @@ msgstr ""
 "gelangen. Benutzen Sie die Pfeiltasten, um sich in der Liste der Nachrichten "
 "hoch und hinunter zu bewegen."
 
-#: C/evolution.xml:6994(title)
+#: C/evolution.xml:7036(title)
 msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr "Die Anzeige in der Nachrichtenvorschau hoch und hinunter bewegen:"
 
-#: C/evolution.xml:6995(para)
+#: C/evolution.xml:7037(para)
 msgid "Press the Spacebar to move down a page. Press Backspace to move up a page."
 msgstr ""
 "Drücken Sie die Leertaste um sich hinunter zu bewegen. Drücken Sie die "
 "Löschen-Taste (Backspace) um sich hoch zu bewegen."
 
-#: C/evolution.xml:6998(title)
+#: C/evolution.xml:7040(title)
 msgid "Replying To a Message:"
 msgstr "Eine Nachricht beantworten:"
 
-#: C/evolution.xml:6999(para)
+#: C/evolution.xml:7041(para)
 msgid ""
 "To reply only to the sender of the message, click Reply in the toolbar, or "
 "press Ctrl+R."
@@ -14250,7 +14122,7 @@ msgstr ""
 "Um eine Nachricht an den Absender zu beantworten, klicken Sie auf Antworten "
 "in der Werkzeugleiste, oder drücken Sie Steuerung+R."
 
-#: C/evolution.xml:7001(para)
+#: C/evolution.xml:7043(para)
 msgid ""
 "To reply to the sender and all the other visible recipients of the message, "
 "click Reply to All or select the message and press Shift+Ctrl+R."
@@ -14259,11 +14131,11 @@ msgstr ""
 "beantworten, klicken Sie auf Antwort an alle in der Werkzeugleiste, oder "
 "drücken Sie Umschalttaste+Steuerung+R."
 
-#: C/evolution.xml:7003(title)
+#: C/evolution.xml:7045(title)
 msgid "Forwarding a Message:"
 msgstr "Eine Nachricht weiterleiten:"
 
-#: C/evolution.xml:7004(para)
+#: C/evolution.xml:7046(para)
 msgid ""
 "Select the message or messages you want to forward, then click Forward in "
 "the toolbar, or press Ctrl+F."
@@ -14271,11 +14143,11 @@ msgstr ""
 "Wählen Sie die Nachricht(en) die Sie weiterleiten möchten, und klicken Sie "
 "auf Weiterleiten in der Werkzeugleiste, oder drücken Sie Steuerung+F."
 
-#: C/evolution.xml:7007(title)
+#: C/evolution.xml:7049(title)
 msgid "Opening a Message In a New Window:"
 msgstr "Eine Nachricht in einem neuen Fenster öffnen:"
 
-#: C/evolution.xml:7008(para)
+#: C/evolution.xml:7050(para)
 msgid ""
 "Double-click the message you want to view, or select it and press Enter or "
 "Ctrl+O."
@@ -14283,11 +14155,11 @@ msgstr ""
 "Klicken Sie doppelt auf die Nachricht die Sie betrachten möchten, oder "
 "wählen Sie diese aus und drücken Sie die Eingabetaste oder Steuerung+O."
 
-#: C/evolution.xml:7011(title)
+#: C/evolution.xml:7053(title)
 msgid "Creating Filters and Search Folders:"
 msgstr "Filter und Suchordner erzeugen:"
 
-#: C/evolution.xml:7012(para)
+#: C/evolution.xml:7054(para)
 msgid ""
 "Right-click a message and select Create Rule From Message. You can also "
 "create filters and Search folders in the Edit menu."
@@ -14296,19 +14168,17 @@ msgstr ""
 "Regel aus Nachricht anlegen. Sie können auch Nachrichtenfilter und "
 "Suchordner im Bearbeiten-Menü erstellen."
 
-#: C/evolution.xml:7015(title)
+#: C/evolution.xml:7057(title)
 msgid "Adding a Sender to the Address Book:"
 msgstr "Einen Absender zum Adressbuch hinzufügen:"
 
-#: C/evolution.xml:7016(para)
-msgid ""
-"Right-click a message and select Add Sender to Address Book. You can also "
-"right-click on any e-mail address to add it to your address book."
+#: C/evolution.xml:7058(para)
+msgid "Right-click on any email address to add it to your address book."
 msgstr ""
 "Klicken Sie mit der rechten Maustaste auf eine E-Mail-Adresse und wählen Sie "
 "Zum Adressbuch hinzufügen."
 
-#: C/evolution.xml:7026(para)
+#: C/evolution.xml:7068(para)
 msgid ""
 "You can also click in any blank spot in the calendar and start typing to "
 "create a new appointment entry."
@@ -14316,25 +14186,19 @@ msgstr ""
 "Sie können auch in einen leeren Bereich des Kalenders klicken und Text "
 "eingeben, um einen neuen Kalendereintrag zu erzeugen."
 
-#: C/evolution.xml:7029(para)
-msgid "Use File &gt; New Task or Shift+Ctrl+T."
-msgstr ""
-"Wählen Sie Datei &gt; Neu &gt; Aufgabe oder drücken Sie Umschalttaste"
-"+Steuerung+T."
-
-#: C/evolution.xml:7036(title)
+#: C/evolution.xml:7078(title)
 msgid "Editing a Contact:"
 msgstr "Einen Kontakt bearbeiten:"
 
-#: C/evolution.xml:7037(para)
+#: C/evolution.xml:7079(para)
 msgid "Double-click the contact's address card to change details."
 msgstr "Klicken Sie doppelt auf eine Adresskarte um diese zu bearbeiten."
 
-#: C/evolution.xml:7040(title)
+#: C/evolution.xml:7082(title)
 msgid "Deleting a Contact:"
 msgstr "Einen Kontakt löschen:"
 
-#: C/evolution.xml:7041(para)
+#: C/evolution.xml:7083(para)
 msgid ""
 "Right-click a contact, then click Delete; or select a contact, then click "
 "Delete on the toolbar."
@@ -14343,21 +14207,21 @@ msgstr ""
 "Löschen aus; oder wählen Sie einen Kontakt aus und klicken Sie auf Löschen "
 "in der Werkzeugleiste."
 
-#: C/evolution.xml:7044(title)
-msgid "Sending E-mails to a Contact:"
+#: C/evolution.xml:7086(title)
+msgid "Sending Emails to a Contact:"
 msgstr "E-Mail an einen Kontakt senden:"
 
-#: C/evolution.xml:7045(para)
+#: C/evolution.xml:7087(para)
 msgid "Right-click a contact, then click Send Message to Contact."
 msgstr ""
 "Klicken Sie mit der rechten Maustaste auf einen Kontakt und wählen Sie dann "
 "Nachricht an Kontakt schicken."
 
-#: C/evolution.xml:7048(title)
+#: C/evolution.xml:7090(title)
 msgid "Creating a New Contact:"
 msgstr "Einen neuen Kontakt erzeugen:"
 
-#: C/evolution.xml:7049(para)
+#: C/evolution.xml:7091(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card, or right-click anywhere in the address book and select New "
@@ -14369,20 +14233,20 @@ msgstr ""
 "&gt; Neu &gt; Kontakt im Menü auswählen oder Umschalttaste+Steuerung+C "
 "drücken."
 
-#: C/evolution.xml:7056(para)
+#: C/evolution.xml:7098(para)
 msgid ""
-"Evolution™ bug tracking is done at the <ulink url=\"http://bugzilla.gnome.org"
-"\">GNOME bug tracking System</ulink>. You can use that, or the GNOME Bug "
-"Report Tool (known as bug-buddy at the command line) if you find bugs or "
-"want to request new features."
+"<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
+"\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
+"that, or the GNOME Bug Report Tool (known as bug-buddy at the command line) "
+"if you find bugs or want to request new features."
 msgstr ""
-"Die Verwaltung von Evolution&trade;-Fehlern findet in der <ulink url="
-"\"http://bugzilla.gnome.org\">GNOME-Fehlerdatenbank</ulink> statt. Um Fehler "
-"oder Anfragen für neue Funktionen einzureichen, können Sie diese Internet-"
-"Adresse oder das GNOME-Fehlerreport-Programm (»bug-"
-"buddy« auf der Befehlszeile) nutzen."
+"Die Verwaltung von <trademark>Evolution</trademark>-Fehlern findet in der "
+"<ulink url=\"http://bugzilla.gnome.org\">GNOME-Fehlerdatenbank</ulink> "
+"statt. Um Fehler oder Anfragen für neue Funktionen einzureichen, können Sie "
+"diese Internet-Adresse oder das GNOME-Fehlerreport-Programm (»bug-buddy« auf "
+"der Befehlszeile) nutzen."
 
-#: C/evolution.xml:7057(para)
+#: C/evolution.xml:7099(para)
 msgid ""
 "A complete list of feature requests and other issues with Evolution is "
 "available online in the GNOME bug tracking system. You can learn more about "
@@ -14395,25 +14259,17 @@ msgstr ""
 "projects/evolution/developer.shtml\">Entwicklerseite</ulink> (englisch) "
 "erfahren."
 
-#: C/evolution.xml:7058(para)
-msgid ""
-"If you need additional help with Evolution, visit the <ulink url=\"http://"
-"support.novell.com\">Novell® support site at</ulink>."
-msgstr ""
-"Falls Sie weitere Hilfe mit Evolution benötigen, so besuchen Sie die <ulink "
-"url=\"http://support.novell.com\">Novell&reg;-Hilfeseite</ulink>."
-
-#: C/evolution.xml:7063(para)
+#: C/evolution.xml:7104(para)
 msgid ""
-"Evolution was written by the Evolution™ team and numerous other dedicated "
-"GNOME programmers. You can see their names by clicking Help &gt; About from "
-"any Evolution window."
+"Evolution was written by the <trademark>Evolution</trademark> team and "
+"numerous other dedicated GNOME programmers. You can see their names by "
+"clicking Help &gt; About from the main Evolution window."
 msgstr ""
-"Evolution wurde geschrieben vom Evolution&trade;-Team und vielen weiteren "
-"GNOME-Programmierern. Sie können ihre Namen einsehen, indem Sie in Evolution "
-"auf Hilfe &gt; Info klicken."
+"Evolution wurde geschrieben vom <trademark>Evolution</trademark>-Team und "
+"vielen weiteren GNOME-Programmierern. Sie können ihre Namen einsehen, indem "
+"Sie in Evolution auf Hilfe &gt; Info klicken."
 
-#: C/evolution.xml:7064(para)
+#: C/evolution.xml:7105(para)
 msgid ""
 "The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar "
 "applications, and to KHTMLW. The developers of Evolution acknowledge the "
@@ -14424,69 +14280,68 @@ msgstr ""
 "Aufwendungen und Beisteuerungen aller, die an diesen Projekten gearbeitet "
 "haben."
 
-#: C/evolution.xml:7065(para)
+#: C/evolution.xml:7106(para)
 msgid ""
 "For more information please visit the Evolution <ulink url=\"http://www."
-"novell.com/products/desktop/features/evolution.html\">Web page</ulink>. "
-"Please send all comments, suggestions, and bug reports to the <ulink url="
-"\"http://bugzilla.gnome.com\">bug tracking database</ulink>. Instructions "
-"for submitting bug reports can be found on-line at the same location. You "
-"can also use the GNOME bug report tool, bug-buddy, to submit your defect "
-"reports."
+"gnome.org/projects/evolution\">Web page</ulink>. Please send all comments, "
+"suggestions, and bug reports to the <ulink url=\"http://bugzilla.gnome.org"
+"\">bug tracking database</ulink>. Instructions for submitting bug reports "
+"can be found on-line at the same location. You can also use the GNOME bug "
+"report tool, bug-buddy, to submit your defect reports."
 msgstr ""
 "Bitte besuchen Sie für weitere Informationen die <ulink url=\"http://www."
-"novell.com/products/desktop/features/evolution.html\">Evolution-"
-"Internetseite</ulink>. Bitte senden Sie jegliche Kommentare, Vorschläge und "
-"Fehlerberichte an die <ulink url=\"http://bugzilla.gnome.org\">GNOME-"
-"Fehlerverwaltung</ulink>. Anleitungen zur Erstellung von Fehlerberichten "
-"können online an der selben Stelle vorgefunden werden. Sie können auch das "
-"GNOME-Programm bug-buddy zum Berichten von Fehlermeldungen benutzen."
-
-#: C/evolution.xml:7066(para)
+"gnome.org/projects/evolution\">Evolution-Internetseite</ulink>. Bitte senden "
+"Sie jegliche Kommentare, Vorschläge und Fehlerberichte an die <ulink url="
+"\"http://bugzilla.gnome.org\">GNOME-Fehlerverwaltung</ulink>. Anleitungen "
+"zur Erstellung von Fehlerberichten können online an der selben Stelle "
+"vorgefunden werden. Sie können auch das GNOME-Programm bug-buddy zum "
+"Berichten von Fehlermeldungen benutzen."
+
+#: C/evolution.xml:7107(para)
 msgid "This manual was written by:"
 msgstr "Diese Anleitung wurde geschrieben von:"
 
-#: C/evolution.xml:7069(para)
+#: C/evolution.xml:7110(para)
 msgid "Radhika PC (pradhika@novell.com)"
 msgstr "Radhika PC (pradhika@novell.com)"
 
-#: C/evolution.xml:7072(para)
+#: C/evolution.xml:7113(para)
 msgid "Srinivasa Ragavan (sragavan@novell.com)"
 msgstr "Srinivasa Ragavan (sragavan@novell.com)"
 
-#: C/evolution.xml:7075(para)
+#: C/evolution.xml:7116(para)
 msgid "Andre Klapper (ak-47@gmx.net)"
 msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: C/evolution.xml:7078(para)
+#: C/evolution.xml:7119(para)
 msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 
-#: C/evolution.xml:7081(para)
+#: C/evolution.xml:7122(para)
 msgid "Mark Moulder (mmoulder@novell.com)"
 msgstr "Mark Moulder (mmoulder@novell.com)"
 
-#: C/evolution.xml:7084(para)
+#: C/evolution.xml:7125(para)
 msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
 
-#: C/evolution.xml:7087(para)
+#: C/evolution.xml:7128(para)
 msgid "Aaron Weber (aaron@ximian.com)"
 msgstr "Aaron Weber (aaron@ximian.com)"
 
-#: C/evolution.xml:7090(para)
+#: C/evolution.xml:7131(para)
 msgid "Kevin Breit (mrproper@ximian.com)"
 msgstr "Kevin Breit (mrproper@ximian.com)"
 
-#: C/evolution.xml:7093(para)
+#: C/evolution.xml:7134(para)
 msgid "Duncan Mak (duncan@ximian.com)"
 msgstr "Duncan Mak (duncan@ximian.com)"
 
-#: C/evolution.xml:7096(para)
+#: C/evolution.xml:7137(para)
 msgid "Ettore Perazzoli (ettore@ximian.com)"
 msgstr "Ettore Perazzoli (ettore@ximian.com)"
 
-#: C/evolution.xml:7099(para)
+#: C/evolution.xml:7140(para)
 msgid ""
 "With the help of the application programmers and the GNOME Documentation "
 "Project."
@@ -14494,11 +14349,11 @@ msgstr ""
 "Unter der Hilfe der Programmierer dieser Anwendung und des GNOME-"
 "Dokumentationsprojekts."
 
-#: C/evolution.xml:7102(para)
+#: C/evolution.xml:7143(para)
 msgid ""
 "Please file comments and suggestions for this manual as bugs in the GNOME "
 "bug tracking system. If you contributed to this project but do not see your "
-"name here, please contact Radhika PC (pradhika@novell.com) or Sreenivasa "
+"name here, please contact Radhika PC (pradhika@novell.com) or Srinivasa "
 "Ragavan (sragavan@novell.com) and either of them will list you."
 msgstr ""
 "Bitte berichten Sie Kommentare und Vorschläge zu diesem Handbuch an das "
@@ -14507,41 +14362,41 @@ msgstr ""
 "(pradhika@novell.com) oder Srinivasa Ragavan (sragavan@novell.com), damit "
 "Sie hinzugefügt werden können."
 
-#: C/evolution.xml:7103(para)
+#: C/evolution.xml:7144(para)
 msgid ""
 "Partial list of Documentation Translators (application translated to "
 "numerous additional languages):"
 msgstr "Unvollständige Liste der Übersetzer dieser Dokumentation:"
 
-#: C/evolution.xml:7106(para)
+#: C/evolution.xml:7147(para)
 msgid "Daniel Persson for Swedish (.se)"
 msgstr "Daniel Persson für Swedisch (.se)"
 
-#: C/evolution.xml:7109(para)
+#: C/evolution.xml:7150(para)
 msgid "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
 msgstr "Hector Garcia Alvarez und Francisco Javier F. Serrador für Spanisch (.es)"
 
-#: C/evolution.xml:7112(para)
+#: C/evolution.xml:7153(para)
 msgid "Kjartan Maraas for Norwegian (.no)"
 msgstr "Kjartan Maraas für Norwegisch (.no)"
 
-#: C/evolution.xml:7115(para)
+#: C/evolution.xml:7156(para)
 msgid "Sergey V. Mironov for Russian (.ru)"
 msgstr "Sergey V. Mironov für Russisch (.ru)"
 
-#: C/evolution.xml:7122(para)
+#: C/evolution.xml:7163(para)
 msgid ""
 "This glossary contains terms that are frequently used in this guide as well "
-"as in Evolution™."
+"as in <trademark>Evolution</trademark>."
 msgstr ""
-"Dieses Glossar enthält Begriffe, die in Evolution&trade; und in diesem "
-"Handbuch oft benutzt werden."
+"Dieses Glossar enthält Begriffe, die in <trademark>Evolution</trademark> und "
+"in diesem Handbuch oft benutzt werden."
 
-#: C/evolution.xml:7124(glossterm)
+#: C/evolution.xml:7165(glossterm)
 msgid "Assistant"
 msgstr "Assistent"
 
-#: C/evolution.xml:7126(para)
+#: C/evolution.xml:7167(para)
 msgid ""
 "A tool that guides a user through a series of steps, usually to configure or "
 "set up a program. Equivalent to Wizard and Druid."
@@ -14549,37 +14404,31 @@ msgstr ""
 "Eine Hilfe ,die den Benutzer durch mehrere Schritten leitet, oftmals um ein "
 "Programm einzurichten."
 
-#: C/evolution.xml:7130(glossterm)
+#: C/evolution.xml:7171(glossterm)
 msgid "attachment"
 msgstr "Anhang"
 
-#: C/evolution.xml:7132(para)
+#: C/evolution.xml:7173(para)
 msgid ""
-"Any file sent with an e-mail. Attachments can be embedded in a message or "
+"Any file sent with an email. Attachments can be embedded in a message or "
 "appended to it."
 msgstr ""
 "Jede Datei, die mit einer E-Mail verschickt wird. Anhänge können in eine "
-"nachricht eingebettet sein oder angehängt werden."
+"Nachricht eingebettet sein oder angehängt werden."
 
-#: C/evolution.xml:7136(glossterm)
+#: C/evolution.xml:7177(glossterm)
 msgid "automatic indexing"
 msgstr "Automatische Indexierung"
 
-#: C/evolution.xml:7138(para)
-msgid ""
-"A pre-downloading procedure that allows Novell® Evolution™ to quickly refer "
-"to data. It enables faster searches and decreases memory usage for data "
-"displays."
+#: C/evolution.xml:7179(para)
+msgid "A feature which allows Evolution to quickly find and sort data."
 msgstr ""
-"Eine Funktion, die es Evolution&trade; gestattet, Daten "
-"schneller aufzufinden, wodurch schnellere Suchen und geringerer "
-"Speicherverbrauch nötig sind, um die Daten darzustellen."
 
-#: C/evolution.xml:7142(glossterm)
+#: C/evolution.xml:7183(glossterm)
 msgid "Bcc (Blind Carbon Copy)"
 msgstr "Bcc (Blindkopie)"
 
-#: C/evolution.xml:7144(para)
+#: C/evolution.xml:7185(para)
 msgid ""
 "Blind copy recipients (Bcc) receive a copy of an item. Other recipients "
 "receive no information about blind copies. Only the sender and the blind "
@@ -14592,11 +14441,11 @@ msgstr ""
 "Empfänger antworten und Antwort an alle wählt, so erhält der Blindkopie-"
 "Empfänger diese Antwort nicht."
 
-#: C/evolution.xml:7148(glossterm)
+#: C/evolution.xml:7189(glossterm)
 msgid "Cc (Carbon Copy)"
 msgstr "Cc (Kopie)"
 
-#: C/evolution.xml:7150(para)
+#: C/evolution.xml:7191(para)
 msgid ""
 "Carbon copy recipients (CC) receive a copy of an item. CC recipients are "
 "users who would benefit from the information in an item, but are not "
@@ -14607,11 +14456,11 @@ msgstr ""
 "sehen, dass die Nachricht in Kopie verschickt wurde. Die Empfänger können "
 "auch alle Namen der Kopie-Empfänger sehen."
 
-#: C/evolution.xml:7154(glossterm)
+#: C/evolution.xml:7195(glossterm)
 msgid "conduit"
 msgstr "Conduit"
 
-#: C/evolution.xml:7156(para)
+#: C/evolution.xml:7197(para)
 msgid ""
 "A small application that controls the transfer of data between a handheld "
 "device and a desktop computer."
@@ -14619,15 +14468,15 @@ msgstr ""
 "Eine kleine Anwendung die den Datentransfer zwischen einem PC und einem "
 "tragbaren Gerät sicherstellt."
 
-#: C/evolution.xml:7162(para)
+#: C/evolution.xml:7203(para)
 msgid "The GNOME groupware application."
 msgstr "Die Groupware-Anwendung des GNOME-Desktops."
 
-#: C/evolution.xml:7166(glossterm)
+#: C/evolution.xml:7207(glossterm)
 msgid "execute"
 msgstr "Ausführen"
 
-#: C/evolution.xml:7168(para)
+#: C/evolution.xml:7209(para)
 msgid ""
 "To run a program. Any file that can be run is called an executable. "
 "Evolution can download executable attachments, but before they can be run, "
@@ -14645,11 +14494,11 @@ msgstr ""
 "ausführbare Programme und Datei-Zugriffsrechte siehe die Dokumentation des "
 "Datei-Managers oder der Kommandozeile."
 
-#: C/evolution.xml:7172(glossterm)
+#: C/evolution.xml:7213(glossterm)
 msgid "expunge"
 msgstr "Säubern"
 
-#: C/evolution.xml:7174(para)
+#: C/evolution.xml:7215(para)
 msgid ""
 "When messages are marked for deletion, they remain until they are expunged. "
 "When a message is expunged, it is permanently deleted, as long as it was "
@@ -14659,11 +14508,11 @@ msgstr ""
 "diese Nachrichten bestehen bis der Ordner gesäubert wird und die Nachricht "
 "für immer gelöscht wird."
 
-#: C/evolution.xml:7178(glossterm)
+#: C/evolution.xml:7219(glossterm)
 msgid "file tree"
 msgstr "Dateibaum"
 
-#: C/evolution.xml:7180(para)
+#: C/evolution.xml:7221(para)
 msgid ""
 "A way of describing a group of files on a computer. The top of the tree is "
 "called the root directory, and is denoted by <command>/</command>. The rest "
@@ -14678,11 +14527,11 @@ msgstr ""
 "Benutzerkonto (Administrator-Konto) oder dem Heimatverzeichnis des root-"
 "Benutzers, normalerweise <command>/root</command>."
 
-#: C/evolution.xml:7184(glossterm)
+#: C/evolution.xml:7225(glossterm)
 msgid "filter"
 msgstr "Filter"
 
-#: C/evolution.xml:7186(para)
+#: C/evolution.xml:7227(para)
 msgid ""
 "Within Evolution, a filter is a method of sorting mail automatically when it "
 "is downloaded. You can create filters to perform one or more actions on a "
@@ -14693,42 +14542,42 @@ msgstr ""
 "Aktionen mit einer Nachricht durchzuführen, die auf eine (oder alle) von "
 "Ihnen ausgewählten Kriterien zutrifft."
 
-#: C/evolution.xml:7190(glossterm)
+#: C/evolution.xml:7231(glossterm)
 msgid "forward"
 msgstr "Weiterleitung"
 
-#: C/evolution.xml:7192(para)
+#: C/evolution.xml:7233(para)
 msgid ""
-"Forwards a copy of the message and any additional comments to a different e-"
-"mail address."
+"Forwards a copy of the message and any additional comments to a different "
+"email address."
 msgstr ""
 "Leitet eine Kopie einer Nachricht und hinzugefügte Kommentare an eine andere "
 "E-Mail-Adresse weiter."
 
-#: C/evolution.xml:7196(glossterm)
+#: C/evolution.xml:7237(glossterm)
 msgid "groupware"
 msgstr "Groupware"
 
-#: C/evolution.xml:7198(para)
+#: C/evolution.xml:7239(para)
 msgid ""
 "A term describing an application that helps groups of people work together. "
 "Typically, a groupware application has several productivity features built "
-"into one program, including e-mail, calendar, and address book tools."
+"into one program, including email, calendar, and address book tools."
 msgstr ""
 "Eine Anwendung die dabei hilft, dass Gruppen von Personen zusammenarbeiten "
 "können. Typischerweise besteht eine Groupware-Anwendung aus mehreren "
 "Funktionen die in einem Programm vorhanden sind, zum Beispiel E-Mail-, "
 "Kalender- und Adressbuchfunktionen."
 
-#: C/evolution.xml:7202(glossterm)
+#: C/evolution.xml:7243(glossterm)
 msgid "HTML"
 msgstr "HTML"
 
-#: C/evolution.xml:7204(para)
+#: C/evolution.xml:7245(para)
 msgid ""
 "Hypertext Markup Language (HTML) is a language for describing page layout in "
-"electronic documents such as Web pages, help files, and e-mail messages. "
-"HTML can be used in e-mail and news posts to insert images and apply text "
+"electronic documents such as Web pages, help files, and email messages. HTML "
+"can be used in email and news posts to insert images and apply text "
 "treatments."
 msgstr ""
 "Hypertext Markup Language (HTML) ist eine Sprache um das Aussehen von Seiten "
@@ -14736,23 +14585,23 @@ msgstr ""
 "Hilfedateien, und E-Mail-Nachrichten. HTML kann in E-Mails und News-Postings "
 "genutzt werden, um Bilder einzufügen und das Aussehen von Text zu verändern."
 
-#: C/evolution.xml:7208(glossterm)
+#: C/evolution.xml:7249(glossterm)
 msgid "iCal"
 msgstr "iCal"
 
-#: C/evolution.xml:7210(para)
+#: C/evolution.xml:7251(para)
 msgid "iCal is a protocol that Evolution uses to manage the calendar section."
 msgstr ""
 "iCal ist ein Protokoll, welches von Evolution zur Verwaltung der Kalender "
 "genutzt wird."
 
-#: C/evolution.xml:7214(glossterm)
+#: C/evolution.xml:7255(glossterm)
 msgid "IMAP"
 msgstr "IMAP"
 
-#: C/evolution.xml:7216(para)
+#: C/evolution.xml:7257(para)
 msgid ""
-"Internet Mail Access Protocol. It allows access to e-mail that is typically "
+"Internet Mail Access Protocol. It allows access to email that is typically "
 "stored remotely on a server rather than on a local hard disk. Often "
 "contrasted with POP."
 msgstr ""
@@ -14760,11 +14609,11 @@ msgstr ""
 "welche typischerweise auf einem entfernten Server anstelle der eigenen "
 "lokalen Festplatte gespeichert werden, im Gegensatz zu POP."
 
-#: C/evolution.xml:7220(glossterm)
+#: C/evolution.xml:7261(glossterm)
 msgid "inline"
 msgstr "eingebettet"
 
-#: C/evolution.xml:7222(para)
+#: C/evolution.xml:7263(para)
 msgid ""
 "Displayed as part of a message or other document, rather than attached as a "
 "separate file. Contrast with <emphasis>attachment</emphasis>."
@@ -14772,11 +14621,11 @@ msgstr ""
 "Als Teil der Nachricht dargestellt, und nicht als Anhang in einer seperaten "
 "Datei. Gegensatz zu <emphasis>Anhang</emphasis>."
 
-#: C/evolution.xml:7226(glossterm)
+#: C/evolution.xml:7267(glossterm)
 msgid "LDAP"
 msgstr "LDAP"
 
-#: C/evolution.xml:7228(para)
+#: C/evolution.xml:7269(para)
 msgid ""
 "Lightweight Directory Access Protocol. Allows a client to search through a "
 "large database of addresses, phone numbers, and people stored on a server."
@@ -14784,13 +14633,13 @@ msgstr ""
 "Lightweight Directory Access Protocol. Erlaubt einer Anwendung in einer "
 "großen Server-Datenbank mit Adressen, Telefonnummern und Personen zu suchen"
 
-#: C/evolution.xml:7232(glossterm)
+#: C/evolution.xml:7273(glossterm)
 msgid "mail client"
 msgstr "E-Mail-Anwendung"
 
-#: C/evolution.xml:7234(para)
+#: C/evolution.xml:7275(para)
 msgid ""
-"The application with which a person reads and sends e-mail. Its counterparts "
+"The application with which a person reads and sends email. Its counterparts "
 "are the various types of mail servers, which handle user authentication and "
 "direct messages from the sender to the recipient."
 msgstr ""
@@ -14799,13 +14648,13 @@ msgstr ""
 "Benutzerlegitimation handhaben und die Nachrichten vom Absender an den "
 "Empfänger weiterleiten."
 
-#: C/evolution.xml:7238(glossterm)
+#: C/evolution.xml:7279(glossterm)
 msgid "POP"
 msgstr "POP"
 
-#: C/evolution.xml:7240(para)
+#: C/evolution.xml:7281(para)
 msgid ""
-"Post Office Protocol. A mechanism for e-mail transport. In contrast to IMAP, "
+"Post Office Protocol. A mechanism for email transport. In contrast to IMAP, "
 "it is used only to get mail from a server and store it locally on your hard "
 "disk."
 msgstr ""
@@ -14813,15 +14662,15 @@ msgstr ""
 "Unterschied zu IMAP werden E-Mails vom Server abgerufen und lokal auf der "
 "Festplatte gespeichert."
 
-#: C/evolution.xml:7244(glossterm)
+#: C/evolution.xml:7285(glossterm)
 msgid "protocol"
 msgstr "Protokoll"
 
-#: C/evolution.xml:7246(para)
+#: C/evolution.xml:7287(para)
 msgid ""
 "An agreed-upon method of communication, especially one for sending "
 "particular types of information between computer systems. Examples include "
-"POP (Post Office Protocol), for e-mail, and HTTP (HypterText Transfer "
+"POP (Post Office Protocol), for email, and HTTP (HyperText Transfer "
 "Protocol) for Web pages."
 msgstr ""
 "Eine akzeptierte Kommunikationsmethode, besonders um verschiedene Arten von "
@@ -14829,11 +14678,11 @@ msgstr ""
 "Office Protocol) für das Abrufen von E-Mails oder HTTP (Hypertext Transfer "
 "Protocol) zum Abrufen von Internetseiten."
 
-#: C/evolution.xml:7250(glossterm)
+#: C/evolution.xml:7291(glossterm)
 msgid "public key encryption"
 msgstr "Öffentlicher-Schlüssel-Verschlüsselung"
 
-#: C/evolution.xml:7252(para)
+#: C/evolution.xml:7293(para)
 msgid ""
 "A strong encryption method that uses a set of two keys, one of which is made "
 "public, and one of which is kept private. Data encrypted using the public "
@@ -14846,32 +14695,33 @@ msgstr ""
 "privaten Schlüssel entschlüsselt werden. Je länger der Schlüssel ist, desto "
 "schwieriger ist es die Verschlüsselung zu umgehen."
 
-#: C/evolution.xml:7256(glossterm)
+#: C/evolution.xml:7297(glossterm)
 msgid "regular expression"
 msgstr "Regulärer Ausdruck (Regex)"
 
-#: C/evolution.xml:7258(para)
+#: C/evolution.xml:7299(para)
 msgid ""
 "A regular expression (regex) is a way of describing a string of text using "
 "metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
-"means any phrase beginning with “fly” and ending in “soup” or “soap”. If you "
-"searched for that expression, you'd find both “fly in my soup” and “fly in "
-"my soap.” For more information, enter <command>man grep</command> from the "
-"command line."
+"means any phrase beginning with <quote>fly</quote> and ending in "
+"<quote>soup</quote> or <quote>soap.</quote> If you searched for that "
+"expression, you'd find both <quote>fly in my soup</quote> and <quote>fly in "
+"my soap.</quote> For more information, enter <command>man grep</command> "
+"from the command line."
 msgstr ""
 "Ein regulärer Ausdruck (Regex) beschreibt einen Text durch Metabuchstaben "
 "und Jokerzeichen-Symbole. Zum Beispiel bedeutet der Ausdruck fly.*so[au]p "
-"jeglichen Text der mit &ldquo;fly&rdquo; beginnt und mit &ldquo;soup&rdquo; "
-"oder &ldquo;soap&rdquo; endet. Wenn Sie nach diesem Ausdruck suchen, würden "
-"Sie sowohl &ldquo;fly in my soup&rdquo; als auch &ldquo;fly in my soap."
-"&rdquo; finden. Für weitere (englischsprachige) Informationen, geben Sie "
-"<command>man grep</command> auf der Kommandozeile ein."
+"jeglichen Text der mit <quote>fly</quote> beginnt und mit <quote>soup</"
+"quote> oder <quote>soap</quote> endet. Wenn Sie nach diesem Ausdruck suchen, "
+"würden Sie sowohl <quote>fly in my soup</quote> als auch <quote>fly in my "
+"soap.</quote> finden. Für weitere (englischsprachige) Informationen, geben "
+"Sie <command>man grep</command> auf der Kommandozeile ein."
 
-#: C/evolution.xml:7262(glossterm)
+#: C/evolution.xml:7303(glossterm)
 msgid "script"
 msgstr "Skript"
 
-#: C/evolution.xml:7264(para)
+#: C/evolution.xml:7305(para)
 msgid ""
 "A program written in an interpreted (rather than compiled) language. Often "
 "used as a synonym for macro, to denote a series of prerecorded commands or "
@@ -14885,11 +14735,11 @@ msgstr ""
 "lästige Aufgaben zu vereinfachende, und damit der Benutzer Zeit einsparen "
 "kann."
 
-#: C/evolution.xml:7268(glossterm)
+#: C/evolution.xml:7309(glossterm)
 msgid "search base"
 msgstr "Suchbasis"
 
-#: C/evolution.xml:7270(para)
+#: C/evolution.xml:7311(para)
 msgid ""
 "LDAP can break contact lists into many groups. The search base tells LDAP "
 "the top group to use. How much of the Search Base to search is set by the "
@@ -14899,32 +14749,33 @@ msgstr ""
 "die von LDAP zu benutzende oberste Gruppe. Wieviel des Suchbereichs "
 "durchsucht wird, wird durch den Suchumfang definiert."
 
-#: C/evolution.xml:7274(glossterm)
+#: C/evolution.xml:7315(glossterm)
 msgid "search folder"
 msgstr "Suchordner"
 
-#: C/evolution.xml:7276(para)
+#: C/evolution.xml:7317(para)
+#, fuzzy
 msgid ""
-"An e-mail organization tool. Search folders allow you to create a folder "
-"that contains the results of a complex search. Search folder contents are "
-"updated dynamically."
+"An email organization tool. Search folders allow you to create a folder that "
+"contains the results of a complex search. Search folder contents are updated "
+"dynamically."
 msgstr ""
 "Suchordner sind Ordner, welche die Ergebnisse einer Suche anzeigen. Die "
 "Inhalte von Suchordnern werden dynamisch aktualisiert."
 
-#: C/evolution.xml:7280(glossterm)
+#: C/evolution.xml:7321(glossterm)
 msgid "search scope"
 msgstr "Suchbereich"
 
-#: C/evolution.xml:7282(para)
+#: C/evolution.xml:7323(para)
 msgid "Search Scope states how much of the search base to search."
 msgstr "Der Suchbereich definiert, wieviel der Suchbasis durchsucht werden soll."
 
-#: C/evolution.xml:7286(glossterm)
+#: C/evolution.xml:7327(glossterm)
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: C/evolution.xml:7288(para)
+#: C/evolution.xml:7329(para)
 msgid ""
 "A program that sends mail. Evolution can use it instead of SMTP; some people "
 "prefer it because it offers more flexibility; however, it is more difficult "
@@ -14934,11 +14785,11 @@ msgstr ""
 "von SMTP versenden; einige Menschen bevorzugen Sendmail da dies mehr "
 "Flexibilität bietet, allerdings ist es schwieriger einzustellen."
 
-#: C/evolution.xml:7292(glossterm)
+#: C/evolution.xml:7333(glossterm)
 msgid "switcher"
 msgstr "Seitenleiste"
 
-#: C/evolution.xml:7294(para)
+#: C/evolution.xml:7335(para)
 msgid ""
 "An area of Evolution that offers users fast access to the most frequently "
 "used features of the application."
@@ -14946,13 +14797,13 @@ msgstr ""
 "Der Bereich in Evolution, welcher schnellen Zugriff auf die meistgenutzten "
 "Funktionen der Anwendung bietet."
 
-#: C/evolution.xml:7298(glossterm)
+#: C/evolution.xml:7339(glossterm)
 msgid "signature"
 msgstr "Signatur"
 
-#: C/evolution.xml:7300(para)
+#: C/evolution.xml:7341(para)
 msgid ""
-"Text placed at the end of every e-mail sent, similar to a hand-written "
+"Text placed at the end of every email sent, similar to a hand-written "
 "signature at the bottom of a written letter. A signature can be anything "
 "from a favorite quotation to a link to a Web page; courtesy dictates that it "
 "be fewer than four lines long."
@@ -14962,11 +14813,11 @@ msgstr ""
 "kann sowohl ein Lieblingszitat als auch ein Verweis zu einer Internet-Seite "
 "sein; Signaturen sollte kürzer als vier Zeilen sein."
 
-#: C/evolution.xml:7304(glossterm)
+#: C/evolution.xml:7345(glossterm)
 msgid "SMTP"
 msgstr "SMTP"
 
-#: C/evolution.xml:7306(para)
+#: C/evolution.xml:7347(para)
 msgid ""
 "Simple Mail Transfer Protocol. The most common way of transporting mail "
 "messages from your computer to the server."
@@ -14974,11 +14825,11 @@ msgstr ""
 "Simple Mail Transfer Protocol. Der meistverbreitete Weg um E-Mails von einem "
 "Computer zu einem Server zu übertragen."
 
-#: C/evolution.xml:7310(glossterm)
+#: C/evolution.xml:7351(glossterm)
 msgid "tooltip"
 msgstr "Minihilfe"
 
-#: C/evolution.xml:7312(para)
+#: C/evolution.xml:7353(para)
 msgid ""
 "A small box of explanatory text that appears when the mouse pointer is held "
 "over a button or other interface element."
@@ -14986,11 +14837,11 @@ msgstr ""
 "Ein kleines Feld mit einem erklärenden Text, welches ersscheint wenn sich "
 "der Mauszeiger über einem Knopf oder Schalter befindet."
 
-#: C/evolution.xml:7316(glossterm)
+#: C/evolution.xml:7357(glossterm)
 msgid "virus"
 msgstr "Virus"
 
-#: C/evolution.xml:7318(para)
+#: C/evolution.xml:7359(para)
 msgid ""
 "A program that inserts itself into other files or programs. When executed, "
 "it spreads to more programs and other computers. A virus can cause "
@@ -15002,24 +14853,24 @@ msgstr ""
 "kann. Ein Virus kann empfindliche Schäden anrichten durch das Verstopfen von "
 "Netzwerken, das Löschen von Dateien oder das Erzeugen von Sicherheitslücken."
 
-#: C/evolution.xml:7322(glossterm)
+#: C/evolution.xml:7363(glossterm)
 msgid "vCard"
 msgstr "vCard"
 
-#: C/evolution.xml:7324(para)
+#: C/evolution.xml:7365(para)
 msgid ""
 "A file format for the exchange of contact information. When you get an "
-"address card attached to an e-mail, it is probably in vCard format."
+"address card attached to an email, it is probably in vCard format."
 msgstr ""
 "Ein Dateiformat um Kontaktinformationen auszutauschen. Falls Sie eine "
 "Adresskarte als Anhang einer E-Mail erhalten, so ist diese wahrscheinlich im "
 "vCard-Format."
 
-#: C/evolution.xml:7330(title)
+#: C/evolution.xml:7371(title)
 msgid "Legal Notices"
 msgstr "Rechtliche Hinweise"
 
-#: C/evolution.xml:7332(member)
+#: C/evolution.xml:7373(member)
 msgid ""
 "Novell, Inc. makes no representations or warranties with respect to the "
 "contents or use of this documentation, and specifically disclaims any "
@@ -15035,7 +14886,7 @@ msgstr ""
 "publication and to make changes to its content, at any time, without "
 "obligation to notify any person or entity of such revisions or changes."
 
-#: C/evolution.xml:7333(member)
+#: C/evolution.xml:7374(member)
 msgid ""
 "Further, Novell, Inc. makes no representations or warranties with respect to "
 "any software, and specifically disclaims any express or implied warranties "
@@ -15051,7 +14902,7 @@ msgstr ""
 "software, at any time, without any obligation to notify any person or entity "
 "of such changes."
 
-#: C/evolution.xml:7336(member)
+#: C/evolution.xml:7377(member)
 msgid ""
 "You may not use, export, or re-export this product in violation of any "
 "applicable laws or regulations including, without limitation, U.S. export "
@@ -15061,24 +14912,24 @@ msgstr ""
 "applicable laws or regulations including, without limitation, U.S. export "
 "regulations or the laws of the country in which you reside."
 
-#: C/evolution.xml:7339(member)
+#: C/evolution.xml:7380(member)
 msgid ""
-"Copyright © 2007 Novell, Inc. All rights reserved. Permission is granted to "
-"copy, distribute, and/or modify this document under the terms of the GNU "
-"Free Documentation License (GFDL), Version 1.2 or any later version, "
-"published by the Free Software Foundation with no Invariant Sections, no "
-"Front-Cover Texts, and no Back-Cover Texts. A copy of the GFDL can be found "
-"at http://www.fsf.org/licenses/fdl.html."
+"Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/"
+"or modify this document under the terms of the GNU Free Documentation "
+"License (GFDL), Version 1.2 or any later version, published by the Free "
+"Software Foundation with no Invariant Sections, no Front-Cover Texts, and no "
+"Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/"
+"licenses/fdl.html."
 msgstr ""
-"Copyright &copy; 2007 Novell, Inc. All rights reserved. Kopieren, Verbreiten "
-"und/oder Modifizieren ist unter den Bedingungen der GNU Free Documentation "
+"Copyright 2007 Novell, Inc. All rights reserved. Kopieren, Verbreiten und/"
+"oder Modifizieren ist unter den Bedingungen der GNU Free Documentation "
 "License (GFDL), Version 1.2 oder einer späteren Version, veröffentlicht von "
 "der Free Software Foundation, erlaubt. Es gibt keine unveränderlichen "
 "Abschnitte, keinen vorderen Umschlagtext und keinen hinteren Umschlagtext. "
 "Eine Kopie des Lizenztextes ist unter http://www.fsf.org/licenses/fdl.html "
 "erhältlich."
 
-#: C/evolution.xml:7340(member)
+#: C/evolution.xml:7381(member)
 msgid ""
 "THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE "
 "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
@@ -15088,7 +14939,7 @@ msgstr ""
 "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
 "THAT:"
 
-#: C/evolution.xml:7341(member)
+#: C/evolution.xml:7382(member)
 msgid ""
 "1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY "
 "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
@@ -15114,7 +14965,7 @@ msgstr ""
 "ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
 "OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
 
-#: C/evolution.xml:7342(member)
+#: C/evolution.xml:7383(member)
 msgid ""
 "2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
 "(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
@@ -15138,31 +14989,31 @@ msgstr ""
 "RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN "
 "IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
 
-#: C/evolution.xml:7345(member)
+#: C/evolution.xml:7386(member)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
-#: C/evolution.xml:7346(member)
+#: C/evolution.xml:7387(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404 Wyman Street, Suite 500"
 
-#: C/evolution.xml:7347(member)
+#: C/evolution.xml:7388(member)
 msgid "Waltham, MA 02451"
 msgstr "Waltham, MA 02451"
 
-#: C/evolution.xml:7348(member)
+#: C/evolution.xml:7389(member)
 msgid "U.S.A."
 msgstr "U.S.A."
 
-#: C/evolution.xml:7349(member)
+#: C/evolution.xml:7390(member)
 msgid "www.novell.com"
 msgstr "www.novell.com"
 
-#: C/evolution.xml:7352(para)
+#: C/evolution.xml:7393(para)
 msgid "July 2007"
 msgstr "Juli 2007"
 
-#: C/evolution.xml:7354(member)
+#: C/evolution.xml:7395(member)
 msgid ""
 "To access the online documentation for this and other Novell products, and "
 "to get updates, see www.novell.com/documentation"
@@ -15170,11 +15021,11 @@ msgstr ""
 "Um auf die Online-Dokumentation dieses und anderer Novell-Produkte "
 "zuzugreifen sowie Updates zu erhalten siehe www.novell.com/documentation"
 
-#: C/evolution.xml:7357(member)
+#: C/evolution.xml:7398(member)
 msgid "Evolution is a trademark of Novell, Inc."
 msgstr "Evolution ist ein Warenzeichen von Novell, Inc."
 
-#: C/evolution.xml:7358(member)
+#: C/evolution.xml:7399(member)
 msgid ""
 "GroupWise is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15182,7 +15033,7 @@ msgstr ""
 "GroupWise ist ein registriertes Warenzeichen von Novell, Inc. in den USA und "
 "anderen Staaten."
 
-#: C/evolution.xml:7359(member)
+#: C/evolution.xml:7400(member)
 msgid ""
 "Novell is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15190,11 +15041,11 @@ msgstr ""
 "Novell ist ein registriertes Warenzeichen von Novell, Inc. in den USA und "
 "anderen Staaten."
 
-#: C/evolution.xml:7360(member)
+#: C/evolution.xml:7401(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
 msgstr "SUSE ist ein registriertes Warenzeichen der SUSE AG, einer Novell-Firma."
 
-#: C/evolution.xml:7361(member)
+#: C/evolution.xml:7402(member)
 msgid ""
 "Ximian is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15202,12 +15053,714 @@ msgstr ""
 "Ximian ist ein registriertes Warenzeichen von Novell, Inc. in den USA und "
 "anderen Staaten."
 
-#: C/evolution.xml:7364(member)
+#: C/evolution.xml:7405(member)
 msgid "All third-party trademarks are the property of their respective owners."
-msgstr "Alle Warenzeichen von Drittparteien sind Eigentum ihrer jeweiligen Besitzer."
+msgstr ""
+"Alle Warenzeichen von Drittparteien sind Eigentum ihrer jeweiligen Besitzer."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: C/evolution.xml:0(None)
 msgid "translator-credits"
 msgstr "Andre Klapper <ak-47@gmx.net>, 2007, 2008"
 
+#~ msgid "Connecting to Hula"
+#~ msgstr "Mit Hula verbinden"
+
+#~ msgid "Hula:"
+#~ msgstr "Hula:"
+
+#~ msgid ""
+#~ "Select this option if you want to use a Hula account. Evolution provides "
+#~ "you connectivity to <trademark class=\"registered\">Hula</trademark> "
+#~ "servers through IMAP and calendaring support through CalDAV. For more "
+#~ "information refer <link linkend=\"b1012tkg\">Connecting to Hula</link>."
+#~ msgstr ""
+#~ "Wählen Sie diese Option, falls Sie sich mit einem Hula-Server verbinden "
+#~ "wollen. Evolution bietet Zugriff auf Hula&reg;-Server per IMAP und "
+#~ "Kalender-Zugriff per CalDAV. Für weitere Informationen siehe <link "
+#~ "linkend=\"b1012tkg\">Mit Hula verbinden</link>."
+
+#~ msgid "You can perform an advanced search based on any of the search type."
+#~ msgstr ""
+#~ "Sie können auch eine erweiterte Suche basierend auf den zuvor genannten "
+#~ "Suchtypen durchführen (also eine Suche innerhalb des vorherigen "
+#~ "Suchergebnisses)."
+
+#~ msgid "Select the criteria, then type a search entry in the given field."
+#~ msgstr ""
+#~ "Wählen Sie die Suchkriterien aus und geben Sie danach einen Suchbegriff "
+#~ "in das Feld ein."
+
+#~ msgid ""
+#~ "<trademark>Evolution</trademark> supports mail connectivity to <trademark "
+#~ "class=\"registered\">Hula</trademark> servers through IMAP and "
+#~ "calendaring support through CalDAV."
+#~ msgstr ""
+#~ "<trademark>Evolution</trademark unterstützt den E-Mail-Zugriff auf "
+#~ "<trademark class=\"registered\">Hula</trademark>-Server per IMAP und den "
+#~ "Kalender-Zugriff per CalDAV."
+
+#~ msgid ""
+#~ "To add your Hula account to Evolution, you must create a new Hula account "
+#~ "by performing the following steps:"
+#~ msgstr ""
+#~ "Um ein Hula-Konto zu Evolution hinzuzufügen, müssen Sie ein Hula-Konto "
+#~ "einrichten, indem Sie die folgende Schritte durchführen:"
+
+#~ msgid "Click Edit, click Preferences, then click Mail Accounts."
+#~ msgstr ""
+#~ "Klicken Sie auf Bearbeiten, dann Einstellungen, dann auf E-Mail-Konten."
+
+#~ msgid "In the Preferences window, click Add."
+#~ msgstr "Klicken Sie im Einstellungen-Fenster auf Hinzufügen."
+
+#~ msgid ""
+#~ "Follow the procedure explained in <link linkend=\"usage-mainwindow-"
+#~ "starting\">Starting Evolution for the First Time</link>."
+#~ msgstr ""
+#~ "Folgen Sie der Beschreibung unter <link linkend=\"usage-mainwindow-"
+#~ "starting\">Evolution zum ersten Mal starten</link>."
+
+#~ msgid ""
+#~ "@@image: 'figures/evo_mail_notifier.png'; "
+#~ "md5=22ed4998283ebbc7da43881c42cb5bb8"
+#~ msgstr "a"
+
+#~ msgid "Evolution™"
+#~ msgstr "Evolution™"
+
+#~ msgid ""
+#~ "For support, late-breaking news, and errata, visit the Novell® support "
+#~ "center at <ulink url=\"http://support.novell.com\">support.novell.com</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "Für Hilfe, Neuigkeiten und Fehlerverbesserungen besuchen Sie bitte das "
+#~ "Novell®-Hilfezentrum unter der Adresse <ulink url=\"http://support.novell."
+#~ "com\">support.novell.com</ulink>."
+
+#~ msgid ""
+#~ "Evolution™ makes the tasks of storing, organizing, and retrieving your "
+#~ "personal information easy, so you can work and communicate more "
+#~ "effectively with others. It is a highly evolved <link linkend=\"groupware"
+#~ "\">groupware</link> program, an integral part of the Internet-connected "
+#~ "desktop."
+#~ msgstr ""
+#~ "Evolution™ macht das Speichern, Empfangen und Organisieren Ihrer "
+#~ "persönlichen Informationen einfach. Es handelt sich um weitentwickeltes "
+#~ "<link linkend=\"groupware\">Groupware</link>-Programm."
+
+#~ msgid ""
+#~ "Evolution can help you work in a group by handling e-mail, address, and "
+#~ "other contact information, and one or more calendars. It can do that on "
+#~ "one or several computers, connected directly or over a network, for one "
+#~ "person or for large groups."
+#~ msgstr ""
+#~ "Evolution hilft Ihnen bei der Gruppenarbeit, indem es E-Mails, Adressen "
+#~ "und Kontaktinformationen sowie ein oder mehrere Kalender handhabt. "
+#~ "Evolution kann dies auf einem oder mehreren Computern erledigen, direkt "
+#~ "oder über ein Netzwerk verbunden, für eine Person oder größere Gruppen."
+
+#~ msgid ""
+#~ "With Evolution, you can accomplish your most common daily tasks quickly. "
+#~ "For example, it takes only one or two clicks to enter appointment or "
+#~ "contact information sent to you by e-mail, or to send e-mail to a contact "
+#~ "or appointment. People who get lots of e-mail will appreciate advanced "
+#~ "features like <link linkend=\"vfolder\">search folders</link>, which let "
+#~ "you save searches as though they were ordinary e-mail folders."
+#~ msgstr ""
+#~ "Mit Evolution können Sie ihre wichtigsten täglichen Aufgaben schnell "
+#~ "erledigen. Zum Beispiel benötigen Sie nur ein oder zwei Klicks, um "
+#~ "Termin- oder Kontaktinformationen einzutragen, die Sie per E-Mail "
+#~ "erhalten haben, oder um eine E-Mail an einen Kontakt zu schicken. Falls "
+#~ "Sie viele E-Mails erhalten, werden Sie weiterführende Funktionen wie die "
+#~ "<link linkend=\"vfolder\">Suchordner</link> zu würdigen wissen, welche "
+#~ "das Speichern von Suchen ermöglicht, als ob diese normale E-Mail-Ordner "
+#~ "wären."
+
+#~ msgid "If you don't know the Server, contact your administrator."
+#~ msgstr ""
+#~ "Falls Sie den Namen des Servers nicht kennen, so fragen Sie Ihren "
+#~ "Administrator."
+
+#~ msgid "Type your username for the account in the Username field."
+#~ msgstr "Geben Sie Ihren Benutzernamen im »Benutzername«-Feld ein."
+
+#~ msgid "Select to use a secure (SSL) connection."
+#~ msgstr "Wählen Sie aus, ob Sie eine sichere Verbindung benutzen möchten."
+
+#~ msgid ""
+#~ "If your server supports secure connections, you should enable this "
+#~ "security option. If you are unsure if your server supports a secure "
+#~ "connection, contact your system administrator."
+#~ msgstr ""
+#~ "Falls der von Ihnen genutzte Server sichere Verbindungen wie SSL oder TLS "
+#~ "unterstützt, so sollten Sie diese Sicherheitsoption nutzen. Falls Sie "
+#~ "nicht wissen, ob der Server sichere Verbindungen unterstützt, so fragen "
+#~ "Sie Ihren System-Administrator."
+
+#~ msgid ""
+#~ "If you are unsure what authentication type you need, contact your system "
+#~ "administrator."
+#~ msgstr ""
+#~ "Falls Sie nicht wissen, welche Legitimationsart Sie benötigen, so fragen "
+#~ "Sie Ihren System-Administrator."
+
+#~ msgid ""
+#~ "Select if you want to apply filters to new messages in the Inbox on the "
+#~ "server."
+#~ msgstr ""
+#~ "Wählen Sie, ob Filter auf neue Nachrichten im Inbox-Ordner dieses Servers "
+#~ "angewendet werden sollen."
+
+#~ msgid "Select if you want to automatically synchronize remote mail locally."
+#~ msgstr ""
+#~ "Wählen Sie, ob entfernte E-Mails automatisch lokal synchronisiert werden "
+#~ "sollen."
+
+#~ msgid ""
+#~ "If you check this option, evolution fetches the headers as well as the "
+#~ "body of the message simultaneously. In this case, the time taken to open "
+#~ "a message is comparitevely less. In addition to that, you can download "
+#~ "the mails for reading them offline, when you have checked this option."
+#~ msgstr ""
+#~ "Wenn Sie diese Option wählen lädt Evolution sowohl die Kopfzeilen als "
+#~ "auch den Inhalt der Nachricht herunter, daher können Nachrichten "
+#~ "vergleichsweise schnell geöffnet werden. Zudem können Sie auswählen, dass "
+#~ "Nachrichten für die Offline-Nutzung heruntergeladen werden, damit Sie "
+#~ "diese ohne eine Verbindung zum Server lesen können."
+
+#~ msgid ""
+#~ "Select check new messages for junk contents to filter new messages for "
+#~ "spam messages."
+#~ msgstr ""
+#~ "Wählen Sie »Neue Nachrichten auf unerwünschten Inhalt prüfen«, um Spam-"
+#~ "Nachrichten automatisch auszusortieren."
+
+#~ msgid ""
+#~ "For more information refer <link linkend=\"usage-mail-organize-spam"
+#~ "\">Stopping Junk Mail (Spam)</link>"
+#~ msgstr ""
+#~ "Für weitere Informationen siehe <link linkend=\"usage-mail-organize-spam"
+#~ "\">Filtern unerwünschter Nachrichten (Spam)</link>"
+
+#~ msgid "Select if you want to apply filters to new messages in the Inbox."
+#~ msgstr ""
+#~ "Wählen Sie, ob Filter auf neue Nachrichten im Inbox-Ordner dieses Servers "
+#~ "angewendet werden sollen."
+
+#~ msgid ""
+#~ "Select if you want Evolution to automatically check for new mail.If you "
+#~ "select this option, you need to specify how often Evolution should check "
+#~ "for new messages."
+#~ msgstr ""
+#~ "Wählen Sie, ob Evolution automatisch nach neuen Nachrichten schauen soll. "
+#~ "Falls Sie diese Option wählen müssen Sie angeben, wie oft Evolution nach "
+#~ "neuen Nachrichten schauen soll."
+
+#~ msgid "Type the Server address in the Server field."
+#~ msgstr "Geben Sie den Namen des E-Mail-Servers in das »Server«-Feld ein."
+
+#~ msgid ""
+#~ "Before importing e-mail from Netscape*, make sure you have selected File "
+#~ "&gt; Compact All Folders. If you don't, Evolution will import and "
+#~ "undelete the messages in your Trash folders."
+#~ msgstr ""
+#~ "Mozilla*- und Netscape*-Benutzer sollten Datei &gt; Komprimieren &gt; "
+#~ "Alle Ordner im Programm Netscape oder Mozilla Mail auswählen. Andernfalls "
+#~ "importiert Evolution jegliche Nachrichten in den Papierkörben und macht "
+#~ "das Löschen rückgängig."
+
+#~ msgid "This is where your e-mail is displayed."
+#~ msgstr ""
+#~ "In der Nachrichtenvorschau wird die jeweils in der E-Mail-Liste "
+#~ "ausgewählte E-Mail angezeigt."
+
+#~ msgid "To take the backup,"
+#~ msgstr "Um eine Sicherung zu erstellen,"
+
+#~ msgid "To restore Evolution,"
+#~ msgstr "Um Evolution wiederherzustellen,"
+
+#~ msgid ""
+#~ "Evolution has a number of command line options that you can use. You can "
+#~ "find the full list by entering the command <command>man evolution</"
+#~ "command> or <command>evolution --help</command>. The most important "
+#~ "command line options are:"
+#~ msgstr ""
+#~ "Evolution besitzt eine Anzahl an Befehlszeilen-Optionen. Für "
+#~ "Informationen über die Befehlszeilen-Optionen, öffnen Sie ein Terminal-"
+#~ "Fenster und geben Sie <command>evolution --help</command> ein. Die "
+#~ "wichtigsten Kommandozeilen-Optionen sind:"
+
+#~ msgid "evolution ”%s”"
+#~ msgstr "evolution ”%s”"
+
+#~ msgid ""
+#~ "‘Get Mail' in the Evolution toolbar replaced with Send/Receive tool in "
+#~ "SLED."
+#~ msgstr ""
+#~ "Im Suse Linux Enterprise Desktop ist der Verschicken/Abrufen-Knopf in der "
+#~ "Werkzeugleiste mit &lsquo;Get Mail' beschriftet."
+
+#~ msgid "Click Edit &gt; Preferences"
+#~ msgstr "Klicken Sie auf Bearbeiten &gt; Einstellungen"
+
+#~ msgid ""
+#~ "Click the down-arrow on the attachment icon, or right-click the "
+#~ "attachment icon in the attachment bar, then click Save As."
+#~ msgstr ""
+#~ "Klicken Sie auf den nach unten zeigenden Pfeil auf dem Anhangsknopf, oder "
+#~ "klicken Sie mit der rechten Maustaste auf das Anhangssymbol in der "
+#~ "Anlagenleiste, und wählen Sie Speichern unter."
+
+#~ msgid "Click Configure to add the keywords."
+#~ msgstr "Klicken Sie auf »Konfigurieren«, um Schlüsselwörter hinzuzufügen."
+
+#~ msgid "Click Add to add keywords such as “Attach” or “Attachment”."
+#~ msgstr ""
+#~ "Klicken Sie auf »Hinzufügen«, um Schlüsselwörter wie &ldquo;Anlage&ldquo;, "
+#~ "&ldquo;Anhang&ldquo; oder &ldquo;mitgeschickt&ldquo; hinzuzufügen."
+
+#~ msgid "Click Image."
+#~ msgstr "Wählen Sie Einfügen &gt; Bild in der Menüleiste aus."
+
+#~ msgid "Click Rule."
+#~ msgstr "Wählen Sie Einfügen &gt; Trennlinie in der Menüleiste aus."
+
+#~ msgid "Click Table."
+#~ msgstr "Wählen Sie Einfügen &gt; Tabelle in der Menüleiste aus."
+
+#~ msgid "Select Edit &gt;Preferences to open Evolution Preferences window."
+#~ msgstr "Wählen Sie Bearbeiten &gt; Einstellungen."
+
+#~ msgid "RSVP:"
+#~ msgstr "Antwort an den Absender verschicken:"
+
+#~ msgid ""
+#~ "GPG uses two keys: public and private. You can give your public key to "
+#~ "anyone you want to receive encrypted messages, or put it on a public key "
+#~ "server so that people can look it up before contacting you. Your private "
+#~ "key lets you decrypt any message encrypted with your public key. Never "
+#~ "give your private key to anyone."
+#~ msgstr ""
+#~ "GPG benutzt zwei Schlüssel, einen öffentlichen und einen privaten. Sie "
+#~ "können Ihren öffentlichen Schlüssel an jeden verteilen, der von Ihnen "
+#~ "verschlüsselte Nachrichten erhalten soll, oder ihn auf einen öffentlichen "
+#~ "Schlüssel-Server hochladen, so dass dieser von Personen abgerufen werden "
+#~ "kann, bevor diese Sie kontaktieren. Ihr privater Schlüssel ermöglicht "
+#~ "Ihnen das Entschlüsseln jeder Nachricht, die mit Ihrem öffentlichen "
+#~ "Schlüssel verschlüsselt wurde. Geben Sie Ihren privaten Schlüssel niemals "
+#~ "heraus."
+
+#~ msgid ""
+#~ "When you send a message that is encrypted, you must encrypt it using your "
+#~ "intended recipient's public key. To receive an encrypted message, you "
+#~ "must make sure that the sender has your public key in advance. For "
+#~ "signing messages, you encrypt the signature with your private key, so "
+#~ "only your public key can unlock it. When you send the message, the "
+#~ "recipient gets your public key and unlocks the signature, verifying your "
+#~ "identity."
+#~ msgstr ""
+#~ "Wenn Sie eine Nachricht verschicken die verschlüsselt ist, so müssen Sie "
+#~ "diese mit dem öffentlichen Schlüssel des Empfängers verschlüsseln. Um "
+#~ "eine verschlüsselte Nachricht zu erhalten müssen Sie sicherstellen, dass "
+#~ "der Absender zuvor Ihren öffentlichen Schlüssel erhalten hat. Um "
+#~ "Nachricht zu signieren verschlüsseln Sie die Signatur mit Ihrem privaten "
+#~ "Schlüssel, so dass nur Ihr beim Empfänger vorhandener öffentlicher "
+#~ "Schlüssel die Signatur verifizieren kann."
+
+#~ msgid "Click Edit &gt; Preferences, then click Mail Accounts."
+#~ msgstr ""
+#~ "Klicken Sie auf Bearbeiten &gt; Einstellungen, dann auf E-Mail-Konten."
+
+#~ msgid "Click Edit &gt; Preferences, then click Certificate."
+#~ msgstr "Klicken Sie auf Bearbeiten &gt; Einstellungen, dann Zertifikate."
+
+#~ msgid ""
+#~ "Click Edit &gt; Preferences, then select the account to encrypt the "
+#~ "messages in."
+#~ msgstr ""
+#~ "Klicken Sie auf Bearbeiten &gt; Einstellungen und wählen Sie das Konto "
+#~ "aus, für welches Nachrichten immer signiert/verschlüsselt werden sollen."
+
+#~ msgid "Select the search criteria."
+#~ msgstr "Wählen Sie die Suchkriterien aus."
+
+#~ msgid "Click Show to expand the drop-down list."
+#~ msgstr "Klicken Sie neben »Anzeigen« auf die Auswahlliste."
+
+#~ msgid ""
+#~ "Click search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
+#~ "stock_search.png\"/> to specify the search type."
+#~ msgstr ""
+#~ "Klicken Sie auf das Such-Symbol <inlinegraphic format=\"PNG\" fileref="
+#~ "\"figures/stock_search.png\"/> um den Suchtypen auszuwählen."
+
+#~ msgid "To perform advanced search,"
+#~ msgstr "Um eine erweiterte Suche durchführen,"
+
+#~ msgid "Select Search"
+#~ msgstr "Klicken Sie auf Suchen in der Menüleiste."
+
+#~ msgid "The sender's address."
+#~ msgstr "Die E-Mail-Adresse und der Absendername des Absenders."
+
+#~ msgid ""
+#~ "Messages can have labels of Important, Work, Personal, To Do, or Later. "
+#~ "You can set tables with other filters or by hand."
+#~ msgstr ""
+#~ "Nachrichten können Beschriftungen wie Wichtig, Geschäftlich, Persönlich, "
+#~ "Zu erledigen oder Später haben. Sie können Beschriftungen durch Filter "
+#~ "oder per Hand anwenden."
+
+#~ msgid ""
+#~ "Moves the message into a folder you specify. Click Here to select the "
+#~ "destination folder."
+#~ msgstr ""
+#~ "Verschiebt eine Nachrichten in einer anderen Ordner, den Sie auswählen "
+#~ "können."
+
+#~ msgid ""
+#~ "To change your junk mail filtering preferences, click Edit &gt; "
+#~ "Preferences, then click Mail Preferences. For more information on this "
+#~ "see, <link linkend=\"mail-prefs-junk\">Junk Mail Preferences</link>."
+#~ msgstr ""
+#~ "Um die Einstellungen für Unerwünschte E-Mails zu ändern, klicken Sie auf "
+#~ "Bearbeiten &gt; Einstellungen, dann auf E-Mail-Einstellungen. Für weitere "
+#~ "Optionen siehe <link linkend=\"mail-prefs-junk\">Unerwünscht-"
+#~ "Einstellungen</link>."
+
+#~ msgid ""
+#~ "From the Contact Editor toolbar, you can save and close, print, close, or "
+#~ "delete the contact."
+#~ msgstr ""
+#~ "In der Werkzeugleiste des Kontakt-Editors können Sie einen Kontakt "
+#~ "speichern, schließen, drucken und löschen."
+
+#~ msgid "Click the down arrow key next to the New button in the toolbar"
+#~ msgstr ""
+#~ "Klicken Sie auf den nach unten zeigenden Pfeil rechts neben dem »Neu«-"
+#~ "Knopf in der Werkzeugleiste."
+
+#~ msgid ""
+#~ "Select Contacts from the drop-down list or press Shift+Ctrl+C to appear "
+#~ "Contact Editor."
+#~ msgstr ""
+#~ "Wählen Sie »Kontakt« aus der Auswahlliste aus, oder drücken Sie "
+#~ "Umschalttaste+Steuerung+C, um das Kontakt-Editor-Fenster zu erhalten."
+
+#~ msgid "Press Contact tool from the Switcher to appear the Contact list."
+#~ msgstr ""
+#~ "Wählen Sie das Kontakte-Fenster aus, indem Sie auf den »Kontakte«-Knopf "
+#~ "unten links in der Seitenleiste klicken."
+
+#~ msgid "Edit the required information from Contact Editor and press OK."
+#~ msgstr "Geben Sie die gewünschten Informationen ein und klicken Sie auf OK."
+
+#~ msgid ""
+#~ "Click <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/"
+#~ "> to expand the drop-down list."
+#~ msgstr ""
+#~ "Klicken Sie auf das Such-Symbol <inlinegraphic format=\"PNG\" fileref="
+#~ "\"figures/stock_search.png\"/> um den Suchtypen auszuwählen."
+
+#~ msgid "Click Search."
+#~ msgstr "Klicken Sie auf OK."
+
+#~ msgid ""
+#~ "To show all your contacts, Click Clear in the search bar or search with "
+#~ "an empty query."
+#~ msgstr ""
+#~ "Um alle Kontakte angezeigt zu bekommen, klicken Sie auf das kleine Symbol "
+#~ "rechts im Suchfeld, führen Sie eine leere Suche durch, wählen Sie »Suchen "
+#~ "&gt; Verwerfen« in der Menüleiste aus, oder drücken Sie Umschalttaste"
+#~ "+Steuerung+Q."
+
+#~ msgid "Click show to expand the drop-down list."
+#~ msgstr "Klicken Sie neben »Anzeigen« auf die Auswahlliste."
+
+#~ msgid "Select the search criteria from any of the following:"
+#~ msgstr "Wählen Sie das Suchkriterium aus der folgenden Liste aus:"
+
+#~ msgid "Time &amp;Expenses"
+#~ msgstr "Zeit und Ausgaben"
+
+#~ msgid "Press OK at the right bottom of the Contact Editor window."
+#~ msgstr "Klicken Sie auf OK im Kontakt-Editor-Fenster."
+
+#~ msgid "Right click."
+#~ msgstr "Klicken Sie mit der rechten Maustaste auf den Kalender."
+
+#~ msgid ""
+#~ "Select a calendar in the Calendar drop-down list. Type a brief summary of "
+#~ "the appointment in the Summary field."
+#~ msgstr ""
+#~ "Wählen Sie einen Kalender aus der Auswahlliste aus. Geben Sie eine kurze "
+#~ "Zusammenfassung für den Termin in das »Zusammenfassung«-Feld ein."
+
+#~ msgid "Type a location for the appointment in the Location field."
+#~ msgstr "Geben Sie einen Ort für den Termin in das »Ort«-Feld ein."
+
+#~ msgid "Select the date, time and set the duration"
+#~ msgstr "Wählen Sie das Datum, die Zeit und die Dauer."
+
+#~ msgid "Enter a brief summary of the appointment in the description field."
+#~ msgstr "Geben Sie eine kurze Beschreibung im »Beschreibung«-Feld ein."
+
+#~ msgid ""
+#~ "If the event is an all day event, specify a starting and ending date."
+#~ msgstr ""
+#~ "Falls das Ereignis ein ganztägiges Ereignis ist, geben Sie ein "
+#~ "Anfangsdatum und ein Enddatum ein."
+
+#~ msgid ""
+#~ "If the event is not an all day event, specify a starting and ending time."
+#~ msgstr ""
+#~ "Falls das Ereignis kein ganztägiges Ereignis ist, geben Sie eine "
+#~ "Startzeit und eine Endzeit ein."
+
+#~ msgid ""
+#~ "(Optional) Type a category in the Categories field. To show or hide the "
+#~ "Categories field, click View &gt; Categories."
+#~ msgstr ""
+#~ "(Optional) Geben Sie eine Kategorie im Kategorien-Feld an. Um das "
+#~ "»Kategorien«-Feld anzuzeigen oder zu verstecken, klicken Sie auf Ansicht "
+#~ "&gt; Kategorien in der Menüleiste."
+
+#~ msgid "To select an alarm for this appointment, click Alarm on the toolbar."
+#~ msgstr ""
+#~ "Um einen Alarm für diesen Termin auszuwählen, klicken Sie auf »Alarme« in "
+#~ "der Werkzeugleiste."
+
+#~ msgid ""
+#~ "If you select an alarm, specify when and how you want the alarm to "
+#~ "notify. For more information on reminders, see <link linkend=\"bshly4v"
+#~ "\">Reminders</link>."
+#~ msgstr ""
+#~ "Wenn Sie einen Alarm setzen, geben Sie an wann und wie der Alarm Sie "
+#~ "benachrichtigen soll. Für weitere Informationen zu Alarmen siehe <link "
+#~ "linkend=\"bshly4v\">Erinnerungen</link>."
+
+#~ msgid ""
+#~ "(Optional) To add an attachment to the appointment, drag and drop the "
+#~ "attachment into the attachment bar."
+#~ msgstr ""
+#~ "(Optional) Um einem Termin einen Anhang hinzuzufügen, ziehen Sie den "
+#~ "Anhang per Maus in die Anlagenleiste und lassen Sie dann die Maustaste "
+#~ "los."
+
+#~ msgid "Select the alarm for the event."
+#~ msgstr "Wählen Sie einen Alarm für diesen Termin aus."
+
+#~ msgid "Type a category in the Categories field."
+#~ msgstr "(Optional) Geben Sie ein Kategorie im »Kategorien«-Feld ein."
+
+#~ msgid "Type summary of the meeting in the Summary field."
+#~ msgstr ""
+#~ "Geben Sie eine kurze Zusammenfassung für die Besprechung in das "
+#~ "»Zusammenfassung«-Feld ein."
+
+#~ msgid "Type a location for the meeting in the Location field."
+#~ msgstr "Geben Sie einen Ort für die Besprechung in das »Ort«-Feld ein."
+
+#~ msgid ""
+#~ "To select this meeting as an all day event, click the All Day Event "
+#~ "button on the toolbar."
+#~ msgstr ""
+#~ "Falls diese Besprechung ein ganztägiges Ereignis sein soll, klicken Sie "
+#~ "auf den »Ganztägiges Ereignis«-Knopf in der Werkzeugleiste."
+
+#~ msgid ""
+#~ "Select For to specify the duration or select Until to specify the ending "
+#~ "time of the event."
+#~ msgstr ""
+#~ "Wählen Sie »für« um die Dauer des Termins anzugeben, oder wählen Sie »bis« "
+#~ "um die Endzeit des Termins anzugeben."
+
+#~ msgid ""
+#~ "(Optional) To set an alarm for this meeting, click Alarms on the toolbar, "
+#~ "then specify when and how you want to the alarm to notify you."
+#~ msgstr ""
+#~ "(Optional) Um einen Alarm für diese Besprechung auszuwählen, klicken Sie "
+#~ "auf »Alarme« in der Werkzeugleiste."
+
+#~ msgid "Select the search type:"
+#~ msgstr "Wählen Sie den Suchtypen aus:"
+
+#~ msgid "To perform an advanced search:"
+#~ msgstr "Um eine erweiterte Suche durchzuführen:"
+
+#~ msgid "Select the search criteria:"
+#~ msgstr "Wählen Sie die Suchkriterien aus:"
+
+#~ msgid "Click New &gt; Task."
+#~ msgstr "Klicken Sie auf Neu &gt; Aufgabe."
+
+#~ msgid "Type a brief summary for the task in the Summary field."
+#~ msgstr ""
+#~ "Geben Sie eine kurze Zusammenfassung für die Aufgabe in das "
+#~ "»Zusammenfassung«-Feld ein."
+
+#~ msgid "Type a description for the task."
+#~ msgstr "Geben Sie eine Beschreibung für die Aufgabe ein."
+
+#~ msgid ""
+#~ "Click the Attach button on the toolbar, then browse to the attachment."
+#~ msgstr ""
+#~ "Klicken Sie auf den »Beilegen«-Knopf in der Werkzeugleiste, und wählen Sie "
+#~ "die Anlage aus."
+
+#~ msgid ""
+#~ "(Optional) To add an attachment to the assigned task, drag and drop the "
+#~ "attachment into the attachment bar."
+#~ msgstr ""
+#~ "(Optional) Um einer zugewiesenen Aufgabe einen Anhang hinzuzufügen, "
+#~ "ziehen Sie den Anhang per Maus in die Anlagenleiste und lassen Sie dann "
+#~ "die Maustaste los."
+
+#~ msgid ""
+#~ "It shows all the active tasks that are due within the next seven dates. "
+#~ "You can view all the tasks that end within the next seven days from the "
+#~ "current date."
+#~ msgstr ""
+#~ "Zeigt alle Aufgaben an, deren Fälligkeitsdatum innerhalb der nächsten "
+#~ "sieben Tage liegt, welche also innerhalb der nächsten sieben Tage (vom "
+#~ "heutigen Tage aus gesehen) enden."
+
+#~ msgid "Type text for the memo in the Summary field."
+#~ msgstr ""
+#~ "Geben Sie eine kurze Zusammenfassung für die Notiz in das "
+#~ "»Zusammenfassung«-Feld ein."
+
+#~ msgid "Type text for the memo in the Memo Content field."
+#~ msgstr "Geben Sie den Text der Notiz in das Feld »Beschreibung« ein."
+
+#~ msgid ""
+#~ "(Optional) To add an attachment to the memo, drag and drop the attachment "
+#~ "into the attachment bar."
+#~ msgstr ""
+#~ "(Optional) Um einer Notiz einen Anhang hinzuzufügen, ziehen Sie den "
+#~ "Anhang per Maus in die Anlagenleiste und lassen Sie dann die Maustaste "
+#~ "los."
+
+#~ msgid ""
+#~ "(Optional) Click Options &gt; Classifications, then select a "
+#~ "classification (as Public, Private or Confidential) for the memo."
+#~ msgstr ""
+#~ "(Optional) Klicken Sie auf Optionen &gt; Einstufung und wählen Sie eine "
+#~ "Einstufung (Öffentlich, Privat, Vertraulich) für die Notiz aus."
+
+#~ msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S"
+#~ msgstr ""
+#~ "Klicken Sie auf Bearbeiten, dann Einstellungen, oder drücken Sie "
+#~ "Umschalttaste+Steuerung+S."
+
+#~ msgid ""
+#~ "Click Edit &gt; Preferences or press Shift+Ctrl+S, then click Mail "
+#~ "Accounts."
+#~ msgstr ""
+#~ "Klicken Sie auf Bearbeiten &gt; Einstellungen oder drücken Sie "
+#~ "Umschalttaste+Steuerung+S, dann klicken Sie auf E-Mail-Konten."
+
+#~ msgid "Select your authentication method."
+#~ msgstr "Wählen Sie die Legitimationsart aus."
+
+#~ msgid "Click OK to confirm your selection."
+#~ msgstr "Klicken Sie auf »OK«, um Ihre Auswahl zu bestätigen."
+
+#~ msgid "To delegate a Meeting,"
+#~ msgstr "Um eine Besprechung zu delegieren,"
+
+#~ msgid ""
+#~ "Click Edit &gt; Preferences or press Shift+Ctrl+S, then click the "
+#~ "Exchange Settings tab."
+#~ msgstr ""
+#~ "Klicken Sie auf Bearbeiten, dann Einstellungen (oder drücken Sie "
+#~ "Umschalttaste+Steuerung+S), dann klicken Sie auf den Reiter Exchange-"
+#~ "Einstellungen."
+
+#~ msgid "Click Edit &gt; Preferences &gt; Mail Accounts."
+#~ msgstr ""
+#~ "Klicken Sie auf Bearbeiten, dann Einstellungen, dann auf E-Mail-Konten."
+
+#~ msgid "Evolution™ can access accounts on Novell® GroupWise® 7 system."
+#~ msgstr ""
+#~ "Evolution™ kann auf Konten auf Novell® GroupWise® 7-Servern zugreifen."
+
+#~ msgid ""
+#~ "Enter a brief description about the Reminder Note in the Summary field."
+#~ msgstr ""
+#~ "Geben Sie eine kurze Zusammenfassung für die Erinnerung in das "
+#~ "»Zusammenfassung«-Feld ein."
+
+#~ msgid "You can enable Status Tracking before you send any messages."
+#~ msgstr ""
+#~ "Sie können die Statusverfolgung aktivieren, bevor Sie Nachrichten "
+#~ "versenden."
+
+#~ msgid "To track the status of the message you are sending,"
+#~ msgstr "Um den Status einer Nachricht zu verfolgen, die Sie versenden,"
+
+#~ msgid "Return Notification:"
+#~ msgstr "Rücksendemitteilung:"
+
+#~ msgid "Color Preferences"
+#~ msgstr "Farb-Einstellungen"
+
+#~ msgid "To enable junk filtering using SpamAssassin and/or Bogofilter,"
+#~ msgstr ""
+#~ "Um das Filtern unerwünschter Nachrichten mit SpamAssassin und/oder "
+#~ "Bogofilter zu aktivieren,"
+
+#~ msgid "Select Bogofilter junk plugin and SpamAssassin junk plugin."
+#~ msgstr ""
+#~ "Aktivieren Sie das Bogofilter junk plugin oder SpamAssassin-Unerwünscht-"
+#~ "Plugin."
+
+#~ msgid "In the General tab, you can set the following options:"
+#~ msgstr ""
+#~ "Im »Allgemein«-Reiter können folgende Einstellungen getroffen werden:"
+
+#~ msgid ""
+#~ "Allows you to specify a template to use while posting your Free/Buy "
+#~ "information to a server."
+#~ msgstr ""
+#~ "Ermöglicht es eine Vorlage zu nutzen, wenn Sie "
+#~ "Verfügungbarkeitsinformationen auf einem Server veröffentlichen."
+
+#~ msgid "<computeroutput/>Contact Management"
+#~ msgstr "<computeroutput/>Verwaltung von Kontakten"
+
+#~ msgid ""
+#~ "SSL and TLS are security mechanisms. If you select Always, Evolution does "
+#~ "not connect unless secure connections are available. The default value is "
+#~ "Whenever Possible, which uses secure connections if they are available, "
+#~ "but does not cause failure if they are not."
+#~ msgstr ""
+#~ "SSL und TLS sind Sicherheitsmechanismen. Wenn Sie »Immer« auswählen, so "
+#~ "verbindet sich Evolution nicht mit dem Server, wenn keine sichere "
+#~ "Verbindung möglich ist. Der Vorgabewert ist »Immer, wenn möglich«, der "
+#~ "eine sichere Verbindung nutzt falls diese verfügbar ist, und ansonsten "
+#~ "eine unsichere (nicht-verschlüsselte) Verbindung benutzt."
+
+#~ msgid "Use File &gt; New Task or Shift+Ctrl+T."
+#~ msgstr ""
+#~ "Wählen Sie Datei &gt; Neu &gt; Aufgabe oder drücken Sie Umschalttaste"
+#~ "+Steuerung+T."
+
+#~ msgid ""
+#~ "If you need additional help with Evolution, visit the <ulink url=\"http://"
+#~ "support.novell.com\">Novell® support site at</ulink>."
+#~ msgstr ""
+#~ "Falls Sie weitere Hilfe mit Evolution benötigen, so besuchen Sie die "
+#~ "<ulink url=\"http://support.novell.com\">Novell&reg;-Hilfeseite</ulink>."
+
+#~ msgid ""
+#~ "A pre-downloading procedure that allows Novell® Evolution™ to quickly "
+#~ "refer to data. It enables faster searches and decreases memory usage for "
+#~ "data displays."
+#~ msgstr ""
+#~ "Eine Funktion, die es Evolution&trade; gestattet, Daten schneller "
+#~ "aufzufinden, wodurch schnellere Suchen und geringerer Speicherverbrauch "
+#~ "nötig sind, um die Daten darzustellen."
+
diff --git a/help/es/es.po b/help/es/es.po
index 5659d4b275..9ce55081e6 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.help.HEAD\n"
-"POT-Creation-Date: 2008-06-30 17:50+0000\n"
-"PO-Revision-Date: 2008-07-04 17:31+0200\n"
+"POT-Creation-Date: 2008-08-05 22:32+0000\n"
+"PO-Revision-Date: 2008-08-06 18:40+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:233(None)
+#: C/evolution.xml:230(None)
 msgid "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 msgstr "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:263(None)
+#: C/evolution.xml:260(None)
 msgid ""
 "@@image: 'figures/evo_receive_setup_a.png'; "
 "md5=5add6d290b2df212516dda2463930759"
@@ -37,19 +37,19 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:424(None)
+#: C/evolution.xml:418(None)
 msgid "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
 msgstr "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:434(None)
+#: C/evolution.xml:428(None)
 msgid "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
 msgstr "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:475(None)
+#: C/evolution.xml:469(None)
 msgid ""
 "@@image: 'figures/evo_imapreceive_a.png'; "
 "md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
@@ -59,25 +59,25 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:518(None)
+#: C/evolution.xml:512(None)
 msgid "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
 msgstr "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:539(None)
+#: C/evolution.xml:534(None)
 msgid "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
 msgstr "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:586(None)
+#: C/evolution.xml:584(None)
 msgid "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
 msgstr "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:606(None)
+#: C/evolution.xml:605(None)
 msgid ""
 "@@image: 'figures/evo_maildirreceive_a.png'; "
 "md5=bdd9dfc00800338dc906e2fd12b07f62"
@@ -87,7 +87,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:627(None) C/evolution.xml:649(None)
+#: C/evolution.xml:627(None) C/evolution.xml:650(None)
 msgid ""
 "@@image: 'figures/evo_mboxreceive_a.png'; "
 "md5=a04753f7615eab6ac349f50caa39a7a8"
@@ -97,19 +97,19 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:677(None)
+#: C/evolution.xml:678(None)
 msgid "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
 msgstr "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:724(None)
+#: C/evolution.xml:725(None)
 msgid "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
 msgstr "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:751(None)
+#: C/evolution.xml:753(None)
 msgid ""
 "@@image: 'figures/evo_mail_callout_a.png'; "
 "md5=4fa6dda9663d554197736dd2feb79575"
@@ -119,13 +119,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:926(None)
+#: C/evolution.xml:928(None)
 msgid "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 msgstr "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:944(None)
+#: C/evolution.xml:946(None)
 msgid ""
 "@@image: 'figures/evo_cal_callout_a.png'; "
 "md5=6de000ad9c7b3fe42ed1996cad46432f"
@@ -135,7 +135,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:964(None)
+#: C/evolution.xml:966(None)
 msgid ""
 "@@image: 'figures/contacts_mainwindow_a.png'; "
 "md5=41335f17f056cb0b06e3df4900d08865"
@@ -145,13 +145,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:978(None)
+#: C/evolution.xml:980(None)
 msgid "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
 msgstr "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:981(None)
+#: C/evolution.xml:983(None)
 msgid ""
 "@@image: 'figures/evo_backup_warning.png'; "
 "md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
@@ -161,7 +161,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:989(None)
+#: C/evolution.xml:991(None)
 msgid ""
 "@@image: 'figures/evo_backup_prgsbar.png'; "
 "md5=046642d35e096154508269063d672b07"
@@ -171,13 +171,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1007(None)
+#: C/evolution.xml:1009(None)
 msgid "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 msgstr "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1017(None)
+#: C/evolution.xml:1019(None)
 msgid ""
 "@@image: 'figures/evo_crash_recovery.png'; "
 "md5=6bfa921910f94e5845f893a6308169a6"
@@ -187,47 +187,47 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1177(None)
+#: C/evolution.xml:1183(None)
 msgid "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 msgstr "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1194(None)
+#: C/evolution.xml:1200(None)
 msgid "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 msgstr "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1209(None)
+#: C/evolution.xml:1215(None)
 msgid "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 msgstr "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1379(None)
+#: C/evolution.xml:1390(None)
 msgid "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
 msgstr "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1467(None)
+#: C/evolution.xml:1478(None)
 msgid "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 msgstr "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1521(None)
+#: C/evolution.xml:1532(None)
 msgid ""
-"@@image: 'figures/attach_reminder_a.png.png'; "
+"@@image: 'figures/attach_reminder_a.png'; "
 "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
 msgstr ""
-"@@image: 'figures/attach_reminder_a.png.png'; "
+"@@image: 'figures/attach_reminder_a.png'; "
 "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1534(None)
+#: C/evolution.xml:1545(None)
 msgid ""
 "@@image: 'figures/evo_attachreminder_plugin.png'; "
 "md5=25f7db7cd7d310110847354c62702ecf"
@@ -237,7 +237,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1862(None)
+#: C/evolution.xml:1873(None)
 msgid ""
 "@@image: 'figures/evo_account_editor_a.png'; "
 "md5=39b83104a4e6ecb9473cbb84121e6be3"
@@ -247,13 +247,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:1902(None)
+#: C/evolution.xml:1913(None)
 msgid "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
 msgstr "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2335(None)
+#: C/evolution.xml:2354(None)
 msgid ""
 "@@image: 'figures/evo_import_asst_a.png'; "
 "md5=e86638d0b3a01478fd4f12e33781a8a0"
@@ -263,13 +263,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2361(None)
+#: C/evolution.xml:2381(None)
 msgid "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 msgstr "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2512(None)
+#: C/evolution.xml:2532(None)
 msgid ""
 "@@image: 'figures/evo_flag_follow_up_a.png'; "
 "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
@@ -279,7 +279,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2529(None)
+#: C/evolution.xml:2549(None)
 msgid ""
 "@@image: 'figures/evo_select_folder.png'; "
 "md5=7b99ef6be9990bc1c1d869512ae2f617"
@@ -289,7 +289,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2532(None)
+#: C/evolution.xml:2552(None)
 msgid ""
 "@@image: 'figures/evo_message_filters_a.png'; "
 "md5=3b7067638063c6aad2c316db838d2273"
@@ -299,37 +299,37 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2695(None)
+#: C/evolution.xml:2715(None)
 msgid "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
 msgstr "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2725(None)
+#: C/evolution.xml:2745(None)
 msgid "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
 msgstr "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2731(None)
+#: C/evolution.xml:2751(None)
 msgid "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
 msgstr "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:2758(None)
+#: C/evolution.xml:2778(None)
 msgid "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
 msgstr "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3006(None)
+#: C/evolution.xml:3026(None)
 msgid "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 msgstr "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3097(None)
+#: C/evolution.xml:3117(None)
 msgid ""
 "@@image: 'figures/evo_select_add_folder.png'; "
 "md5=01d57d01ff1650d91c1d73de1f4301ab"
@@ -339,7 +339,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3190(None)
+#: C/evolution.xml:3210(None)
 msgid ""
 "@@image: 'figures/evo_contacteditor_a.png'; "
 "md5=4f188bd5d34a9fea7d91fdf5fb943f28"
@@ -349,37 +349,37 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3231(None)
+#: C/evolution.xml:3248(None)
 msgid "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 msgstr "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3486(None)
+#: C/evolution.xml:3504(None)
 msgid "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 msgstr "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3641(None)
+#: C/evolution.xml:3659(None)
 msgid "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 msgstr "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3664(None)
+#: C/evolution.xml:3682(None)
 msgid "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
 msgstr "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3696(None)
+#: C/evolution.xml:3714(None)
 msgid "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
 msgstr "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3794(None)
+#: C/evolution.xml:3813(None)
 msgid ""
 "@@image: 'figures/evo_calender_appointmnt.png'; "
 "md5=730ed74addbca4b0638f03cbcde99e71"
@@ -389,21 +389,21 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:3861(None)
+#: C/evolution.xml:3881(None)
 msgid "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 msgstr "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4055(None) C/evolution.xml:5373(None)
-#: C/evolution.xml:5757(None)
+#: C/evolution.xml:4077(None) C/evolution.xml:5352(None)
+#: C/evolution.xml:5738(None)
 msgid "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 msgstr "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4151(None) C/evolution.xml:4463(None)
-#: C/evolution.xml:4701(None)
+#: C/evolution.xml:4173(None) C/evolution.xml:4487(None)
+#: C/evolution.xml:4725(None)
 msgid ""
 "@@image: 'figures/evo_cal_advsearch.png'; "
 "md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
@@ -413,25 +413,25 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:4612(None)
+#: C/evolution.xml:4636(None)
 msgid "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
 msgstr "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5008(None)
+#: C/evolution.xml:5032(None)
 msgid "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 msgstr "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5018(None)
+#: C/evolution.xml:5037(None)
 msgid "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
 msgstr "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5038(None)
+#: C/evolution.xml:5044(None)
 msgid ""
 "@@image: 'figures/exchng-rec-options.png'; "
 "md5=c3c759f902c2584ee218dc40d6e46806"
@@ -441,19 +441,19 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5061(None)
+#: C/evolution.xml:5058(None)
 msgid "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
 msgstr "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5083(None)
+#: C/evolution.xml:5066(None)
 msgid "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
 msgstr "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5100(None)
+#: C/evolution.xml:5074(None)
 msgid ""
 "@@image: 'figures/exchng-rec-option.png'; "
 "md5=6c0f84b7541a044e900d9d7c5fc4a49b"
@@ -463,13 +463,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5132(None) C/evolution.xml:5365(None)
+#: C/evolution.xml:5107(None) C/evolution.xml:5344(None)
 msgid "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
 msgstr "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5174(None)
+#: C/evolution.xml:5149(None)
 msgid ""
 "@@image: 'figures/evo_send_option_a.png'; "
 "md5=c1cca904625d1a7de13c851cd15235f6"
@@ -479,13 +479,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5250(None)
+#: C/evolution.xml:5229(None)
 msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 msgstr "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5259(None)
+#: C/evolution.xml:5238(None)
 msgid ""
 "@@image: 'figures/evo_delegate_permission_a.png'; "
 "md5=05df38ad69b20f9bd7c1e14044ca10fd"
@@ -495,7 +495,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5294(None)
+#: C/evolution.xml:5273(None)
 msgid ""
 "@@image: 'figures/sub-others-folder.png'; "
 "md5=5e385ee9524f93b65b307f83e1888138"
@@ -505,13 +505,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5324(None)
+#: C/evolution.xml:5303(None)
 msgid "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
 msgstr " @@image: 'figures/filter-new-fig.png'; md5=8816e3bdeb3a4e936b7cf877f51c033c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5653(None)
+#: C/evolution.xml:5632(None)
 msgid ""
 "@@image: 'figures/evo_identityedit_a.png'; "
 "md5=78418c3f6214b7494c323df12bc6921f"
@@ -521,7 +521,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5661(None)
+#: C/evolution.xml:5640(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveedit_a.png'; "
 "md5=3f5fc5b802eba3ef1a68e6ff675577b0"
@@ -531,7 +531,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5673(None)
+#: C/evolution.xml:5653(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
 "md5=1c9e818bb39bb288511cf1cebdd83569"
@@ -541,13 +541,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5718(None)
+#: C/evolution.xml:5699(None)
 msgid "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
 msgstr "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5750(None)
+#: C/evolution.xml:5731(None)
 msgid "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 msgstr ""
 " @@image: 'figures/evo_send_setup_a.png'; "
@@ -555,7 +555,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5820(None)
+#: C/evolution.xml:5802(None)
 msgid ""
 "@@image: 'figures/evo_gwstatustrack.png'; "
 "md5=d4eb84e2d55870af1408c430ce8c0e66"
@@ -565,19 +565,19 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5875(None)
+#: C/evolution.xml:5857(None)
 msgid "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
 msgstr "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:5933(None)
+#: C/evolution.xml:5915(None)
 msgid "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
 msgstr "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6074(None)
+#: C/evolution.xml:6056(None)
 msgid "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 msgstr ""
 " @@image: 'figures/evo_imapreceive_a.png'; "
@@ -585,19 +585,19 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6096(None)
+#: C/evolution.xml:6079(None)
 msgid "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 msgstr "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6105(None)
+#: C/evolution.xml:6088(None)
 msgid "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 msgstr "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6265(None)
+#: C/evolution.xml:6231(None)
 msgid ""
 "@@image: 'figures/mailer_preferences.png'; "
 "md5=4141df4bf4b2dc4e82a0bad514714194"
@@ -607,41 +607,41 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6374(None)
+#: C/evolution.xml:6340(None)
 msgid "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
 msgstr "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6469(None)
+#: C/evolution.xml:6435(None)
 msgid "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
 msgstr "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6495(None)
+#: C/evolution.xml:6461(None)
 msgid "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 msgstr "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6540(None)
+#: C/evolution.xml:6506(None)
 msgid "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
 msgstr "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:6883(None)
+#: C/evolution.xml:6850(None)
 msgid "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
 msgstr "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/evolution.xml:7035(None)
+#: C/evolution.xml:7002(None)
 msgid "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 msgstr "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 
-#: C/evolution.xml:15(title) C/evolution.xml:7425(para)
+#: C/evolution.xml:15(title) C/evolution.xml:7392(para)
 msgid "Evolution 2.22 User Guide"
 msgstr "Guía de usuario de Evolution 2.22"
 
@@ -713,8 +713,8 @@ msgstr ""
 "Una guía de usuario para Evolution que explica como usar sus características "
 "de correo, calendario, libreta de direcciones y listas de tareas."
 
-#: C/evolution.xml:76(productname) C/evolution.xml:5557(para)
-#: C/evolution.xml:7234(glossterm)
+#: C/evolution.xml:76(productname) C/evolution.xml:5536(para)
+#: C/evolution.xml:7201(glossterm)
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -740,93 +740,91 @@ msgstr ""
 "trademark> 2.22. Esta guía está dirigida a los usuarios y se divide en las "
 "siguientes secciones:"
 
-#: C/evolution.xml:88(link) C/evolution.xml:152(title)
+#: C/evolution.xml:88(link) C/evolution.xml:149(title)
 msgid "Getting Started"
 msgstr "Inicio"
 
-#: C/evolution.xml:91(link) C/evolution.xml:1110(title)
-msgid "Sending and Receiving E-Mail"
-msgstr "Envío y recepción de correo"
+#: C/evolution.xml:91(link) C/evolution.xml:1113(title)
+msgid "Sending and Receiving Email"
+msgstr "Enviar y recibir correo"
 
-#: C/evolution.xml:94(link) C/evolution.xml:2238(title)
-msgid "Organizing Your E-Mail"
-msgstr "Organización de su correo electrónico"
+#: C/evolution.xml:94(link) C/evolution.xml:2257(title)
+msgid "Organizing Your Email"
+msgstr "Organizar su correo electrónico"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:97(link) C/evolution.xml:3130(title)
+#: C/evolution.xml:97(link) C/evolution.xml:3151(title)
 msgid "Evolution Contacts: the Address Book"
 msgstr "Contactos de Evolution: la libreta de direcciones"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:100(link) C/evolution.xml:3542(title)
+#: C/evolution.xml:100(link) C/evolution.xml:3560(title)
 msgid "Evolution Calendar"
 msgstr "Calendario de Evolution"
 
-#: C/evolution.xml:103(link) C/evolution.xml:4829(title)
+#: C/evolution.xml:103(link) C/evolution.xml:4853(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Conexión a servidores Exchange"
 
-#: C/evolution.xml:106(link) C/evolution.xml:5429(title)
+#: C/evolution.xml:106(link) C/evolution.xml:5408(title)
 msgid "Connecting to GroupWise"
 msgstr "Conexión a GroupWise"
 
-#: C/evolution.xml:109(link) C/evolution.xml:6219(title)
-msgid "Connecting to Hula"
-msgstr "Conexión a Hula"
-
-#: C/evolution.xml:112(link) C/evolution.xml:6236(title)
+#: C/evolution.xml:109(link) C/evolution.xml:6202(title)
 msgid "Advanced Configuration"
 msgstr "Configuración avanzada"
 
-#: C/evolution.xml:115(link) C/evolution.xml:6897(title)
+#: C/evolution.xml:112(link) C/evolution.xml:6864(title)
 msgid "Synchronizing Your Handheld Device"
 msgstr "Sincronización de Evolution con dispositivos portátiles"
 
-#: C/evolution.xml:118(link) C/evolution.xml:6954(title)
+#: C/evolution.xml:115(link) C/evolution.xml:6921(title)
 msgid "Migration from Outlook to Evolution"
 msgstr "Migrar de Outlook a Evolution"
 
-#: C/evolution.xml:121(link) C/evolution.xml:7016(title)
+#: C/evolution.xml:118(link) C/evolution.xml:6983(title)
 msgid "Quick Reference"
 msgstr "Referencia rápida"
 
-#: C/evolution.xml:124(link) C/evolution.xml:7130(title)
+#: C/evolution.xml:121(link) C/evolution.xml:7097(title)
 msgid "Known Bugs and Limitations"
 msgstr "Fallos conocidos y limitaciones"
 
-#: C/evolution.xml:127(link) C/evolution.xml:7136(title)
+#: C/evolution.xml:124(link) C/evolution.xml:7103(title)
 msgid "Authors"
 msgstr "Autores"
 
-#: C/evolution.xml:130(link) C/evolution.xml:7195(title)
+#: C/evolution.xml:127(link) C/evolution.xml:7162(title)
 msgid "Glossary"
 msgstr "Glosario"
 
-#: C/evolution.xml:134(title)
+#: C/evolution.xml:131(title)
 msgid "Additional Documentation:"
 msgstr "Documentación adicional:"
 
-#: C/evolution.xml:135(para)
+#: C/evolution.xml:132(para)
 msgid "You can find additional help in three places:"
 msgstr "Puede encontrar ayuda adicional en tres lugares:"
 
-#: C/evolution.xml:139(para)
+#: C/evolution.xml:136(para)
 msgid ""
-"For information about command line options, open a terminal window and type "
+"Evolution has a number of command line options that you can use. For "
+"information about command line options, open a terminal window and type "
 "<command>evolution --help</command>."
 msgstr ""
-"Para más información acerca de las opciones de líneas de comandos, abra una "
-"ventana de terminal y teclee <command>evolution --help</command>."
+"Evolution tiene ciertas opciones para la línea de comandos que puede usar. "
+"Para obtener más información acerca de las opciones de líneas de comandos, "
+"abra una ventana de terminal y teclee <command>evolution --help</command>."
 
-#: C/evolution.xml:142(para)
+#: C/evolution.xml:139(para)
 msgid "In the Evolution interface, click Help &gt; Contents."
 msgstr "En el interfaz de Evolution, pulsar Ayuda &gt; Contenido."
 
-#: C/evolution.xml:146(title)
+#: C/evolution.xml:143(title)
 msgid "Documentation Conventions:"
 msgstr "Convenciones del documento:"
 
-#: C/evolution.xml:147(para)
+#: C/evolution.xml:144(para)
 msgid ""
 "In Novell documentation, a greater-than symbol (&gt;) is used to separate "
 "actions within a step and items in a cross-reference path. A trademark "
@@ -839,13 +837,14 @@ msgstr ""
 ">, etc.) denota una marca registrada de Novell. Un asterisco (*) denota una "
 "marca registrada de terceras partes."
 
-#: C/evolution.xml:153(para)
+#: C/evolution.xml:150(para)
+#, fuzzy
 msgid ""
 "<trademark>Evolution</trademark> is a <link linkend=\"groupware\">groupware</"
-"link> application that helps you work in a group by handling e-mail, "
-"address, memos, tasks, and one or more calendars. This makes the tasks of "
-"storing, organizing, and retrieving your personal information easy, so you "
-"can work and communicate more effectively with others."
+"link> application that helps you work in a group by handling email, address, "
+"memos, tasks, and one or more calendars. This makes the tasks of storing, "
+"organizing, and retrieving your personal information easy, so you can work "
+"and communicate more effectively with others."
 msgstr ""
 "<trademark>Evolution</trademark> es una aplicación de <link linkend="
 "\"groupware\">trabajo en grupo</link> que le ayuda a trabajar en grupo "
@@ -854,51 +853,52 @@ msgstr ""
 "información personal, de tal forma que puede trabajar y comunicarse de una "
 "forma más efectiva con los demás."
 
-#: C/evolution.xml:156(link) C/evolution.xml:164(title)
+#: C/evolution.xml:153(link) C/evolution.xml:161(title)
 msgid "Starting Evolution for the First Time"
 msgstr "Inicio de Evolution por primera vez"
 
-#: C/evolution.xml:159(link) C/evolution.xml:749(title)
+#: C/evolution.xml:156(link) C/evolution.xml:751(title)
 msgid "Using Evolution: An Overview"
 msgstr "Uso de Evolution: Una vista general"
 
-#: C/evolution.xml:167(para)
+#: C/evolution.xml:164(para)
 msgid "Start the Evolution client."
 msgstr "Inicio del cliente Evolution."
 
-#: C/evolution.xml:175(para)
+#: C/evolution.xml:172(para)
 msgid "GNOME:"
 msgstr "GNOME:"
 
-#: C/evolution.xml:178(para)
+#: C/evolution.xml:175(para)
 msgid "Click Applications &gt; Office &gt; Evolution."
 msgstr "Pulse en Aplicaciones &gt; Oficina &gt; Evolution."
 
-#: C/evolution.xml:183(para)
+#: C/evolution.xml:180(para)
 msgid "KDE:"
 msgstr "KDE:"
 
-#: C/evolution.xml:186(para)
+#: C/evolution.xml:183(para)
 msgid "Click the K menu &gt; Office &gt; More Programs &gt; Evolution."
 msgstr "Pulse en el menú K &gt; Oficina &gt; Más programas &gt; Evolution."
 
-#: C/evolution.xml:191(para)
+#: C/evolution.xml:188(para)
 msgid "Command Line:"
 msgstr "Línea de comandos:"
 
-#: C/evolution.xml:194(para)
+#: C/evolution.xml:191(para)
 msgid "Enter <command>evolution</command>."
 msgstr "Escriba <command>evolution</command>."
 
-#: C/evolution.xml:204(title)
+#: C/evolution.xml:201(title)
 msgid "Using the First-Run Assistant"
 msgstr "Uso del asistente para la primera ejecución"
 
-#: C/evolution.xml:205(para)
+#: C/evolution.xml:202(para)
+#, fuzzy
 msgid ""
 "The first time you run Evolution, it creates a directory <emphasis>."
 "evolution</emphasis> in your home directory, where it stores all of its "
-"local data. Then, it opens a First-Run Assistant to help you set up e-mail "
+"local data. Then, it opens a First-Run Assistant to help you set up email "
 "accounts and import data from other applications."
 msgstr ""
 "La primera vez que ejecute Evolution, éste crea un directorio llamado "
@@ -907,13 +907,13 @@ msgstr ""
 "primera vez, con el fin de ayudarle a configurar sus cuentas de correo, así "
 "como para importar datos de otras aplicaciones."
 
-#: C/evolution.xml:206(para)
+#: C/evolution.xml:203(para)
 msgid "Using the first-run assistant takes two to five minutes."
 msgstr ""
 "El asistente de primer inicio requiere entre dos y cinco minutos de su "
 "tiempo."
 
-#: C/evolution.xml:207(para)
+#: C/evolution.xml:204(para)
 msgid ""
 "Later on, if you want to change this account, or if you want to create a new "
 "one, click Edit &gt; Preferences, then click Mail Accounts. Select the "
@@ -927,7 +927,7 @@ msgstr ""
 "cuenta nueva pulsando Añadir. Vea <link linkend=\"config-prefs-mail"
 "\">Opciones de correo</link> para los detalles."
 
-#: C/evolution.xml:208(para)
+#: C/evolution.xml:205(para)
 msgid ""
 "The First-Run Assistant helps you provide the information Evolution needs to "
 "get started."
@@ -935,39 +935,39 @@ msgstr ""
 "El asistente de primera ejecución le ayuda a proporcionar la información que "
 "necesita Evolution para empezar."
 
-#: C/evolution.xml:211(link) C/evolution.xml:231(title)
+#: C/evolution.xml:208(link) C/evolution.xml:228(title)
 msgid "Defining Your Identity"
 msgstr "Definición de su identidad"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:214(link) C/evolution.xml:261(title)
+#: C/evolution.xml:211(link) C/evolution.xml:258(title)
 msgid "Receiving Mail"
 msgstr "Recepción de correo"
 
-#: C/evolution.xml:217(link) C/evolution.xml:359(title)
+#: C/evolution.xml:214(link) C/evolution.xml:353(title)
 msgid "Receiving Mail Options"
 msgstr "Opciones de recepción de correo"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:220(link) C/evolution.xml:658(title)
+#: C/evolution.xml:217(link) C/evolution.xml:659(title)
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
-#: C/evolution.xml:223(link) C/evolution.xml:712(title)
+#: C/evolution.xml:220(link) C/evolution.xml:713(title)
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
-#: C/evolution.xml:226(link) C/evolution.xml:718(title)
+#: C/evolution.xml:223(link) C/evolution.xml:719(title)
 msgid "Time Zone"
 msgstr "Zona horaria"
 
-#: C/evolution.xml:232(para)
+#: C/evolution.xml:229(para)
 msgid "The Identity window is the first step in the assistant."
 msgstr "La ventana de identidad es el primer paso del asistente."
 
-#: C/evolution.xml:234(para)
+#: C/evolution.xml:231(para)
 msgid ""
 "Here, you enter some basic personal information. You can define multiple "
 "identities later by clicking Edit &gt; Preferences, then clicking Mail "
@@ -977,7 +977,7 @@ msgstr ""
 "varias identidades más adelante pulsando Editar &gt; Preferencias, después "
 "pulsando en «Cuentas de correo»."
 
-#: C/evolution.xml:235(para)
+#: C/evolution.xml:232(para)
 msgid ""
 "When the First-Run Assistant starts, the Welcome page is displayed. Click "
 "Forward to proceed to the Identity window."
@@ -985,60 +985,60 @@ msgstr ""
 "Cuando se inicia el «Asistente de primera ejecución», se muestra la página de "
 "«Bienvenida». Pulse «Adelante» para proceder a la ventana de «Identidad»."
 
-#: C/evolution.xml:238(para)
+#: C/evolution.xml:235(para)
 msgid "Type your full name in the Full Name field."
 msgstr "Teclee su nombre completo en el campo «Nombre completo»."
 
-#: C/evolution.xml:241(para)
-msgid "Type your e-mail address in the E-Mail Address field."
-msgstr "Escriba su dirección de correo-e en el campo de direcciones de correo-e."
+#: C/evolution.xml:238(para)
+msgid "Type your email address in the Email Address field."
+msgstr "Escriba su dirección de correo-e en el campo Dirección de correo-e."
 
-#: C/evolution.xml:244(para)
+#: C/evolution.xml:241(para)
 msgid "(Optional) Select if this account is your default account."
 msgstr "(Opcional) Seleccione si esta cuenta es su cuenta predeterminada."
 
-#: C/evolution.xml:247(para)
+#: C/evolution.xml:244(para)
 msgid "(Optional) Type a reply to address in the Reply-To field."
 msgstr ""
 "(Opcional) Escriba la dirección a la que quiere que le respondan en el campo "
 "«Responder a»."
 
-#: C/evolution.xml:248(para)
+#: C/evolution.xml:245(para)
 msgid "Use this field if you want replies to messages sent to a different address."
 msgstr ""
 "Use este campo si quiere que las respuestas a los correos-e se envíen a una "
 "dirección diferente."
 
-#: C/evolution.xml:251(para)
+#: C/evolution.xml:248(para)
 msgid "(Optional) Type your organization name in the Organization field."
 msgstr "(Opcional) Teclee el nombre de su organización en el campo «Organización»."
 
-#: C/evolution.xml:252(para)
+#: C/evolution.xml:249(para)
 msgid ""
 "This is the company where you work, or the organization you represent when "
-"you send e-mail."
+"you send email."
 msgstr ""
 "Esta es la compañía para la que trabaja o la organización a la que "
 "representa cuando escribe correo-e."
 
-#: C/evolution.xml:255(para) C/evolution.xml:345(para)
-#: C/evolution.xml:423(para) C/evolution.xml:466(para)
-#: C/evolution.xml:510(para) C/evolution.xml:531(para)
-#: C/evolution.xml:554(para) C/evolution.xml:568(para)
-#: C/evolution.xml:585(para) C/evolution.xml:605(para)
-#: C/evolution.xml:626(para) C/evolution.xml:648(para)
-#: C/evolution.xml:704(para) C/evolution.xml:2305(para)
-#: C/evolution.xml:2327(para)
+#: C/evolution.xml:252(para) C/evolution.xml:339(para)
+#: C/evolution.xml:417(para) C/evolution.xml:460(para)
+#: C/evolution.xml:504(para) C/evolution.xml:526(para)
+#: C/evolution.xml:550(para) C/evolution.xml:565(para)
+#: C/evolution.xml:583(para) C/evolution.xml:604(para)
+#: C/evolution.xml:626(para) C/evolution.xml:649(para)
+#: C/evolution.xml:705(para) C/evolution.xml:2324(para)
+#: C/evolution.xml:2346(para)
 msgid "Click Forward."
 msgstr "Pulse «Adelante»."
 
-#: C/evolution.xml:262(para)
-msgid "The Receiving E-mail option lets you determine where you get your e-mail."
+#: C/evolution.xml:259(para)
+msgid "The Receiving Email option lets you determine where you get your email."
 msgstr ""
 "La opción «Recepción de correo-e» permite determinar de dónde obtendrá su "
 "correo-e."
 
-#: C/evolution.xml:264(para)
+#: C/evolution.xml:261(para)
 msgid ""
 "You need to specify the type of server you want to receive mail with. If you "
 "are unsure about the type of server to choose, ask your system administrator "
@@ -1048,22 +1048,23 @@ msgstr ""
 "Si no está seguro acerca de qué tipo de servidor elegir, pregunte a su "
 "administrador de sistemas o ISP."
 
-#: C/evolution.xml:267(para)
+#: C/evolution.xml:264(para)
 msgid "Select a server type in the Server Type list."
 msgstr "Seleccione un tipo de servidor en la lista «Tipo de servidor»."
 
-#: C/evolution.xml:268(para)
+#: C/evolution.xml:265(para)
 msgid "The following is a list of server types that are available:"
 msgstr "Lo siguiente es una lista de tipos de servidores que están disponibles:"
 
-#: C/evolution.xml:270(title)
+#: C/evolution.xml:267(title)
 msgid "Novell GroupWise:"
 msgstr "Novell GroupWise:"
 
-#: C/evolution.xml:271(para)
+#: C/evolution.xml:268(para)
+#, fuzzy
 msgid ""
 "Select this option if you connect to Novell <trademark class=\"registered"
-"\">GroupWise</trademark>. Novell GroupWise keeps e-mail, calendar, and "
+"\">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and "
 "contact information on the server. For configuration instructions, see <link "
 "linkend=\"bstfw13\">Remote Configuration Options</link>."
 msgstr ""
@@ -1073,15 +1074,16 @@ msgstr ""
 "configuración, consulte <link linkend=\"bstfw13\">Opciones de configuración "
 "remotas</link>."
 
-#: C/evolution.xml:274(title)
+#: C/evolution.xml:271(title)
 msgid "Microsoft Exchange:"
 msgstr "Microsoft Exchange:"
 
-#: C/evolution.xml:275(para)
+#: C/evolution.xml:272(para)
+#, fuzzy
 msgid ""
 "Available only if you have installed the Connector for Microsoft* Exchange. "
 "It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which "
-"stores e-mail, calendar, and contact information on the server. For "
+"stores email, calendar, and contact information on the server. For "
 "configuration instructions, see <link linkend=\"bstfw13\">Remote "
 "Configuration Options</link>."
 msgstr ""
@@ -1091,13 +1093,14 @@ msgstr ""
 "servidor. Para las instrucciones de configuración, vea <link linkend="
 "\"bstfw13\">Opciones de configuración remota</link>."
 
-#: C/evolution.xml:278(title)
+#: C/evolution.xml:275(title)
 msgid "IMAP:"
 msgstr "IMAP:"
 
-#: C/evolution.xml:279(para)
+#: C/evolution.xml:276(para)
+#, fuzzy
 msgid ""
-"Keeps the e-mail on your server so you can access your e-mail from multiple "
+"Keeps the email on your server so you can access your email from multiple "
 "systems. For configuration instructions, see <link linkend=\"bstfw13"
 "\">Remote Configuration Options</link>."
 msgstr ""
@@ -1105,42 +1108,27 @@ msgstr ""
 "diferentes. Para las instrucciones de configuración, vea <link linkend="
 "\"bstfw13\">Opciones de configuración remotas</link>."
 
-#: C/evolution.xml:282(title)
+#: C/evolution.xml:279(title)
 msgid "POP:"
 msgstr "POP:"
 
-#: C/evolution.xml:283(para)
+#: C/evolution.xml:280(para)
+#, fuzzy
 msgid ""
-"Downloads your e-mail to your hard disk for permanent storage, freeing up "
-"space on the e-mail server. For configuration instructions, see <link "
-"linkend=\"bstfw13\">Remote Configuration Options</link>."
+"Downloads your email to your hard disk for permanent storage, freeing up "
+"space on the email server. For configuration instructions, see <link linkend="
+"\"bstfw13\">Remote Configuration Options</link>."
 msgstr ""
 "Descarga su correo-e en su disco duro para almacenarlo permanentemente, "
 "liberando espacio en el servidor de correo-e. Para las instrucciones de "
 "configuración, vea <link linkend=\"bstfw13\">Opciones de configuración "
 "remota.</link>."
 
-#: C/evolution.xml:286(title)
-msgid "Hula:"
-msgstr "Hula:"
-
-#: C/evolution.xml:287(para)
-msgid ""
-"Select this option if you want Hula account. Evolution provide you "
-"connectivity to <trademark class=\"registered\">Hula</trademark> servers "
-"through IMAP and calendaring support through CalDAV. For more information "
-"refer <link linkend=\"b1012tkg\">Connecting to Hula</link>"
-msgstr ""
-"Seleccione esta opción si quiere una cuenta Hula. Evolution le proporciona "
-"conectividad con servidores <trademark class=\"registered\">Hula</trademark> "
-"a través de IMAP y a través de soporte CalDAV. Para obtener más información "
-"consulte <link linkend=\"b1012tkg\">Concetar con Hula</link>."
-
-#: C/evolution.xml:290(title)
+#: C/evolution.xml:283(title)
 msgid "USENET News:"
 msgstr "Noticias USENET:"
 
-#: C/evolution.xml:291(para)
+#: C/evolution.xml:284(para)
 msgid ""
 "Connects to the news server and downloads a list of available news digests. "
 "For configuration instructions, see <link linkend=\"bstfw13\">Remote "
@@ -1150,16 +1138,17 @@ msgstr ""
 "noticias disponibles. Para las opciones de configuración, vea <link linkend="
 "\"bstfw13\">Opciones de configuración remota</link>."
 
-#: C/evolution.xml:294(title)
+#: C/evolution.xml:287(title)
 msgid "Local Delivery:"
 msgstr "Entrega local:"
 
-#: C/evolution.xml:295(para)
+#: C/evolution.xml:288(para)
+#, fuzzy
 msgid ""
-"Choose this option if you want to move e-mail from the spool (the location "
+"Choose this option if you want to move email from the spool (the location "
 "where mail waits for delivery) and store it in your home directory. You need "
 "to provide the path to the mail spool you want to use. If you want to leave "
-"e-mail in your system's spool files, choose the Standard Unix Mbox Spool "
+"email in your system's spool files, choose the Standard Unix Mbox Spool "
 "option instead. For configuration instructions, see <link linkend=\"bstgbqn"
 "\">Local Configuration Options</link>."
 msgstr ""
@@ -1170,13 +1159,14 @@ msgstr ""
 "configuración , vea <link linkend=\"bstgbqn\">Opciones de configuración "
 "local</link>."
 
-#: C/evolution.xml:298(title)
+#: C/evolution.xml:291(title)
 msgid "MH Format Mail Directories:"
 msgstr "Directorios de correo en formato MH:"
 
-#: C/evolution.xml:299(para)
+#: C/evolution.xml:292(para)
+#, fuzzy
 msgid ""
-"If you download your e-mail using mh or another MH-style program, you should "
+"If you download your email using mh or another MH-style program, you should "
 "use this option. You need to provide the path to the mail directory you want "
 "to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local "
 "Configuration Options</link>."
@@ -1186,29 +1176,31 @@ msgstr ""
 "quiere usar. Para las instrucciones de configuración, vea <link linkend="
 "\"bstgbqn\">Opciones de configuración local</link>."
 
-#: C/evolution.xml:302(title)
+#: C/evolution.xml:295(title)
 msgid "Maildir Format Mail Directories:"
 msgstr "Directorios de correo en formato Maildir:"
 
-#: C/evolution.xml:303(para)
+#: C/evolution.xml:296(para)
+#, fuzzy
 msgid ""
-"If you download your e-mail using Qmail or another maildir-style program, "
-"you should use this option. You need to provide the path to the mail "
-"directory you want to use. For configuration instructions, see <link linkend="
-"\"bstgbqn\">Local Configuration Options</link>."
+"If you download your email using Qmail or another maildir-style program, you "
+"should use this option. You need to provide the path to the mail directory "
+"you want to use. For configuration instructions, see <link linkend=\"bstgbqn"
+"\">Local Configuration Options</link>."
 msgstr ""
 "Si descarga su correo usando Qmail u otro programa tipo maildir, querrá usar "
 "esta opción. Debe escribir la ruta de acceso al directorio de correo que "
 "quiere usar. Para las instrucciones de configuración, vea <link linkend="
 "\"bstgbqn\">Opciones de configuración local</link>."
 
-#: C/evolution.xml:306(title)
+#: C/evolution.xml:299(title)
 msgid "Standard Unix mbox spool file:"
 msgstr "Archivo spool mbox estándar de Unix:"
 
-#: C/evolution.xml:307(para)
+#: C/evolution.xml:300(para)
+#, fuzzy
 msgid ""
-"If you want to read and store e-mail in the mail spool file on your local "
+"If you want to read and store email in the mail spool file on your local "
 "system, choose this option. You need to provide the path to the mail spool "
 "file you want to use. For configuration instructions, see <link linkend="
 "\"bstgbqn\">Local Configuration Options</link>."
@@ -1219,13 +1211,14 @@ msgstr ""
 "configuración, consulte <link linkend=\"bstgbqn\">Opciones de configuración "
 "locales</link>."
 
-#: C/evolution.xml:310(title)
+#: C/evolution.xml:303(title)
 msgid "Standard Unix mbox spool directory:"
 msgstr "Directorio spool estándar de Unix:"
 
-#: C/evolution.xml:311(para)
+#: C/evolution.xml:304(para)
+#, fuzzy
 msgid ""
-"If you want to read and store e-mail in the mail spool directory on your "
+"If you want to read and store email in the mail spool directory on your "
 "local system, choose this option. You need to provide the path to the mail "
 "spool directory you want to use. For configuration instructions, see <link "
 "linkend=\"bstgbqn\">Local Configuration Options</link>."
@@ -1236,23 +1229,23 @@ msgstr ""
 "instrucciones de configuración, consulte <link linkend=\"bstgbqn\">Opciones "
 "de configuración locales</link>."
 
-#: C/evolution.xml:314(title) C/evolution.xml:5265(title)
+#: C/evolution.xml:307(title) C/evolution.xml:5244(title)
 msgid "None:"
 msgstr "Ninguno:"
 
-#: C/evolution.xml:315(para)
+#: C/evolution.xml:308(para)
 msgid ""
-"Select this if you do not plan to check e-mail with this account. If you "
+"Select this if you do not plan to check email with this account. If you "
 "select this, there are no configuration options."
 msgstr ""
 "Elija esta opción si no planea consultar correo electrónico con esta cuenta. "
 "Si selecciona esto, no hay opciones de configuración."
 
-#: C/evolution.xml:321(title)
+#: C/evolution.xml:314(title)
 msgid "Remote Configuration Options"
 msgstr "Opciones de configuración remotas"
 
-#: C/evolution.xml:322(para)
+#: C/evolution.xml:315(para)
 msgid ""
 "If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, "
 "you need to specify additional information."
@@ -1260,56 +1253,67 @@ msgstr ""
 "Si ha elegido un servidor de correo Novell GroupWise, IMAP, POP o Noticias "
 "USENET es necesario especificar información adicional."
 
-#: C/evolution.xml:325(para)
-msgid "Type the server name of your e-mail server in the Server field."
+#: C/evolution.xml:318(para) C/evolution.xml:681(para)
+msgid "Type the server name of your email server in the Server field."
 msgstr "Teclee el nombre del servidor de su correo electrónico en el campo «Servidor»."
 
-#: C/evolution.xml:326(para)
-msgid "If you don't know the Server, contact your administrator."
-msgstr "Si no sabe el nombre del servidor, contacte con su administrador."
+#: C/evolution.xml:319(para) C/evolution.xml:682(para)
+msgid ""
+"If you are unsure what your Server address is, contact your system "
+"administrator."
+msgstr ""
+"Si no está seguro de cuál es la dirección de su servidor, contacte con su "
+"administrador."
 
-#: C/evolution.xml:329(para)
-msgid "Type your username for the account in the Username field."
-msgstr "Teclee su nombre de usuario para el campo de su cuenta en el campo «Usuario»."
+#: C/evolution.xml:322(para) C/evolution.xml:694(para)
+msgid "Type your username in the Username field."
+msgstr "Teclee el usario en el campo Usuario."
 
-#: C/evolution.xml:332(para)
-msgid "Select to use a secure (SSL) connection."
-msgstr "Seleccione para usar una conexión segura (SSL)."
+#: C/evolution.xml:325(para) C/evolution.xml:702(para)
+msgid "Select if you want to use a secure connection (SSL or TLS)."
+msgstr "Seleccione su quiere usar una conexión segura (SSL o TLS)."
 
-#: C/evolution.xml:333(para)
+#: C/evolution.xml:326(para)
+msgid "You should enable this option if your server supports it."
+msgstr "Debería activar esta opción si su servidor la soporta."
+
+#: C/evolution.xml:327(para) C/evolution.xml:333(para)
 msgid ""
-"If your server supports secure connections, you should enable this security "
-"option. If you are unsure if your server supports a secure connection, "
-"contact your system administrator."
+"Free webmail providers usually supply information about which of these "
+"options can be used. If you are in an organizational environment, you may "
+"want to contact your system administrator for more information."
 msgstr ""
-"Si su servidor soporta conexiones seguras, debe activar esta opción de "
-"seguridad. Si no está seguro de si su servidor soporta una conexión segura, "
-"contacte con su administrador de sistemas."
+"Los servidores de correo web gratuitos generalmente proporcionan información "
+"acerca de cuál de estas opciones se pueden usar. Si está en un "
+"acontecimiento organizado puede que quiera contactar con el administrador de "
+"su sistema para obtener más información."
 
-#: C/evolution.xml:336(para) C/evolution.xml:688(para)
+#: C/evolution.xml:330(para) C/evolution.xml:689(para)
+#: C/evolution.xml:5073(para)
 msgid "Select your authentication type in the Authentication list."
 msgstr "Seleccione su tipo de autenticación en la lista «Autenticación»."
 
-#: C/evolution.xml:337(para) C/evolution.xml:689(para)
-#: C/evolution.xml:722(para) C/evolution.xml:1928(para)
-#: C/evolution.xml:2051(para) C/evolution.xml:2059(para)
-#: C/evolution.xml:2219(para) C/evolution.xml:2996(para)
-#: C/evolution.xml:3001(para) C/evolution.xml:3429(para)
-#: C/evolution.xml:3444(para) C/evolution.xml:3452(para)
-#: C/evolution.xml:3785(para) C/evolution.xml:3787(para)
-#: C/evolution.xml:3789(para) C/evolution.xml:3808(para)
-#: C/evolution.xml:3819(para) C/evolution.xml:3824(para)
-#: C/evolution.xml:3844(para) C/evolution.xml:3852(para)
-#: C/evolution.xml:3983(para) C/evolution.xml:3993(para)
-#: C/evolution.xml:4001(para) C/evolution.xml:4006(para)
-#: C/evolution.xml:4351(para) C/evolution.xml:4370(para)
-#: C/evolution.xml:4402(para) C/evolution.xml:4415(para)
-#: C/evolution.xml:4636(para) C/evolution.xml:6119(para)
-#: C/evolution.xml:6801(para) C/evolution.xml:6867(para)
+#: C/evolution.xml:331(para) C/evolution.xml:690(para)
+#: C/evolution.xml:723(para) C/evolution.xml:1939(para)
+#: C/evolution.xml:2063(para) C/evolution.xml:2071(para)
+#: C/evolution.xml:2238(para) C/evolution.xml:3016(para)
+#: C/evolution.xml:3021(para) C/evolution.xml:3447(para)
+#: C/evolution.xml:3462(para) C/evolution.xml:3470(para)
+#: C/evolution.xml:3803(para) C/evolution.xml:3805(para)
+#: C/evolution.xml:3807(para) C/evolution.xml:3827(para)
+#: C/evolution.xml:3838(para) C/evolution.xml:3843(para)
+#: C/evolution.xml:3864(para) C/evolution.xml:3872(para)
+#: C/evolution.xml:3988(para) C/evolution.xml:3999(para)
+#: C/evolution.xml:4004(para) C/evolution.xml:4015(para)
+#: C/evolution.xml:4023(para) C/evolution.xml:4028(para)
+#: C/evolution.xml:4374(para) C/evolution.xml:4393(para)
+#: C/evolution.xml:4425(para) C/evolution.xml:4438(para)
+#: C/evolution.xml:4660(para) C/evolution.xml:6102(para)
+#: C/evolution.xml:6768(para) C/evolution.xml:6834(para)
 msgid "or"
 msgstr "o"
 
-#: C/evolution.xml:338(para) C/evolution.xml:690(para)
+#: C/evolution.xml:332(para) C/evolution.xml:691(para)
 msgid ""
 "Click Check for Supported Types to have Evolution check for supported types. "
 "Some servers do not announce the authentication mechanisms they support, so "
@@ -1321,23 +1325,15 @@ msgstr ""
 "autenticación que soportan, así que pulsar este botón no garantiza que el "
 "mecanismo disponible funcione realmente."
 
-#: C/evolution.xml:339(para)
-msgid ""
-"If you are unsure what authentication type you need, contact your system "
-"administrator."
-msgstr ""
-"Si no está seguro de qué tipo de autenticación necesita, contacte con su "
-"administrador de sistemas."
-
-#: C/evolution.xml:342(para) C/evolution.xml:696(para)
+#: C/evolution.xml:336(para) C/evolution.xml:697(para)
 msgid "Select if you want Evolution to remember your password."
 msgstr "Marque si quiere que Evolution recuerde su contraseña."
 
-#: C/evolution.xml:348(para)
+#: C/evolution.xml:342(para)
 msgid ""
 "(Conditional) If you chose Microsoft Exchange as the server type, provide "
 "your username in the Username field and your Outlook Web Access (OWA) URL in "
-"the OWA URL field. The URL and the usernames should use the Outlook format."
+"the OWA URL field. The URL and the usernames should use the Outlook format. "
 "If the mailbox path is different from the username, the OWA path should also "
 "include mailbox path, for example http://<varname>server name</varname>/"
 "exchange/<varname>mail box path</varname>."
@@ -1347,10 +1343,10 @@ msgstr ""
 "Access (OWA) en el campo OWA URL. El URL y los nombres de usuario deben usar "
 "el formato Outlook.Si la ruta del buzón es diferente de la del nombre de "
 "usuario, la ruta OWA debería además incluir la ruta del buzón , por ejemplo "
-"http://<varname>nombreservidor</varname>/exchange/<varname>ruta del buzón</"
-"varname>."
+"http://<varname>nombre del servidor</varname>/exchange/<varname>ruta del "
+"buzón</varname>."
 
-#: C/evolution.xml:349(para)
+#: C/evolution.xml:343(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -1358,17 +1354,17 @@ msgstr ""
 "Cuando haya terminado, continúe con las <link linkend=\"more-mail-options"
 "\">Opciones de recepción de correo</link>."
 
-#: C/evolution.xml:353(title)
+#: C/evolution.xml:347(title)
 msgid "Local Configuration Options"
 msgstr "Opciones de configuración local"
 
-#: C/evolution.xml:354(para)
+#: C/evolution.xml:348(para)
 msgid ""
 "If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format "
-"Mail Directories, or Standard Unix mbox spool file and Standard Unix mbox "
-"spool directory, you must specify the path to the local files in the path "
-"field. Continue with<link linkend=\"more-mail-options\">Receiving Mail "
-"Options</link> ."
+"Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool "
+"directory, you must specify the path to the local files in the path field. "
+"Continue with<link linkend=\"more-mail-options\">Receiving Mail Options</"
+"link>."
 msgstr ""
 "Si seleccionó Entrega local, Directorios de correo en formato MH, Formato "
 "Maildir, o cola de correo estándar de Unix y directorio spool estándar de "
@@ -1376,7 +1372,7 @@ msgstr ""
 "Continúe con <link linkend=\"more-mail-options\">Opciones de recepción de "
 "correo</link>."
 
-#: C/evolution.xml:360(para)
+#: C/evolution.xml:354(para)
 msgid ""
 "After you have selected a mail delivery mechanism, you can set some "
 "preferences for its behavior."
@@ -1384,43 +1380,43 @@ msgstr ""
 "Tras haber seleccionado un mecanismo de entrega de correo, puede establecer "
 "algunas preferencias para su comportamiento."
 
-#: C/evolution.xml:363(link) C/evolution.xml:392(title)
+#: C/evolution.xml:357(link) C/evolution.xml:386(title)
 msgid "Novell GroupWise Receiving Options"
 msgstr "Opciones de recepción de Novell GroupWise"
 
-#: C/evolution.xml:366(link) C/evolution.xml:432(title)
+#: C/evolution.xml:360(link) C/evolution.xml:426(title)
 msgid "Microsoft Exchange Receiving Options"
 msgstr "Opciones de recepción de Microsoft Exchange"
 
-#: C/evolution.xml:369(link) C/evolution.xml:473(title)
+#: C/evolution.xml:363(link) C/evolution.xml:467(title)
 msgid "IMAP Receiving Options"
 msgstr "Opciones de recepción IMAP"
 
-#: C/evolution.xml:372(link) C/evolution.xml:517(title)
+#: C/evolution.xml:366(link) C/evolution.xml:511(title)
 msgid "POP Receiving Options"
 msgstr "Opciones de recepción POP"
 
-#: C/evolution.xml:375(link) C/evolution.xml:538(title)
+#: C/evolution.xml:369(link) C/evolution.xml:533(title)
 msgid "USENET News Receiving Options"
 msgstr "Opciones de recepción de Noticias USENET"
 
-#: C/evolution.xml:378(link) C/evolution.xml:561(title)
+#: C/evolution.xml:372(link) C/evolution.xml:557(title)
 msgid "Local Delivery Receiving Options"
 msgstr "Opciones de recepción de entrega local"
 
-#: C/evolution.xml:381(link) C/evolution.xml:575(title)
+#: C/evolution.xml:375(link) C/evolution.xml:572(title)
 msgid "MH-Format Mail Directories Receiving Options"
 msgstr "Opciones de recepción para directorios de correo en formato MH"
 
-#: C/evolution.xml:384(link) C/evolution.xml:594(title)
+#: C/evolution.xml:378(link) C/evolution.xml:592(title)
 msgid "Maildir-Format Mail Directories Receiving Options"
 msgstr "Opciones de recepción para directorios de correo en formato Maildir"
 
-#: C/evolution.xml:387(link) C/evolution.xml:614(title)
+#: C/evolution.xml:381(link) C/evolution.xml:613(title)
 msgid "Standard Unix mbox spool file Receiving Options"
 msgstr "Opciones de recepción para el archivo spool mbox estándar de Unix"
 
-#: C/evolution.xml:393(para)
+#: C/evolution.xml:387(para)
 msgid ""
 "If you select Novell GroupWise as your receiving server type, you need to "
 "specify the following options:"
@@ -1428,13 +1424,21 @@ msgstr ""
 "Si seleccione Novell GroupWise como su tipo de servidor para recepción, "
 "necesita especificar las opciones siguientes:"
 
-#: C/evolution.xml:396(para) C/evolution.xml:437(para)
-#: C/evolution.xml:478(para)
+#: C/evolution.xml:390(para) C/evolution.xml:431(para)
+#: C/evolution.xml:472(para) C/evolution.xml:516(para)
+#: C/evolution.xml:538(para) C/evolution.xml:561(para)
+#: C/evolution.xml:576(para) C/evolution.xml:596(para)
+#: C/evolution.xml:616(para) C/evolution.xml:639(para)
+#: C/evolution.xml:5651(para)
 msgid "Select if you want Evolution to automatically check for new mail."
 msgstr "Marque si quiere que Evolution compruebe automáticamente si hay correo nuevo."
 
-#: C/evolution.xml:397(para) C/evolution.xml:438(para)
-#: C/evolution.xml:479(para) C/evolution.xml:5672(para)
+#: C/evolution.xml:391(para) C/evolution.xml:432(para)
+#: C/evolution.xml:473(para) C/evolution.xml:517(para)
+#: C/evolution.xml:539(para) C/evolution.xml:562(para)
+#: C/evolution.xml:577(para) C/evolution.xml:597(para)
+#: C/evolution.xml:617(para) C/evolution.xml:640(para)
+#: C/evolution.xml:5652(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "check for new messages."
@@ -1442,21 +1446,24 @@ msgstr ""
 "Si selecciona esta opción, necesita especificar con qué frecuencia Evolution "
 "debe comprobar si hay mensajes nuevos."
 
-#: C/evolution.xml:400(para) C/evolution.xml:441(para)
-#: C/evolution.xml:5677(para)
+#: C/evolution.xml:394(para) C/evolution.xml:435(para)
+#: C/evolution.xml:5657(para)
 msgid "Select if you want to check for new messages in all folders."
 msgstr "Marque si quiere que compruebe si hay mensajes nuevos en todas las carpetas."
 
-#: C/evolution.xml:403(para) C/evolution.xml:5680(para)
+#: C/evolution.xml:397(para) C/evolution.xml:453(para)
+#: C/evolution.xml:488(para) C/evolution.xml:600(para)
+#: C/evolution.xml:620(para) C/evolution.xml:643(para)
+#: C/evolution.xml:5660(para)
 msgid ""
-"Select if you want to apply filters to new messages in the Inbox on the "
-"server."
+"Select Apply filters to new messages in inbox on this server if you want to "
+"apply filters."
 msgstr ""
-"Seleccione si quiere aplicar los filtros a los mensajes nuevos en la Bandeja "
-"de entrada en el servidor."
+"Seleccione Aplicar filtros a los mensajes nuevos en la Bandeja de entrada en "
+"este servidor si desea aplicar los filtros."
 
-#: C/evolution.xml:404(para) C/evolution.xml:495(para)
-#: C/evolution.xml:602(para) C/evolution.xml:5681(para)
+#: C/evolution.xml:398(para) C/evolution.xml:489(para)
+#: C/evolution.xml:601(para) C/evolution.xml:5661(para)
 msgid ""
 "For additional information on filtering, see <link linkend=\"usage-mail-org-"
 "filters-new\">Creating New Filter Rules</link>."
@@ -1464,30 +1471,36 @@ msgstr ""
 "Para información adicional para el filtrado, vea <link linkend=\"usage-mail-"
 "org-filters-new\">Creación de reglas de filtrado nuevas</link>."
 
-#: C/evolution.xml:407(para) C/evolution.xml:498(para)
-#: C/evolution.xml:5684(para)
+#: C/evolution.xml:401(para) C/evolution.xml:456(para)
+#: C/evolution.xml:492(para) C/evolution.xml:5664(para)
 msgid "Select if you want to check new messages for junk content."
 msgstr "Seleccione si quiere comprobar si los mensajes nuevos son basura."
 
-#: C/evolution.xml:408(para)
+#: C/evolution.xml:402(para) C/evolution.xml:457(para)
+#: C/evolution.xml:493(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"usage-mail-"
 "organize-spam\">Stopping Junk Mail (Spam)</link> and <link linkend=\"mail-"
-"prefs-junk\">Junk </link>."
+"prefs-junk\">Junk</link>."
 msgstr ""
 "Para obtener información adicional acerca del correo basura, consulte <link "
 "linkend=\"usage-mail-organize-spam\">Parar el correo basura (SPAM)</link> y "
-"<link linkend=\"mail-prefs-junk\">Preferencias de spam</link>."
+"<link linkend=\"mail-prefs-junk\">SPAM</link>."
 
-#: C/evolution.xml:411(para) C/evolution.xml:5688(para)
+#: C/evolution.xml:405(para) C/evolution.xml:5668(para)
 msgid "Select if you want to only check for junk messages in the Inbox folder."
 msgstr "Marque si sólo quiere comprobar el correo basura en la Bandeja de entrada."
 
-#: C/evolution.xml:414(para) C/evolution.xml:505(para)
-msgid "Select if you want to automatically synchronize remote mail locally."
-msgstr "Marque si quiere sincronizar automáticamente el correo remoto localmente."
+#: C/evolution.xml:408(para) C/evolution.xml:450(para)
+#: C/evolution.xml:499(para)
+msgid ""
+"Select Automatically synchronize remote mail locally to download the "
+"messages to your local system."
+msgstr ""
+"Seleccione Sincronizar automáticamente el correo remoto localmente para "
+"descargar los correos a su sistema local."
 
-#: C/evolution.xml:415(para) C/evolution.xml:506(para)
+#: C/evolution.xml:409(para) C/evolution.xml:500(para)
 msgid ""
 "Evolution, by default downloads only the header information such as From, "
 "Subject, and Date. The body of the message and the attachments are "
@@ -1501,12 +1514,12 @@ msgstr ""
 "tiempo y uso de la red. Esto es útil cuando no lee todos los mensajes que "
 "recibe."
 
-#: C/evolution.xml:416(para) C/evolution.xml:507(para)
+#: C/evolution.xml:410(para) C/evolution.xml:501(para)
 msgid ""
 "If you check this option, evolution fetches the headers as well as the body "
 "of the message simultaneously. In this case, the time taken to open a "
 "message is comparatively less. In addition to that, you can download the "
-"mails for reading them offline, when you have checked this option."
+"mail for reading them offline, when you have checked this option."
 msgstr ""
 "Si selecciona esta opción, Evolution obtendrá las cabeceras así como el "
 "cuerpo del mensaje de forma simultánea. En este caso, el tiempo que lleva "
@@ -1514,7 +1527,7 @@ msgstr ""
 "descargar los correos para leerlos cuando esté desconectado, siempre que "
 "haya seleccionado esta opción."
 
-#: C/evolution.xml:419(para)
+#: C/evolution.xml:413(para)
 msgid ""
 "Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -1522,7 +1535,7 @@ msgstr ""
 "Teclee su puerto de Agente SOAP de Oficina de correos en el campo Puerto del "
 "Agente SOAP de Oficina de Correos."
 
-#: C/evolution.xml:420(para) C/evolution.xml:5699(para)
+#: C/evolution.xml:414(para) C/evolution.xml:5679(para)
 msgid ""
 "If you are unsure what your Post Office Agent SOAP port is, contact your "
 "system administrator."
@@ -1530,11 +1543,11 @@ msgstr ""
 "Si no está seguro de qué puerto es para su Agente SOAP de Oficina de "
 "Correos, contacte con su administrador de sistemas."
 
-#: C/evolution.xml:428(para) C/evolution.xml:469(para)
-#: C/evolution.xml:513(para) C/evolution.xml:534(para)
-#: C/evolution.xml:557(para) C/evolution.xml:571(para)
-#: C/evolution.xml:590(para) C/evolution.xml:610(para)
-#: C/evolution.xml:631(para) C/evolution.xml:653(para)
+#: C/evolution.xml:422(para) C/evolution.xml:463(para)
+#: C/evolution.xml:507(para) C/evolution.xml:529(para)
+#: C/evolution.xml:553(para) C/evolution.xml:568(para)
+#: C/evolution.xml:588(para) C/evolution.xml:609(para)
+#: C/evolution.xml:631(para) C/evolution.xml:654(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"third-step\">Sending "
 "Mail</link>."
@@ -1542,7 +1555,7 @@ msgstr ""
 "Cuando haya terminado, continúe con <link linkend=\"third-step\">Envio de "
 "correo</link>."
 
-#: C/evolution.xml:433(para)
+#: C/evolution.xml:427(para)
 msgid ""
 "If you select Microsoft Exchange as your receiving server type, you need to "
 "specify the following options:"
@@ -1550,7 +1563,7 @@ msgstr ""
 "Si ha elegido un servidor de correo Microsoft Exchange como su servidor para "
 "recepción, necesitará especificar la  siguiente información:"
 
-#: C/evolution.xml:444(para)
+#: C/evolution.xml:438(para)
 msgid ""
 "Specify the Global Catalog server name in the Global Catalog Server Name "
 "field."
@@ -1558,7 +1571,7 @@ msgstr ""
 "Especifique el nombre del servidor de Catálogo Global en el campo «Nombre del "
 "servidor de catálogo global»."
 
-#: C/evolution.xml:445(para)
+#: C/evolution.xml:439(para)
 msgid ""
 "The Global Catalog Server contains the user information for users. If you "
 "are unsure what your Global Catalog server name is, contact your system "
@@ -1568,25 +1581,26 @@ msgstr ""
 "Si no está seguro de cual es el nombre del servidor de «Catálogo Global», "
 "contacte con su administrador de sistemas."
 
-#: C/evolution.xml:448(para)
+#: C/evolution.xml:442(para)
 msgid "Select if you want to limit the number of Global Address Lists (GAL)."
 msgstr ""
 "Seleccione si quiere limitar el número de «Listas de direcciones globales "
 "(GAL)»."
 
-#: C/evolution.xml:449(para)
+#: C/evolution.xml:443(para)
+#, fuzzy
 msgid ""
-"The GAL contains a list of all e-mail addresses. If you select this option, "
+"The GAL contains a list of all email addresses. If you select this option, "
 "you need to specify the maximum number of responses."
 msgstr ""
 "El GAL contiene una lista de todas las direcciones de correo-e. Si "
 "selecciona esta opción, necesita especificar el número máximo de respuestas."
 
-#: C/evolution.xml:452(para)
+#: C/evolution.xml:446(para)
 msgid "Select if you want to use a password expire warning time period."
 msgstr "Marque si quiere usar una advertencia de expiración de contraseña."
 
-#: C/evolution.xml:453(para)
+#: C/evolution.xml:447(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "send the password expire message."
@@ -1594,39 +1608,7 @@ msgstr ""
 "Si selecciona esta opción, necesita especificar la frecuencia con que "
 "Evolution envía un mensaje de contraseña caducada."
 
-#: C/evolution.xml:456(para)
-msgid ""
-"Select automatically synchronize remote mail locally to download the "
-"messages to your local system."
-msgstr ""
-"Marque si quiere sincronizar automáticamente el correo remoto localmente "
-"para descargar los correos a su sistema local."
-
-#: C/evolution.xml:459(para)
-msgid ""
-"Select apply filters to new messages in inbox on this server to apply "
-"filters."
-msgstr ""
-"Marque si quiere aplicar los filtros a los mensajes nuevos en la Bandeja de "
-"entrada en este servidor para aplicar los filtros."
-
-#: C/evolution.xml:462(para)
-msgid ""
-"Select check new messages for junk contents to filter new messages for spam "
-"messages."
-msgstr ""
-"Marque si quiere comprobar si los mensajes nuevos contienen basura para "
-"filtrar los nuevos mensajes como correos SPAM."
-
-#: C/evolution.xml:463(para)
-msgid ""
-"For more information refer <link linkend=\"usage-mail-organize-spam"
-"\">Stopping Junk Mail (Spam)</link>"
-msgstr ""
-"Para información adicional vea <link linkend=\"usage-mail-organize-spam"
-"\">Parar el correo basura (SPAM)</link>"
-
-#: C/evolution.xml:474(para)
+#: C/evolution.xml:468(para)
 msgid ""
 "If you select IMAP as your receiving server type, you need to specify the "
 "following options:"
@@ -1634,13 +1616,15 @@ msgstr ""
 "Si selecciona IMAP como su tipo de servidor de recepción, necesita "
 "especificar las siguientes opciones:"
 
-#: C/evolution.xml:482(para)
-msgid "Select if you want Evolution to use custom commands to connect to Evolution."
+#: C/evolution.xml:476(para)
+msgid ""
+"Select if you want Evolution to use custom commands to connect to the IMAP "
+"server."
 msgstr ""
 "Seleccione si quiere que Evolution use comandos personalizados para "
-"conectarse al servidor."
+"conectarse al servidor IMAP."
 
-#: C/evolution.xml:483(para)
+#: C/evolution.xml:477(para)
 msgid ""
 "If you select this option, specify the custom command you want Evolution to "
 "use."
@@ -1648,11 +1632,11 @@ msgstr ""
 "Si selecciona esta opción, especifique el comando personalizado que quiere "
 "que Evolution use."
 
-#: C/evolution.xml:486(para)
+#: C/evolution.xml:480(para)
 msgid "Select if you want Evolution to show only subscribed folders."
 msgstr "Marque si quiere que Evolution sólo muestre las carpetas suscritas."
 
-#: C/evolution.xml:487(para)
+#: C/evolution.xml:481(para)
 msgid ""
 "Subscribed folders are folders that you have chosen to receive mail from by "
 "subscribing to them."
@@ -1660,13 +1644,13 @@ msgstr ""
 "Las carpetas suscritas son carpetas que ha elegido para recibir el correo "
 "suscribiéndose a ellas."
 
-#: C/evolution.xml:490(para)
+#: C/evolution.xml:484(para)
 msgid "Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
 "Marque si quiere que Evolution no haga caso de los espacios de nombres de "
 "carpetas suministrados por el servidor."
 
-#: C/evolution.xml:491(para)
+#: C/evolution.xml:485(para)
 msgid ""
 "By choosing this option you can rename the folders that the server provides. "
 "If you select this option, you need to specify the namespace to use."
@@ -1675,28 +1659,13 @@ msgstr ""
 "servidos. Si selecciona esta opción, necesita especificar el espacio de "
 "nombres a usar."
 
-#: C/evolution.xml:494(para) C/evolution.xml:601(para)
-#: C/evolution.xml:620(para) C/evolution.xml:642(para)
-msgid "Select if you want to apply filters to new messages in the Inbox."
-msgstr ""
-"Marque esto si quiere aplicar filtros a los mensajes nuevos en la Bandeja de "
-"entrada."
-
-#: C/evolution.xml:499(para) C/evolution.xml:5685(para)
-msgid ""
-"For additional information on junk content, see <link linkend=\"mail-prefs-"
-"junk\">Junk Mail Preferences</link>."
-msgstr ""
-"Para información adicional acerca del correo basura, vea <link linkend="
-"\"mail-prefs-junk\">Preferencias de spam</link>."
-
-#: C/evolution.xml:502(para)
+#: C/evolution.xml:496(para)
 msgid "Select if you want to check for junk messages in the Inbox folder."
 msgstr ""
 "Marque si quiere comprobar si el los mensajes de la Bandeja de entrada son "
 "spam."
 
-#: C/evolution.xml:519(para)
+#: C/evolution.xml:513(para)
 msgid ""
 "If you select POP as your receiving server type, you need to specify the "
 "following options:"
@@ -1704,32 +1673,15 @@ msgstr ""
 "Si selecciona POP como su tipo de servidor de recepción, necesita "
 "especificar las opciones siguientes:"
 
-#: C/evolution.xml:522(para) C/evolution.xml:543(para)
-#: C/evolution.xml:565(para) C/evolution.xml:579(para)
-#: C/evolution.xml:598(para) C/evolution.xml:617(para)
-#: C/evolution.xml:639(para)
-msgid ""
-"Select if you want Evolution to automatically check for new mail.If you "
-"select this option, you need to specify how often Evolution should check for "
-"new messages."
-msgstr ""
-"Marque si quiere que Evolution compruebe si hay correo nuevo. Si selecciona "
-"esta opción, necesitará especificar con qué frecuencia debe comprobar "
-"Evolution si hay mensajes nuevos."
-
-#: C/evolution.xml:525(para)
+#: C/evolution.xml:520(para)
 msgid "Select if you want to leave messages on the server."
 msgstr "Marque si quiere dejar los mensajes en el servidor."
 
-#: C/evolution.xml:528(para)
-msgid ""
-"Select if you want to disable support for all POP3 extensions (support for "
-"POP3)."
-msgstr ""
-"Seleccione si queire desactivar el soporte para todas las extensiones POP3 "
-"(soporte para POP3)."
+#: C/evolution.xml:523(para)
+msgid "Select if you want to disable support for all POP3 extensions."
+msgstr "Seleccione si quiere desactivar el soporte para todas las extensiones POP3."
 
-#: C/evolution.xml:540(para)
+#: C/evolution.xml:535(para)
 msgid ""
 "If you select USENET News as your receiving server type, you need to specify "
 "the following options:"
@@ -1737,15 +1689,15 @@ msgstr ""
 "Si selecciona noticias USENET como si tipo de servidor, entonces necesita "
 "especificar las siguientes opciones:"
 
-#: C/evolution.xml:546(para)
+#: C/evolution.xml:542(para)
 msgid "Select if you want to show folders in short notation."
 msgstr "Seleccione si quiere mostrar las carpetas en notación corta."
 
-#: C/evolution.xml:547(para)
+#: C/evolution.xml:543(para)
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr "Por ejemplo, com.os.linux aparecería como c.o.linux."
 
-#: C/evolution.xml:550(para)
+#: C/evolution.xml:546(para)
 msgid ""
 "Select if you want to show relative folder names in the subscription dialog "
 "box."
@@ -1753,7 +1705,7 @@ msgstr ""
 "Seleccione si quiere mostrar los nombres de carpetas relativos en la caja de "
 "suscripción del diálogo."
 
-#: C/evolution.xml:551(para)
+#: C/evolution.xml:547(para)
 msgid ""
 "If you select to show relative folder names in the subscription page, only "
 "the name of the folder is displayed. For example the folder evolution.mail "
@@ -1763,7 +1715,7 @@ msgstr ""
 "suscripción, se muestra sólo el nombre de la carpeta. Por ejemplo, la "
 "carpeta evolution.mail aparecería como evolution."
 
-#: C/evolution.xml:562(para)
+#: C/evolution.xml:558(para)
 msgid ""
 "If you select Local Delivery as your receiving server type, you need to "
 "specify the following options:"
@@ -1771,7 +1723,7 @@ msgstr ""
 "Si selecciona «Entrega local» como su tipo de servidor de recepción, necesita "
 "especificar las siguientes opciones:"
 
-#: C/evolution.xml:576(para)
+#: C/evolution.xml:573(para)
 msgid ""
 "If you select MH-Format Mail Directories as your receiving server type, you "
 "need to specify the following options:"
@@ -1779,13 +1731,13 @@ msgstr ""
 "Si selecciona directorios en formato MH como su tipo de servidor de "
 "recepción, necesita especificar las opciones siguientes:"
 
-#: C/evolution.xml:582(para)
+#: C/evolution.xml:580(para)
 msgid "Select if you want to use the <emphasis>.folders</emphasis> summary file."
 msgstr ""
 "Seleccione si quiere usar el archivo de resumen <emphasis>.folders</"
 "emphasis>."
 
-#: C/evolution.xml:595(para)
+#: C/evolution.xml:593(para)
 msgid ""
 "If you select Maildir-Format Mail Directories as your receiving server type, "
 "you need to specify the following options:"
@@ -1793,7 +1745,7 @@ msgstr ""
 "Si selecciona directorios en formato Maildir como su tipo de servidor de "
 "recepción, necesita especificar las opciones siguientes:"
 
-#: C/evolution.xml:623(para) C/evolution.xml:645(para)
+#: C/evolution.xml:623(para) C/evolution.xml:646(para)
 msgid "Select if you want to store status headers in Elm, Pine, and Mutt formats."
 msgstr ""
 "Seleccione si quiere almacenar las cabeceras de estado en los formatos Elm, "
@@ -1811,7 +1763,7 @@ msgstr ""
 "Si selecciona directorios estándar Unix de correo como su tipo de servidor "
 "de recepción, necesita especificar las opciones siguientes:"
 
-#: C/evolution.xml:659(para)
+#: C/evolution.xml:660(para)
 msgid ""
 "Now that you have entered information about how you plan to get mail, "
 "Evolution needs to know about how you want to send it."
@@ -1819,19 +1771,19 @@ msgstr ""
 "Ahora que ha introducido la información acerca de cómo planea obtener el "
 "correo, Evolution necesita saber cómo quiere enviarlo."
 
-#: C/evolution.xml:662(para)
+#: C/evolution.xml:663(para)
 msgid "Select a server type from the Server Type list."
 msgstr "Seleccione un tipo de servidor de la lista de tipos de servidores."
 
-#: C/evolution.xml:663(para)
+#: C/evolution.xml:664(para)
 msgid "The following server types are available:"
 msgstr "Están disponibles los siguientes tipos de servidores:"
 
-#: C/evolution.xml:665(title)
+#: C/evolution.xml:666(title)
 msgid "Sendmail:"
 msgstr "Sendmail:"
 
-#: C/evolution.xml:666(para)
+#: C/evolution.xml:667(para)
 msgid ""
 "Uses the Sendmail program to send mail from your system. Sendmail is more "
 "flexible, but is not as easy to configure, so you should select this option "
@@ -1841,11 +1793,11 @@ msgstr ""
 "Sendmail es muy flexible pero no es tan fácil de configurar por lo que sólo "
 "debería elegir esta opción si sabe cómo poner en marcha un servicio Sendmail."
 
-#: C/evolution.xml:669(title)
+#: C/evolution.xml:670(title)
 msgid "SMTP:"
 msgstr "SMTP:"
 
-#: C/evolution.xml:670(para)
+#: C/evolution.xml:671(para)
 msgid ""
 "Sends mail using an outbound mail server. This is the most common choice for "
 "sending mail. If you choose SMTP, there are additional configuration "
@@ -1857,27 +1809,15 @@ msgstr ""
 "adicionales. Vea <link linkend=\"bsthwzo\">Configuración SMTP</link> para "
 "más información."
 
-#: C/evolution.xml:676(title)
+#: C/evolution.xml:677(title)
 msgid "SMTP Configuration"
 msgstr "Configuración SMTP"
 
-#: C/evolution.xml:680(para)
-msgid "Type the Server address in the Server field."
-msgstr "Tecle la dirección del servidor en el campo «Servidor»."
-
-#: C/evolution.xml:681(para)
-msgid ""
-"If you are unsure what your Server address is, contact your system "
-"administrator."
-msgstr ""
-"Si no está seguro de cuál es la dirección de su servidor, contacte con su "
-"administrador."
-
-#: C/evolution.xml:684(para)
+#: C/evolution.xml:685(para)
 msgid "Select if your server requires authentication."
 msgstr "Seleccione si su servidor requiere autenticación."
 
-#: C/evolution.xml:685(para)
+#: C/evolution.xml:686(para)
 msgid ""
 "If you selected that your server requires authentication, you need to "
 "provide the following information:"
@@ -1885,21 +1825,14 @@ msgstr ""
 "Si seleccionó que su servidor requiere autenticación, necesita proporcionar "
 "la siguiente información:"
 
-#: C/evolution.xml:693(para)
-msgid "Type your username in the Username field."
-msgstr "Teclee el usario en el campo Usuario."
-
-#: C/evolution.xml:701(para)
-msgid "Select if you use a secure connection (SSL)."
-msgstr "Seleccione su usa una conexión segura (SSL)."
-
-#: C/evolution.xml:707(para)
+#: C/evolution.xml:708(para)
 msgid "Continue with <link linkend=\"bsti1ty\">Account Management</link>."
 msgstr "Continue con <link linkend=\"bsti1ty\">Gestión de cuentas</link>."
 
-#: C/evolution.xml:713(para)
+#: C/evolution.xml:714(para)
+#, fuzzy
 msgid ""
-"Now that you have finished the e-mail configuration process you need to give "
+"Now that you have finished the email configuration process you need to give "
 "the account a name. The name can be any name you prefer. Type your account "
 "name on the Name field, then click Forward."
 msgstr ""
@@ -1907,7 +1840,7 @@ msgstr ""
 "a la cuenta un nombre. El nombre puede ser cualquiera que prefiera. Teclee "
 "su nombre de cuenta en el campo Nombre, después pulse Adelante."
 
-#: C/evolution.xml:714(para)
+#: C/evolution.xml:715(para)
 msgid ""
 "Continue with <link linkend=\"step-three-b\">Time Zone</link><link linkend="
 "\"step-three-b\"/>."
@@ -1915,25 +1848,26 @@ msgstr ""
 "Continue con la <link linkend=\"step-three-b\">Zona horaria</link><link "
 "linkend=\"step-three-b\"/>."
 
-#: C/evolution.xml:721(para)
+#: C/evolution.xml:722(para)
 msgid "Select your time zone on the map."
 msgstr "Seleccione su zona horaria en el mapa."
 
-#: C/evolution.xml:723(para)
+#: C/evolution.xml:724(para)
 msgid "Select from the time zone drop-down list."
 msgstr "Seleccione de la lista despegable de zonas horarias."
 
-#: C/evolution.xml:728(para)
+#: C/evolution.xml:729(para)
 msgid "Click OK, then click Apply."
 msgstr "Pulse Aceptar, después pulse Aplicar."
 
-#: C/evolution.xml:729(para)
+#: C/evolution.xml:730(para)
 msgid "Evolution opens with your new account created."
 msgstr "Evolution se abre con su cuenta nueva creada."
 
-#: C/evolution.xml:732(para)
+#: C/evolution.xml:733(para)
+#, fuzzy
 msgid ""
-"If you want to import e-mail from another e-mail client, continue with <link "
+"If you want to import email from another email client, continue with <link "
 "linkend=\"fourth-step\">Importing Mail (Optional)</link>. If not, skip to "
 "<link linkend=\"ui-intro\">Using Evolution: An Overview</link>."
 msgstr ""
@@ -1941,13 +1875,14 @@ msgstr ""
 "linkend=\"fourth-step\">Importar de correo (opcional)</link>. Si no, salte a "
 "<link linkend=\"ui-intro\">Uso de Evolution: Una vista general</link>."
 
-#: C/evolution.xml:736(title)
+#: C/evolution.xml:737(title)
 msgid "Importing Mail (Optional)"
 msgstr "Importar correo (opcional)"
 
-#: C/evolution.xml:737(para)
+#: C/evolution.xml:738(para)
+#, fuzzy
 msgid ""
-"After selecting your time zone, if Evolution finds e-mail or address files "
+"After selecting your time zone, if Evolution finds email or address files "
 "from another application, it offers to import them. For a full description "
 "of the import feature, see <link linkend=\"importing-mail\">Importing Single "
 "Files</link>."
@@ -1957,35 +1892,43 @@ msgstr ""
 "descripción de la característica de importación, vea <link linkend="
 "\"importing-mail\">Importación de archivos aislados</link>."
 
-#: C/evolution.xml:738(para)
+#: C/evolution.xml:739(para) C/evolution.xml:2355(para)
 msgid ""
 "Microsoft Outlook* and versions of Outlook Express after version 4 use "
-"proprietary formats that Evolution cannot read or import. To import "
-"information, you might want to use the Export tool under Windows*. See the "
-"instructions in <link linkend=\"outlook-migration-mail\">Migrating Local "
-"Outlook Mail Folders</link>."
+"proprietary formats that Evolution cannot read or import."
 msgstr ""
-"Microsoft Outlook y las versiones de Outlook Express posteriores a la "
-"versión 4, utilizan formatos propietarios que Evolution no puede leer ni "
-"importar. Para importar información, quizá quiera usar la herramienta de "
-"Exportación bajo Windows*. Vea las instrucciones en <link linkend=\"outlook-"
-"migration-mail\">Migrar carpetas de correo locales de Outlook</link>."
+"Microsoft Outlook* y versiones de Outlook Express después de la versión 4 "
+"usan formatos propietarios que Evolution no puede leer o importar."
 
-#: C/evolution.xml:739(para)
+#: C/evolution.xml:740(para)
 msgid ""
-"Before importing e-mail from Netscape*, make sure you have selected File "
-"&gt; Compact All Folders. If you don't, Evolution will import and undelete "
-"the messages in your Trash folders."
+"To import information, you might want to use the Export tool under Windows*. "
+"See the instructions in <link linkend=\"outlook-migration-mail\">Migrating "
+"Local Outlook Mail Folders</link>."
 msgstr ""
-"Antes de importar un correo-e desde Netscape, asegúrese de seleccionar "
-"Archivo &gt; Compactar todas las carpetas. Si no lo hace, Evolution "
-"importará los mensajes en sus carpetas de Papelera."
+"Para importar información quizá quiera usar la herramienta de Exportación "
+"bajo Windows*. Vea las instrucciones en <link linkend=\"outlook-migration-"
+"mail\">Migrar carpetas de correo locales de Outlook</link>."
 
-#: C/evolution.xml:741(para)
+#: C/evolution.xml:741(para) C/evolution.xml:2360(para)
+#, fuzzy
 msgid ""
-"Evolution uses standard file types for e-mail and calendar information, so "
+"Before importing email from Netscape*, Mozilla and Netscape users need to "
+"click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla "
+"mail tool. Otherwise, Evolution imports and undeletes the messages in your "
+"Trash folders."
+msgstr ""
+"Antes de importar correos-e desde Netscape*, Los usuarios de Mozilla y "
+"Netscape deben pulsar Archivo &gt; Compactar &gt; Todas las carpetas desde "
+"la herramienta de correo de Netscape o Mozilla. De otra forma Evolution "
+"importa y recupera los mensajes en sus carpetas de papelera."
+
+#: C/evolution.xml:743(para)
+#, fuzzy
+msgid ""
+"Evolution uses standard file types for email and calendar information, so "
 "you can copy those files from your <command>~/.evolution</command> "
-"directory. The file formats used are <command>mbox</command> for e-mail and "
+"directory. The file formats used are <command>mbox</command> for email and "
 "iCal for calendar information."
 msgstr ""
 "Evolution usa tipos de archivo estándar para el correo-e y la información de "
@@ -1994,20 +1937,20 @@ msgstr ""
 "<command>mbox</command> para el correo-e e iCal para la información de "
 "calendario."
 
-#: C/evolution.xml:742(para)
+#: C/evolution.xml:744(para)
 msgid ""
 "Contacts files are stored in a database, but can be saved as a standard "
-"vCard*. To export contact data, open your contacts tool and select the "
-"contacts you want to export (press Ctrl+A to select them all). Click File "
-"&gt; Save Contact as VCard."
+"vCard*. To export an addressbook, click File &gt; Save Address Book As VCard"
+"\". If you want to export only one contact, click File &gt; Save Contact as "
+"VCard."
 msgstr ""
 "Los archivos de contactos se guardan en una base de datos, pero se pueden "
-"guardar como un vCard* estándar. Para exportar los datos de contactos, abra "
-"su herramienta de contactos y seleccione los contactos que quiere exportar "
-"(pulse Ctrl+A para seleccionarlos todos). Pulse Archivo &gt; Guardar "
-"contacto como VCard."
+"guardar como un vCard* estándar. Para exportarlos a una libreta de "
+"direcciones, pulse Archivo &gt; Guardar libreta de direcciones como VCard. "
+"Si sólo quiere exportar un contacto, pulse Archivo &gt; Guardar contacto "
+"como VCard."
 
-#: C/evolution.xml:750(para)
+#: C/evolution.xml:752(para)
 msgid ""
 "Now that the first-run configuration has finished, you're ready to begin "
 "using Evolution. Here's a quick explanation of what's happening in your main "
@@ -2018,11 +1961,11 @@ msgstr ""
 "explicación rápida de qué es lo que está ocurriendo en su ventana principal "
 "de Evolution."
 
-#: C/evolution.xml:753(title)
+#: C/evolution.xml:755(title)
 msgid "Menu Bar:"
 msgstr "Barra del menú:"
 
-#: C/evolution.xml:754(para)
+#: C/evolution.xml:756(para)
 msgid ""
 "The menu bar gives you access to most Evolution features. For additional "
 "information, see <link linkend=\"usage-mainwindow-menubar\">The Menu Bar</"
@@ -2032,25 +1975,25 @@ msgstr ""
 "Evolution. Para información adicional, vea <link linkend=\"usage-mainwindow-"
 "menubar\">La barra de menú</link>."
 
-#: C/evolution.xml:757(title)
+#: C/evolution.xml:759(title)
 msgid "Folder List:"
 msgstr "Lista de carpetas:"
 
-#: C/evolution.xml:758(para)
+#: C/evolution.xml:760(para)
 msgid ""
 "The folder list gives you a list of the available folders for each account. "
 "To see the contents of a folder, click the folder name and the contents are "
-"displayed in the e-mail list."
+"displayed in the message list."
 msgstr ""
-"La lista de carpetas le da una lista de las carpetas disponibles para cada "
-"cuenta. Para ver el contenido de una carpeta, pulse el nombre de la carpeta "
-"y el contenido se mostrará en la lista de correo-e."
+"La lista de carpetas le proporciona una lista de las carpetas disponibles "
+"para cada cuenta. Para ver el contenido de una carpeta, pulse el nombre de "
+"la carpeta y el contenido se mostrará en la lista de correo-e."
 
-#: C/evolution.xml:761(title)
+#: C/evolution.xml:763(title)
 msgid "Toolbar:"
 msgstr "Barra de herramientas:"
 
-#: C/evolution.xml:762(para)
+#: C/evolution.xml:764(para)
 msgid ""
 "The toolbar gives you fast and easy access to the frequently used features "
 "in each component."
@@ -2058,41 +2001,43 @@ msgstr ""
 "La barra de herramientas da acceso fácil y rápido a las características más "
 "usadas de cada componente."
 
-#: C/evolution.xml:765(title)
+#: C/evolution.xml:767(title)
 msgid "Search Tool:"
 msgstr "Herramienta de búsqueda:"
 
-#: C/evolution.xml:766(para)
+#: C/evolution.xml:768(para)
+#, fuzzy
 msgid ""
-"The search tool lets you search your e-mail, contacts, calendar, and tasks "
-"to easily find what you're looking for."
+"The search tool lets you search your email, contacts, calendar, and tasks to "
+"easily find what you're looking for."
 msgstr ""
 "La herramienta de búsqueda permite hacer búsquedas en el correo, contactos, "
 "calendario y tareas para encontrar fácilmente lo que está buscando."
 
-#: C/evolution.xml:769(title) C/evolution.xml:928(title)
+#: C/evolution.xml:771(title) C/evolution.xml:930(title)
 msgid "Message List:"
 msgstr "Lista de mensajes:"
 
-#: C/evolution.xml:770(para)
+#: C/evolution.xml:772(para)
+#, fuzzy
 msgid ""
-"The message list displays a list of e-mail that you have received. To view "
-"an e-mail in the preview pane, click the e-mail in the e-mail list."
+"The message list displays a list of email that you have received. To view an "
+"email in the preview pane, click the email in the message list."
 msgstr ""
 "La lista de mensajes muestra una lista del correo que ha recibido. Para ver "
 "un correo-e en el panel de vista previa, pulse en correo-e en la lista de "
 "correo-e."
 
-#: C/evolution.xml:773(title)
+#: C/evolution.xml:775(title)
 msgid "Side bar:"
 msgstr "Barra lateral:"
 
-#: C/evolution.xml:774(para)
+#: C/evolution.xml:776(para)
 msgid ""
 "The side bar lets you switch between folders and between Evolution tools. At "
 "the bottom of the side bar is the switcher that let you switch Evolution "
 "tools, and above that is a list of all the available folders for the current "
-"tool.For additional information, see <link linkend=\"usage-mainwindow-"
+"tool. For additional information, see <link linkend=\"usage-mainwindow-"
 "shortcutbar\">The Side Bar</link>."
 msgstr ""
 "La barra lateral le permite cambiar entre las carpetas y entre las "
@@ -2102,28 +2047,29 @@ msgstr ""
 "información adicional, consulte <link linkend=\"usage-mainwindow-shortcutbar"
 "\">La barra lateral</link>."
 
-#: C/evolution.xml:777(title)
+#: C/evolution.xml:779(title)
 msgid "Switcher:"
 msgstr "Selector:"
 
-#: C/evolution.xml:778(para)
+#: C/evolution.xml:780(para)
 msgid ""
 "The switcher at the bottom of the side bar lets you switch between the "
-"Evolution tools - mail, contacts, Calendars, Memos and Tasks."
+"Evolution tools - Mail, Contacts, Calendars, Memos and Tasks."
 msgstr ""
 "El selector en la parte inferior de la barra lateral le permite cambiar "
 "entre las herramientas de Evolution: correo, contactos, calendarios, notas y "
 "tareas."
 
-#: C/evolution.xml:781(title)
+#: C/evolution.xml:783(title)
 msgid "Status Bar:"
 msgstr "Barra de estado:"
 
-#: C/evolution.xml:782(para)
+#: C/evolution.xml:784(para)
+#, fuzzy
 msgid ""
 "The status bar periodically displays a message, or tells you the progress of "
-"a task. This most often happens when you're checking or sending e-mail. "
-"These progress queues are shown in the previous figure. The Online/Offline "
+"a task. This most often happens when you're checking or sending email. These "
+"progress queues are shown in the previous figure. The Online/Offline "
 "indicator is here, too, in the lower left of the window."
 msgstr ""
 "La barra de esto muestra periódicamente un mensaje o informa del progreso de "
@@ -2132,29 +2078,30 @@ msgstr ""
 "de Conextado/Desconectado está aquí también, en la esquina inferior "
 "izquierda de la ventana."
 
-#: C/evolution.xml:785(title) C/evolution.xml:932(title)
+#: C/evolution.xml:787(title) C/evolution.xml:934(title)
 msgid "Preview Pane:"
 msgstr "Panel de vista previa:"
 
-#: C/evolution.xml:786(para)
+#: C/evolution.xml:788(para)
+#, fuzzy
 msgid ""
-"The preview pane displays the contents of the e-mail that is selected in the "
-"e-mail list."
+"The preview pane displays the contents of the email that is selected in the "
+"message list."
 msgstr ""
 "El panel de vista previa muestra el contenido del correo-e que está "
 "seleccionado en la lista de correo-e."
 
-#: C/evolution.xml:790(title)
+#: C/evolution.xml:792(title)
 msgid "The Menu Bar"
 msgstr "La barra del menú"
 
-#: C/evolution.xml:791(para)
+#: C/evolution.xml:793(para)
+#, fuzzy
 msgid ""
 "The menu bar's contents always provide all the possible actions for any "
 "given view of your data. If you're looking at your Inbox, most of the menu "
-"items relate to e-mail. Some content relates to other components of "
-"Evolution and some, especially in the File menu, relates to the application "
-"as a whole."
+"items relate to email. Some content relates to other components of Evolution "
+"and some, especially in the File menu, relates to the application as a whole."
 msgstr ""
 "Los contenidos de la barra del menú contienen todas las acciones posibles "
 "para cualquier vista de sus datos. Si está examinando su buzón de entrada, "
@@ -2163,11 +2110,11 @@ msgstr ""
 "especialmente los del menú Archivo, lo estarán con la aplicación como un "
 "todo."
 
-#: C/evolution.xml:793(title)
+#: C/evolution.xml:795(title)
 msgid "File:"
 msgstr "Archivo:"
 
-#: C/evolution.xml:794(para)
+#: C/evolution.xml:796(para)
 msgid ""
 "Anything related to a file or to the operations of the application is listed "
 "in this menu, such as creating things, saving them to disk, printing them, "
@@ -2177,11 +2124,11 @@ msgstr ""
 "en este menú, como crear cosas, guardarlas en el disco, imprimirlas o salir "
 "del propio programa."
 
-#: C/evolution.xml:797(title)
+#: C/evolution.xml:799(title)
 msgid "Edit:"
 msgstr "Editar:"
 
-#: C/evolution.xml:798(para)
+#: C/evolution.xml:800(para)
 msgid ""
 "Holds useful tools that help you edit text and move it around. Lets you "
 "access the settings and configuration options in the Edit menu."
@@ -2189,11 +2136,11 @@ msgstr ""
 "Contiene herramientas útiles que le ayudan a editar texto y moverlo. Le "
 "permite acceder a los ajustes y opciones de configuración en el menú Editar."
 
-#: C/evolution.xml:801(title)
+#: C/evolution.xml:803(title)
 msgid "View:"
 msgstr "Ver:"
 
-#: C/evolution.xml:802(para)
+#: C/evolution.xml:804(para)
 msgid ""
 "Lets you decide how Evolution should look. Some of the features control the "
 "appearance of Evolution as a whole, and others the way a particular kind of "
@@ -2203,11 +2150,11 @@ msgstr ""
 "opciones afectan la apariencia de todo Evolution, mientras otras sólo "
 "afectan a la forma en que aparece determinado tipo de información."
 
-#: C/evolution.xml:805(title)
+#: C/evolution.xml:807(title)
 msgid "Folder:"
 msgstr "Carpeta:"
 
-#: C/evolution.xml:806(para)
+#: C/evolution.xml:808(para)
 msgid ""
 "Holds actions that can be performed on folders. You can find things like "
 "copy, rename, delete, and so on."
@@ -2215,11 +2162,11 @@ msgstr ""
 "Contiene acciones que se pueden realizar en carpetas. Puede encontrar cosas "
 "como copiar, renombrar, borrar, y demás."
 
-#: C/evolution.xml:809(title)
+#: C/evolution.xml:811(title)
 msgid "Message:"
 msgstr "Mensaje:"
 
-#: C/evolution.xml:810(para)
+#: C/evolution.xml:812(para)
 msgid ""
 "Holds actions that can be applied to a message. If there is only one target "
 "for the action, such as replying to a message, you can normally find it in "
@@ -2229,11 +2176,11 @@ msgstr ""
 "acción sólo tiene un objetivo, como responder a un mensaje, la encontrará en "
 "el menú Mensaje."
 
-#: C/evolution.xml:813(title)
+#: C/evolution.xml:815(title)
 msgid "Search:"
 msgstr "Buscar:"
 
-#: C/evolution.xml:814(para)
+#: C/evolution.xml:816(para)
 msgid ""
 "Lets you search for messages, or for phrases within a message. You can also "
 "see previous searches you have made. In addition to the Search menu, there "
@@ -2245,19 +2192,19 @@ msgstr ""
 "una caja de entrada en la barra de herramientas que puede usar para buscar "
 "mensajes. Puede también crear una carpeta de búsqueda desde una búsqueda."
 
-#: C/evolution.xml:817(title)
+#: C/evolution.xml:819(title)
 msgid "Help:"
 msgstr "Ayuda:"
 
-#: C/evolution.xml:818(para)
+#: C/evolution.xml:820(para)
 msgid "Opens the Evolution Help files."
 msgstr "Abre los archivos de ayuda de Evolution."
 
-#: C/evolution.xml:823(title)
+#: C/evolution.xml:825(title)
 msgid "The Sidebar"
 msgstr "La barra lateral"
 
-#: C/evolution.xml:824(para)
+#: C/evolution.xml:826(para)
 msgid ""
 "Sidebar is the vertical panel on the left side of the Evolution main window. "
 "At the bottom of the sidebar is the Switcher, that lets you switch between "
@@ -2270,16 +2217,18 @@ msgstr ""
 "correo y Contactos que son atajos. Sobre ellos hay una lista de carpetas "
 "para la herramienta actual de Evolution."
 
-#: C/evolution.xml:825(para)
-msgid ""
-"The folder list organizes your e-mail, calendars, contact lists, and task "
-"lists in a tree, similar to a <link linkend=\"filetree\">file tree</link>. "
-"Most people find one to four folders at the base of the tree, depending on "
-"the tool and their system configuration. Each Evolution tool has at least "
-"one folder, called On This Computer, for local information. For example, the "
-"folder list for the e-mail tool shows any remote e-mail storage you have set "
-"up, plus local folders and search folders, which are discussed in <link "
-"linkend=\"usage-mail-organize-vfolders\">Using Search Folders</link>."
+#: C/evolution.xml:827(para)
+#, fuzzy
+msgid ""
+"The folder list organizes your email, calendars, address books, task lists "
+"and memo lists in a tree, similar to a <link linkend=\"filetree\">file tree</"
+"link>. Most people find one to four folders at the base of the tree, "
+"depending on the tool and their system configuration. Each Evolution tool "
+"has at least one folder, called On This Computer, for local information. For "
+"example, the folder list for the email tool shows any remote email storage "
+"you have set up, plus local folders and search folders, which are discussed "
+"in <link linkend=\"usage-mail-organize-vfolders\">Using Search Folders</"
+"link>."
 msgstr ""
 "La lista de carpetas orzaniza su correo-e, calendarios, listas de contactos "
 "y de tareas en un árbol, similar a un <link linkend=\"filetree\">árbol de "
@@ -2290,60 +2239,64 @@ msgstr ""
 "carpetas de búsqueda, de las cuales se habla en <link linkend=\"usage-mail-"
 "organize-vfolders\">Uso de carpetas de búsqueda</link>."
 
-#: C/evolution.xml:826(para)
+#: C/evolution.xml:828(para)
+#, fuzzy
 msgid ""
-"If you get large amounts of e-mail, you might want more folders than just "
+"If you get large amounts of email, you might want more folders than just "
 "your Inbox. You can create multiple calendar, task, or contacts folders."
 msgstr ""
 "Si tiene grandes cantidades de correo, querrá tener más carpetas, además de "
 "la «Bandeja de entrada».Puede crear varias carpetas de calendarios, tareas o "
 "contactos."
 
-#: C/evolution.xml:827(para)
+#: C/evolution.xml:829(para)
 msgid "To create a new folder:"
 msgstr "Para crear una carpeta nueva:"
 
-#: C/evolution.xml:830(para)
+#: C/evolution.xml:832(para)
 msgid "Click Folder &gt; New."
 msgstr "Pulse en Carpeta &gt; Nueva."
 
-#: C/evolution.xml:833(para)
+#: C/evolution.xml:835(para)
 msgid "Type the name of the folder in the Folder Name field."
 msgstr "Teclee el nombre de la carpeta en el campo «Nombre de la carpeta»."
 
-#: C/evolution.xml:836(para)
+#: C/evolution.xml:838(para)
 msgid "Select the location of the new folder."
 msgstr "Seleccione la ubicación de la carpeta nueva."
 
-#: C/evolution.xml:839(para) C/evolution.xml:1242(para)
-#: C/evolution.xml:1265(para) C/evolution.xml:1277(para)
-#: C/evolution.xml:1512(para) C/evolution.xml:1794(para)
-#: C/evolution.xml:1896(para) C/evolution.xml:1912(para)
-#: C/evolution.xml:2128(para) C/evolution.xml:2166(para)
-#: C/evolution.xml:2226(para) C/evolution.xml:2705(para)
-#: C/evolution.xml:2738(para) C/evolution.xml:2934(para)
-#: C/evolution.xml:2976(para) C/evolution.xml:3109(para)
-#: C/evolution.xml:3206(para) C/evolution.xml:3221(para)
-#: C/evolution.xml:3499(para) C/evolution.xml:4095(para)
-#: C/evolution.xml:4161(para) C/evolution.xml:4283(para)
-#: C/evolution.xml:4325(para) C/evolution.xml:4656(para)
-#: C/evolution.xml:4711(para) C/evolution.xml:5282(para)
-#: C/evolution.xml:5304(para) C/evolution.xml:5328(para)
-#: C/evolution.xml:5362(para) C/evolution.xml:5838(para)
-#: C/evolution.xml:5865(para) C/evolution.xml:5885(para)
-#: C/evolution.xml:5900(para) C/evolution.xml:5923(para)
-#: C/evolution.xml:5949(para) C/evolution.xml:6103(para)
-#: C/evolution.xml:6181(para) C/evolution.xml:6211(para)
-#: C/evolution.xml:6773(para) C/evolution.xml:6871(para)
-#: C/evolution.xml:7006(para)
+#: C/evolution.xml:841(para) C/evolution.xml:1250(para)
+#: C/evolution.xml:1276(para) C/evolution.xml:1288(para)
+#: C/evolution.xml:1523(para) C/evolution.xml:1805(para)
+#: C/evolution.xml:1907(para) C/evolution.xml:1923(para)
+#: C/evolution.xml:2140(para) C/evolution.xml:2179(para)
+#: C/evolution.xml:2245(para) C/evolution.xml:2725(para)
+#: C/evolution.xml:2758(para) C/evolution.xml:2954(para)
+#: C/evolution.xml:2996(para) C/evolution.xml:3129(para)
+#: C/evolution.xml:3223(para) C/evolution.xml:3238(para)
+#: C/evolution.xml:3256(para) C/evolution.xml:3303(para)
+#: C/evolution.xml:3517(para) C/evolution.xml:3521(para)
+#: C/evolution.xml:3748(para) C/evolution.xml:4117(para)
+#: C/evolution.xml:4183(para) C/evolution.xml:4305(para)
+#: C/evolution.xml:4348(para) C/evolution.xml:4680(para)
+#: C/evolution.xml:4735(para) C/evolution.xml:5186(para)
+#: C/evolution.xml:5261(para) C/evolution.xml:5283(para)
+#: C/evolution.xml:5307(para) C/evolution.xml:5341(para)
+#: C/evolution.xml:5685(para) C/evolution.xml:5820(para)
+#: C/evolution.xml:5847(para) C/evolution.xml:5867(para)
+#: C/evolution.xml:5882(para) C/evolution.xml:5905(para)
+#: C/evolution.xml:5931(para) C/evolution.xml:6063(para)
+#: C/evolution.xml:6086(para) C/evolution.xml:6164(para)
+#: C/evolution.xml:6194(para) C/evolution.xml:6740(para)
+#: C/evolution.xml:6838(para) C/evolution.xml:6973(para)
 msgid "Click OK."
 msgstr "Pulse «Aceptar»."
 
-#: C/evolution.xml:844(title)
+#: C/evolution.xml:846(title)
 msgid "Changing Switcher Appearance:"
 msgstr "Cambiar la apariencia del selector:"
 
-#: C/evolution.xml:845(para)
+#: C/evolution.xml:847(para)
 msgid ""
 "To change the appearance of your switcher click <emphasis>View &gt; Switcher "
 "Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can "
@@ -2353,53 +2306,53 @@ msgstr ""
 "Apariencia del selector</emphasis> desde la barra de Menú. Bajo Apariencia "
 "del selector puede seleccionar:"
 
-#: C/evolution.xml:847(title)
+#: C/evolution.xml:849(title)
 msgid "Icons and Text:"
 msgstr "Iconos y texto:"
 
-#: C/evolution.xml:848(para)
+#: C/evolution.xml:850(para)
 msgid "Displays buttons with the label and the icon corresponding to it."
 msgstr "Muestra botones con la etiqueta y el icono correspondiente en él."
 
-#: C/evolution.xml:851(title)
+#: C/evolution.xml:853(title)
 msgid "Icons Only:"
 msgstr "Sólo iconos:"
 
-#: C/evolution.xml:852(para)
+#: C/evolution.xml:854(para)
 msgid "Shows only the icons."
 msgstr "Muestra sólo los iconos."
 
-#: C/evolution.xml:855(title)
+#: C/evolution.xml:857(title)
 msgid "Texts Only:"
 msgstr "Sólo texto:"
 
-#: C/evolution.xml:856(para)
+#: C/evolution.xml:858(para)
 msgid "Displays buttons with the label, not the icons."
 msgstr "Muestra botones con la etiqueta, pero no iconos."
 
-#: C/evolution.xml:859(title)
+#: C/evolution.xml:861(title)
 msgid "Toolbar Style:"
 msgstr "Estilo de barra de herramientas:"
 
-#: C/evolution.xml:860(para)
+#: C/evolution.xml:862(para)
 msgid "Shows buttons using the desktop toolbar settings."
 msgstr ""
 "Muestra los botones usando los ajustes de barra de herramienta del "
 "escritorio."
 
-#: C/evolution.xml:863(title)
+#: C/evolution.xml:865(title)
 msgid "Hide Buttons:"
 msgstr "Ocultar botones:"
 
-#: C/evolution.xml:864(para)
+#: C/evolution.xml:866(para)
 msgid "This option hides all the shortcut buttons of switcher."
 msgstr "Esta opción oculta todos los botones de atajo del selector."
 
-#: C/evolution.xml:869(title)
+#: C/evolution.xml:871(title)
 msgid "Folder Management"
 msgstr "Gestión de carpetas"
 
-#: C/evolution.xml:870(para)
+#: C/evolution.xml:872(para)
 msgid ""
 "Right-click a folder or subfolder to display a menu with the following "
 "options:"
@@ -2407,11 +2360,11 @@ msgstr ""
 "Pulse con el botón derecho en una carpeta o subcarpeta para mostrar un menú "
 "con las siguientes opciones:"
 
-#: C/evolution.xml:872(title)
+#: C/evolution.xml:874(title)
 msgid "Copy:"
 msgstr "Copiar:"
 
-#: C/evolution.xml:873(para)
+#: C/evolution.xml:875(para)
 msgid ""
 "Copies the folder to a different location. When you select this item, "
 "Evolution offers a choice of locations to copy the folder to."
@@ -2419,59 +2372,59 @@ msgstr ""
 "Copia la carpeta a un lugar diferente. Cuando seleccione este elemento, "
 "Evolution ofrece una selección de lugares donde copiar la carpeta."
 
-#: C/evolution.xml:876(title)
+#: C/evolution.xml:878(title)
 msgid "Move:"
 msgstr "Mover:"
 
-#: C/evolution.xml:877(para)
+#: C/evolution.xml:879(para)
 msgid "Moves the folder to another location."
 msgstr "Mueve la carpeta a otro lugar."
 
-#: C/evolution.xml:880(title)
+#: C/evolution.xml:882(title)
 msgid "Mark Messages As Read:"
 msgstr "Marcar los mensajes como leídos:"
 
-#: C/evolution.xml:881(para)
+#: C/evolution.xml:883(para)
 msgid "Marks all the messages in the folder as read."
 msgstr "Marca todos los mensajes en la carpeta como leídos."
 
-#: C/evolution.xml:884(title)
+#: C/evolution.xml:886(title)
 msgid "New Folder:"
 msgstr "Carpeta nueva:"
 
-#: C/evolution.xml:885(para)
+#: C/evolution.xml:887(para)
 msgid "Creates another folder in the same location."
 msgstr "Crea otra carpeta en el mismo lugar."
 
-#: C/evolution.xml:888(title) C/evolution.xml:2864(title)
+#: C/evolution.xml:890(title) C/evolution.xml:2884(title)
 msgid "Delete:"
 msgstr "Borrar:"
 
-#: C/evolution.xml:889(para)
+#: C/evolution.xml:891(para)
 msgid "Deletes the folder and all its contents."
 msgstr "Borra la carpeta y todo su contenido."
 
-#: C/evolution.xml:892(title)
+#: C/evolution.xml:894(title)
 msgid "Rename:"
 msgstr "Renombrar:"
 
-#: C/evolution.xml:893(para)
+#: C/evolution.xml:895(para)
 msgid "Lets you change the name of the folder."
 msgstr "Le permite cambiar el nombre de la carpeta."
 
-#: C/evolution.xml:896(title)
+#: C/evolution.xml:898(title)
 msgid "Disable:"
 msgstr "Desactivar:"
 
-#: C/evolution.xml:897(para)
+#: C/evolution.xml:899(para)
 msgid "Disables the account."
 msgstr "Desactiva la cuenta."
 
-#: C/evolution.xml:900(title)
+#: C/evolution.xml:902(title)
 msgid "Properties:"
 msgstr "Propiedades:"
 
-#: C/evolution.xml:901(para)
+#: C/evolution.xml:903(para)
 msgid ""
 "Checks the number of total and unread messages in a folder, and, for remote "
 "folders, lets you select whether to copy the folder to your local system for "
@@ -2481,71 +2434,78 @@ msgstr ""
 "las carpetas remotas, le permite seleccionar si se copia la carpeta a su "
 "sistema local para operación desconectada."
 
-#: C/evolution.xml:903(para)
+#: C/evolution.xml:905(para)
 msgid "You can also rearrange folders and messages by dragging and dropping them."
 msgstr ""
 "También puede reorganizar las carpetas y los mensajes arrastrándolos y "
 "soltándolos donde desee."
 
-#: C/evolution.xml:904(para)
+#: C/evolution.xml:906(para)
+#, fuzzy
 msgid ""
-"Any time new e-mail arrives in a e-mail folder, that folder label is "
-"displayed in bold text, along with the number of new messages in that folder."
+"Any time new email arrives in a email folder, that folder label is displayed "
+"in bold text, along with the number of new messages in that folder."
 msgstr ""
 "Siempre que llegue un mensaje nuevo a una carpeta de correo, su nombre se "
 "mostrará en negrita junto al número de mensajes nuevos en esa carpeta."
 
-#: C/evolution.xml:909(title)
-msgid "E-Mail"
+#: C/evolution.xml:911(title)
+#, fuzzy
+msgid "Email"
 msgstr "Correo-e"
 
-#: C/evolution.xml:910(para)
-msgid "Evolution e-mail is like other e-mail programs in several ways:"
+#: C/evolution.xml:912(para)
+#, fuzzy
+msgid "Evolution email is like other email programs in several ways:"
 msgstr "Evolution es como cualquier otro programa de correo electrónico:"
 
-#: C/evolution.xml:913(para)
+#: C/evolution.xml:915(para)
+#, fuzzy
 msgid ""
-"It can send and receive e-mail in HTML or as plain text, and makes it easy "
-"to send and receive multiple file attachments."
+"It can send and receive email in HTML or as plain text, and makes it easy to "
+"send and receive multiple file attachments."
 msgstr ""
 "Permite enviar y recibir mensajes en HTML o en texto sencillo, y facilita el "
 "envío y recepción de múltiples archivos adjuntos."
 
-#: C/evolution.xml:916(para)
+#: C/evolution.xml:918(para)
+#, fuzzy
 msgid ""
-"It supports multiple e-mail sources, including <link linkend=\"imap\">IMAP</"
+"It supports multiple email sources, including <link linkend=\"imap\">IMAP</"
 "link>, <link linkend=\"pop\">POP3</link>, and local mbox or mh spools and "
-"files created by other e-mail programs."
+"files created by other email programs."
 msgstr ""
 "Soporta múltiples fuentes de correo, como <link linkend=\"imap\">IMAP</"
 "link>, <link linkend=\"pop\">POP3</link>, y archivos locales mbox o mh "
 "creados por otros programas de correo."
 
-#: C/evolution.xml:919(para)
+#: C/evolution.xml:921(para)
+#, fuzzy
 msgid ""
-"It can sort and organize your e-mail in a wide variety of ways with folders, "
+"It can sort and organize your email in a wide variety of ways with folders, "
 "searches, and filters."
 msgstr ""
 "Puede ordenar y organizar su correo en una amplia gama de maneras con "
 "carpetas, búsquedas y filtros."
 
-#: C/evolution.xml:922(para)
+#: C/evolution.xml:924(para)
 msgid "It lets you guard your privacy with encryption."
 msgstr "Permite proteger su privacidad utilizando cifrado."
 
-#: C/evolution.xml:925(para)
-msgid ""
-"However, Evolution has some important differences from other e-mail "
-"programs. First, It is built to handle very large amounts of e-mail. The "
-"<link linkend=\"usage-mail-organize-spam\">junk e-mail</link>, message <link "
-"linkend=\"usage-mail-organize-filters\">filtering</link> and <link linkend="
-"\"usage-mail-organize-search\">searching</link> functions were built for "
-"speed and efficiency. There's also the <link linkend=\"usage-mail-organize-"
-"vfolders\">search folder</link>, an advanced organizational feature not "
-"found in some e-mail clients. If you get a lot of e-mail, or if you keep "
-"every message you get in case you need to refer to it later, you'll find "
-"this feature especially useful. Here's a quick explanation of what's "
-"happening in your main Evolution e-mail window."
+#: C/evolution.xml:927(para)
+#, fuzzy
+msgid ""
+"However, Evolution has some important differences from other email programs. "
+"First, It is built to handle very large amounts of email. The <link linkend="
+"\"usage-mail-organize-spam\">junk email</link>, message <link linkend="
+"\"usage-mail-organize-filters\">filtering</link> and <link linkend=\"usage-"
+"mail-organize-search\">searching</link> functions were built for speed and "
+"efficiency. There's also the <link linkend=\"usage-mail-organize-vfolders"
+"\">search folder</link>, an advanced organizational feature not found in "
+"some email clients. If you get a lot of email, or if you keep every message "
+"you get in case you need to refer to it later, you will find this feature "
+"especially useful. Here's a quick explanation of what's happening in your "
+"main Evolution email window."
 msgstr ""
 "Sin embargo, Evolution tiene algunas diferencias importantes respecto a "
 "otros programas de correo. Primero está construido para manejar ingentes "
@@ -2560,21 +2520,26 @@ msgstr ""
 "todos sus mensajes para poder referirse a ellos posteriormente. Aquí hay una "
 "explicación de qué es lo que hay en su ventana de correo-e de Evolution."
 
-#: C/evolution.xml:929(para)
+#: C/evolution.xml:931(para)
+#, fuzzy
 msgid ""
 "The message list displays all the messages that you have. This includes all "
-"your read and unread messages, and e-mail that is flagged to be deleted."
+"your read and unread messages, and email that is flagged to be deleted."
 msgstr ""
 "La lista de mensajes muestra todos los mensajes de correo que tiene. Esto "
 "incluye todos sus mensajes leídos y no leídos, y el correo marcado para "
 "borrarlo."
 
-#: C/evolution.xml:933(para)
-msgid "This is where your e-mail is displayed."
-msgstr "Esto es donde se muestra su correo-e."
-
 #: C/evolution.xml:935(para)
 msgid ""
+"The preview pane displays the message that is currently chosen in the "
+"message list."
+msgstr ""
+"El panel de vista previa muestra el mensaje actualmente seleccionado en la "
+"lista de mensajes."
+
+#: C/evolution.xml:937(para)
+msgid ""
 "If you find the preview pane too small, you can resize the pane, enlarge the "
 "whole window, or double-click the message in the message list to have it "
 "open in a new window. To change the size of a pane, drag the divider between "
@@ -2586,7 +2551,7 @@ msgstr ""
 "cambiar los tamaños de un panel sólo hay que pulsar en la línea divisoria y "
 "arrastrarla arriba y abajo hasta la posición deseada."
 
-#: C/evolution.xml:936(para)
+#: C/evolution.xml:938(para)
 msgid ""
 "As with folders, you can right-click messages in the message list and get a "
 "menu of possible actions, including moving or deleting them, creating "
@@ -2597,9 +2562,10 @@ msgstr ""
 "o recuperarlo, crear carpetas de búsqueda y filtros basados en ellos y "
 "marcarlos como spam."
 
-#: C/evolution.xml:937(para)
+#: C/evolution.xml:939(para)
+#, fuzzy
 msgid ""
-"Most of the e-mail-related actions you want to perform are listed in the "
+"Most of the email-related actions you want to perform are listed in the "
 "Message Menu and Folder Menu in the menu bar. The most frequently used ones, "
 "like Reply and Forward, also appear as buttons in the toolbar. Most of them "
 "are also located in the right-click menu and as keyboard shortcuts."
@@ -2610,20 +2576,21 @@ msgstr ""
 "herramientas. La mayoría de ellos también aparecen también en el menú "
 "contextual (con el botón derecho) y como atajos de teclado."
 
-#: C/evolution.xml:938(para)
+#: C/evolution.xml:940(para)
+#, fuzzy
 msgid ""
-"For an in-depth guide to the e-mail capabilities of Evolution, read <link "
-"linkend=\"usage-mail\">Sending and Receiving E-Mail</link>."
+"For an in-depth guide to the email capabilities of Evolution, read <link "
+"linkend=\"usage-mail\">Sending and Receiving Email</link>."
 msgstr ""
 "Para saber más sobre las posibilidades de uso del correo electrónico de "
 "Evolution, lea <link linkend=\"usage-mail\">Envío y recepción de correo-e</"
 "link>."
 
-#: C/evolution.xml:942(title)
+#: C/evolution.xml:944(title)
 msgid "The Calendar"
 msgstr "El calendario"
 
-#: C/evolution.xml:943(para)
+#: C/evolution.xml:945(para)
 msgid ""
 "To begin using the calendar, click Calendar in the switcher. By default, the "
 "calendar shows today's schedule on a ruled background. At the left bottom, "
@@ -2638,19 +2605,19 @@ msgstr ""
 "tareas, donde puede mantener una lista de tareas separada de sus citas de "
 "calendario. Debajo hay una lista de notas."
 
-#: C/evolution.xml:946(title)
+#: C/evolution.xml:948(title)
 msgid "Appointment List:"
 msgstr "Lista de citas:"
 
-#: C/evolution.xml:947(para)
+#: C/evolution.xml:949(para)
 msgid "The appointment list displays all your scheduled appointments."
 msgstr "La lista de citas muestra todas sus citas programadas."
 
-#: C/evolution.xml:950(title)
+#: C/evolution.xml:952(title)
 msgid "Month Pane:"
 msgstr "Panel del mes:"
 
-#: C/evolution.xml:951(para)
+#: C/evolution.xml:953(para)
 msgid ""
 "The month pane is a small view of a calendar month. To display additional "
 "months, drag the column border to the right. You can also select a range of "
@@ -2662,21 +2629,21 @@ msgstr ""
 "rango de dias en el panel del mes para mostrar un rango de días en la lista "
 "de citas."
 
-#: C/evolution.xml:954(title)
+#: C/evolution.xml:956(title)
 msgid "Task List:"
 msgstr "Lista de tareas:"
 
-#: C/evolution.xml:955(para)
+#: C/evolution.xml:957(para)
 msgid ""
 "Tasks are distinct from appointments because they generally don't have times "
-"associated with them. You can see a larger view of your task list by "
-"clicking Tasks in the switcher."
+"associated with them. You can use the list in a larger window by clicking "
+"the Tasks button in the side bar."
 msgstr ""
 "Las tareas son distintas de las citas porque generalmente no tienen horas "
-"asociadas con ellas. Puede ver una vista más grande de su lista de taras "
-"pulsando Tareas en el selector."
+"asociadas con ellas. Puede usar la lista en una vista más grande pulsando el "
+"botón Tareas en la barra lateral."
 
-#: C/evolution.xml:957(para)
+#: C/evolution.xml:959(para)
 msgid ""
 "For more information about the calendar, see <link linkend=\"usage-calendar"
 "\">Evolution Calendar</link>."
@@ -2684,11 +2651,11 @@ msgstr ""
 "Para saber más acerca del calendario lea <link linkend=\"usage-calendar"
 "\">Calendario de Evolution</link>."
 
-#: C/evolution.xml:961(title)
+#: C/evolution.xml:963(title)
 msgid "The Contacts"
 msgstr "Los contactos"
 
-#: C/evolution.xml:962(para)
+#: C/evolution.xml:964(para)
 msgid ""
 "The Evolution contacts can handle all of the functions of an address book or "
 "phone book. However, it is easier to update Evolution than it is to change "
@@ -2702,7 +2669,7 @@ msgstr ""
 "porque Evolution puede sincronizarse con dispositivos Palm OS* y usar "
 "directorios <link linkend=\"ldap\">LDAP</link> conectados a una red."
 
-#: C/evolution.xml:963(para)
+#: C/evolution.xml:965(para)
 msgid ""
 "To use the contacts tool, click Contacts in the switcher. By default, the "
 "display shows all your contacts in alphabetical order, in a minicard view. "
@@ -2715,10 +2682,11 @@ msgstr ""
 "ajustar la anchura de las columnas pulsando y arrastrando los divisores de "
 "columnas grises."
 
-#: C/evolution.xml:965(para)
+#: C/evolution.xml:967(para)
+#, fuzzy
 msgid ""
 "Another advantage of the Evolution contacts is its integration with the rest "
-"of the application. For example, you can right-click an e-mail address in "
+"of the application. For example, you can right-click an email address in "
 "Evolution mail to instantly create a contact entry."
 msgstr ""
 "Otra ventaja de los contactos de Evolution es su integración con el resto de "
@@ -2726,22 +2694,23 @@ msgstr ""
 "un mensaje de correo sólo pulsando con el botón derecho sobre la dirección "
 "del remitente del mensaje."
 
-#: C/evolution.xml:966(emphasis)
+#: C/evolution.xml:968(emphasis)
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: C/evolution.xml:967(para)
+#: C/evolution.xml:969(para)
+#, fuzzy
 msgid ""
 "The largest section of the contacts display shows a list of individual "
-"contacts. You can also search the contacts in the same way that you search e-"
-"mail folders, using the search tool on the right side of the toolbar."
+"contacts. You can also search the contacts in the same way that you search "
+"email folders, using the search tool on the right side of the toolbar."
 msgstr ""
 "La sección más grande del visor de contactos muestra una lista de los "
 "contactos individuales. También le permite buscar entre ellas de la misma "
 "manera que con las carpetas de correo, usando la barra de búsqueda que está "
 "en el lado derecho de la barra de herramientas."
 
-#: C/evolution.xml:968(para)
+#: C/evolution.xml:970(para)
 msgid ""
 "For detailed instructions on how to use the address book, read <link linkend="
 "\"usage-contact\">Evolution Contacts: the Address Book</link>."
@@ -2750,11 +2719,11 @@ msgstr ""
 "lea <link linkend=\"usage-contact\">Contactos de Evolution: La libreta de "
 "direcciones</link>."
 
-#: C/evolution.xml:973(title)
+#: C/evolution.xml:975(title)
 msgid "Backing Up And Restoring Evolution"
 msgstr "Respaldar y restaurar Evolution"
 
-#: C/evolution.xml:974(para)
+#: C/evolution.xml:976(para)
 msgid ""
 "With the Backup and Restore plug-in enabled, you can successfully back up "
 "Evolution to your machine and restore it whenever it is required. The backup "
@@ -2766,7 +2735,7 @@ msgstr ""
 "guarda sus ajustes de Evolution de gconf, correos, contactos, tareas, notas "
 "y calendarios y crea un archivador."
 
-#: C/evolution.xml:977(para)
+#: C/evolution.xml:979(para)
 msgid ""
 "Select File &gt; Backup Settings to select the folder where you want to save "
 "the backup."
@@ -2774,11 +2743,11 @@ msgstr ""
 "Seleccione Archivo &gt; Configuración del respaldo para seleccionar la "
 "carpeta donde guardar el respaldo."
 
-#: C/evolution.xml:979(para)
+#: C/evolution.xml:981(para)
 msgid "Evolution is always backed up as evolution-backup.tar.gz."
 msgstr "Evolution siempre se respalda como evolution-backup.tar.gz."
 
-#: C/evolution.xml:980(para)
+#: C/evolution.xml:982(para)
 msgid ""
 "Before the backup process starts, it asks you to close Evolution and "
 "displays a warning as shown below:"
@@ -2786,7 +2755,7 @@ msgstr ""
 "Antes de que comience el proceso de respaldo, se le preguntará para que "
 "cierre Evolution y se mostrará un mensaje de advertencia como el de abajo:"
 
-#: C/evolution.xml:985(para)
+#: C/evolution.xml:987(para)
 msgid ""
 "Select Restart Evolution after backup to restart Evolution immediately after "
 "the backup process."
@@ -2795,35 +2764,35 @@ msgstr ""
 "inmediatamente después del proceso de respaldo."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:988(para)
+#: C/evolution.xml:990(para)
 msgid "Click Yes to close Evolution and start the backup."
 msgstr "Pulse Sí para cerrar Evolution e iniciar el respaldo."
 
-#: C/evolution.xml:990(para) C/evolution.xml:1008(para)
+#: C/evolution.xml:992(para) C/evolution.xml:1010(para)
 msgid "Evolution will auto-restart after the process."
 msgstr "Evolution se iniciará automáticamente después del proceso."
 
-#: C/evolution.xml:995(title)
+#: C/evolution.xml:997(title)
 msgid "Restoring Evolution"
 msgstr "Restaurar Evolution"
 
-#: C/evolution.xml:996(para)
+#: C/evolution.xml:998(para)
 msgid "This feature restores your settings from the archive."
 msgstr "Esta característica restaura sus ajustes desde el archivo."
 
-#: C/evolution.xml:999(para)
+#: C/evolution.xml:1001(para)
 msgid ""
 "Select File &gt; Restore Settings to open the available evolution.tar.gz "
-"files"
+"files."
 msgstr ""
-"Seleccione Archivo &gt; Configuración de la restauración para abrir los "
-"archivos evolution.tar.gz disponibles"
+"Seleccione Archivo &gt; Restaurar ajustes... para abrir los archivos "
+"evolution.tar.gz disponibles."
 
-#: C/evolution.xml:1002(para)
+#: C/evolution.xml:1004(para)
 msgid "Select the evolution.tar.gz and click Save."
 msgstr "Seleccione el archivo evolution.tar.gz y pulse Guardar."
 
-#: C/evolution.xml:1003(para)
+#: C/evolution.xml:1005(para)
 msgid ""
 "Before the process starts, a pop-up window appears and asks you to close "
 "Evolution. Close all the windows and then click Restore in the pop-up window."
@@ -2832,7 +2801,7 @@ msgstr ""
 "preguntándole para que cierre Evolution. Cierre las ventanas y pulse "
 "Restaurar en la ventana emergente."
 
-#: C/evolution.xml:1005(para)
+#: C/evolution.xml:1007(para)
 msgid ""
 "If you are creating your first account via the Startup Wizard, you can use "
 "the option to restore from the archive if it is available locally."
@@ -2840,11 +2809,11 @@ msgstr ""
 "Si está creando su primera cuenta a través del asistente, tiene una opción "
 "para restaurar desde el archivador si está disponible localmente."
 
-#: C/evolution.xml:1015(title)
+#: C/evolution.xml:1017(title)
 msgid "Crash Recovery"
 msgstr "Recuperación de cuelgues"
 
-#: C/evolution.xml:1016(para)
+#: C/evolution.xml:1018(para)
 msgid ""
 "Evolution displays a crash detection message when you restart it after a "
 "crash."
@@ -2852,7 +2821,7 @@ msgstr ""
 "Evolution muestra un mensaje de detección de cuelgue al reiniciarlo después "
 "de un cuelgue."
 
-#: C/evolution.xml:1018(para)
+#: C/evolution.xml:1020(para)
 msgid ""
 "Click Ignore to restore the preview pane displayed when Evolution crashed. "
 "If you click Recover, Evolution opens with all preview panes hidden."
@@ -2861,47 +2830,50 @@ msgstr ""
 "Evolution se colgó. Si pulsa Recuperar, Evolution se abrirá con todos los "
 "paneles de vista previa ocultos."
 
-#: C/evolution.xml:1021(title)
+#: C/evolution.xml:1023(title)
 msgid "Command Line Options"
 msgstr "Opciones de la línea de órdenes"
 
-#: C/evolution.xml:1022(para)
+#: C/evolution.xml:1024(para)
 msgid ""
-"Evolution has a number of command line options that you can use. You can "
-"find the full list by entering the command <command>man evolution</command> "
-"or <command>evolution --help</command>. The most important command line "
-"options are:"
+"Evolution has a number of command line options that you can use. For more "
+"information about command line options, open a terminal window and type "
+"<command>evolution --help</command>."
 msgstr ""
-"Evolution le permite utilizar una serie de opciones de la línea de órdenes. "
-"Para consultar la lista completa, ejecute las órdenes <command>man "
-"evolution</command> o <command>evolution --help</command>. Las más "
-"importantes son:"
+"Evolution tiene cierto número de opciones para la línea de comandos que "
+"puede usar. Para obtener más información acerca de las opciones de líneas de "
+"comandos, abra una ventana de terminal y teclee <command>evolution --help</"
+"command>."
+
+#: C/evolution.xml:1025(para)
+msgid "The most important command line options are:"
+msgstr "Las opciones para la línea de comandos más importantes son:"
 
-#: C/evolution.xml:1030(para)
+#: C/evolution.xml:1033(para)
 msgid "Command"
 msgstr "Orden"
 
-#: C/evolution.xml:1033(para) C/evolution.xml:1699(para)
+#: C/evolution.xml:1036(para) C/evolution.xml:1710(para)
 msgid "Description"
 msgstr "Descripción"
 
-#: C/evolution.xml:1040(para)
+#: C/evolution.xml:1043(para)
 msgid "evolution --offline"
 msgstr "evolution --offline"
 
-#: C/evolution.xml:1043(para)
+#: C/evolution.xml:1046(para)
 msgid "Starts Evolution in offline mode."
 msgstr "Inicia Evolution en modo desconectado."
 
-#: C/evolution.xml:1048(para)
+#: C/evolution.xml:1051(para)
 msgid "evolution --disable-preview"
 msgstr "evolution --disable-preview"
 
-#: C/evolution.xml:1051(para)
+#: C/evolution.xml:1054(para)
 msgid "Disables all the preview panes when you launch Evolution."
 msgstr "Deshabilita todos los paneles de vista preliminar cuando inicie Evolution."
 
-#: C/evolution.xml:1052(para)
+#: C/evolution.xml:1055(para)
 msgid ""
 "It lets Evolution not to open the last crashed message, task or contact when "
 "you restart Evolution. Thus, it provides a way to avoid system crash caused "
@@ -2912,66 +2884,69 @@ msgstr ""
 "evitar otro cuelgue causado por la vista preliminar de un mensaje, tarea o "
 "contacto."
 
-#: C/evolution.xml:1057(para)
+#: C/evolution.xml:1060(para)
 msgid "evolution mailto:<varname>joe@somewhere.net</varname>"
 msgstr "evolution mailto:<varname>joe@somewhere.net</varname>"
 
-#: C/evolution.xml:1060(para)
-msgid "Starts Evolution and begins composing a message to the e-mail address listed."
+#: C/evolution.xml:1063(para)
+#, fuzzy
+msgid "Starts Evolution and begins composing a message to the email address listed."
 msgstr ""
 "Inicia Evolution y empieza redactando un mensaje a la dirección de correo "
 "listada."
 
-#: C/evolution.xml:1065(para)
+#: C/evolution.xml:1068(para)
 msgid "evolution -c mail"
 msgstr "evolution -c mail"
 
-#: C/evolution.xml:1068(para)
+#: C/evolution.xml:1071(para)
 msgid "Starts Evolution in mail mode."
 msgstr "Inicia Evolution en modo correo."
 
-#: C/evolution.xml:1073(para)
+#: C/evolution.xml:1076(para)
 msgid "evolution -c calendar"
 msgstr "evolution -c calendar"
 
-#: C/evolution.xml:1076(para)
+#: C/evolution.xml:1079(para)
 msgid "Starts Evolution in calendar mode."
 msgstr "Inicia Evolution en modo calendario."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:1081(para)
+#: C/evolution.xml:1084(para)
 msgid "evolution -c contacts"
 msgstr "evolution -c contacts"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:1084(para)
+#: C/evolution.xml:1087(para)
 msgid "Starts Evolution in contacts mode."
 msgstr "Inicia Evolution en modo contactos."
 
-#: C/evolution.xml:1089(para)
+#: C/evolution.xml:1092(para)
 msgid "evolution --force-shutdown"
 msgstr "evolution --force-shutdown"
 
-#: C/evolution.xml:1092(para)
+#: C/evolution.xml:1095(para)
 msgid "Forces every part of Evolution to shut down immediately."
 msgstr "Fuerza cada componente de Evolution a terminar inmediatamente."
 
-#: C/evolution.xml:1097(para)
+#: C/evolution.xml:1100(para)
 msgid "evolution <quote>%s</quote>"
 msgstr "evolution <quote>%s</quote>"
 
-#: C/evolution.xml:1100(para)
+#: C/evolution.xml:1103(para)
+#, fuzzy
 msgid ""
-"Makes Evolution your default e-mail handler for your Web browser and in the "
+"Makes Evolution your default email handler for your Web browser and in the "
 "GNOME* Control Center."
 msgstr ""
 "Hace de Evolution su manipulador de correo-e predeterminado para su "
 "navegador web y en el centro de control de GNOME."
 
-#: C/evolution.xml:1111(para)
+#: C/evolution.xml:1114(para)
+#, fuzzy
 msgid ""
-"This section, and <link linkend=\"usage-mail-organize\">Organizing Your E-"
-"Mail</link>, provide you with an in-depth guide to the capabilities of "
+"This section, and <link linkend=\"usage-mail-organize\">Organizing Your "
+"Email</link>, provide you with an in-depth guide to the capabilities of "
 "<trademark>Evolution</trademark> as a mail client. For information about how "
 "to customize your mail account, see <link linkend=\"config-prefs-mail\">Mail "
 "Preferences</link>."
@@ -2984,29 +2959,30 @@ msgstr ""
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1114(link) C/evolution.xml:1131(title)
+#: C/evolution.xml:1117(link) C/evolution.xml:1134(title)
 msgid "Reading Mail"
 msgstr "Lectura de correo"
 
-#: C/evolution.xml:1117(link) C/evolution.xml:1375(title)
-msgid "Composing New E-Mail Messages"
+#: C/evolution.xml:1120(link) C/evolution.xml:1386(title)
+#, fuzzy
+msgid "Composing New Email Messages"
 msgstr "Redacción de mensajes de correo-e nuevos"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1120(link) C/evolution.xml:1970(title)
+#: C/evolution.xml:1123(link) C/evolution.xml:1982(title)
 msgid "Sending Invitations by Mail"
 msgstr "Envío de invitaciones por correo"
 
-#: C/evolution.xml:1123(link) C/evolution.xml:1993(title)
+#: C/evolution.xml:1126(link) C/evolution.xml:2005(title)
 msgid "IMAP Subscriptions Manager"
 msgstr "Gestor de suscripciones IMAP"
 
-#: C/evolution.xml:1126(link) C/evolution.xml:2017(title)
+#: C/evolution.xml:1129(link) C/evolution.xml:2029(title)
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: C/evolution.xml:1132(para)
+#: C/evolution.xml:1135(para)
 msgid ""
 "If you are not already viewing mail, switch to the mail tool by clicking the "
 "Mail shortcut button, or press Ctrl+1. To read a message, select it in the "
@@ -3018,22 +2994,23 @@ msgstr ""
 "la lista de mensajes, si quiere verlo en su propia ventana, puede o bien "
 "pulsar dos veces en él, pulsar Intro o pulsar Ctrol+O."
 
-#: C/evolution.xml:1134(para)
+#: C/evolution.xml:1137(para)
+#, fuzzy
 msgid ""
 "To read mail with the keyboard, you can click the Spacebar to page down and "
-"press Backspace to page up while reading an e-mail. Ensure that you use the "
-"keys when message list is enabled."
+"press Backspace to page up while reading an email. Ensure that you use the "
+"keys when the message list is enabled."
 msgstr ""
-"Para leer correo con el teclado, puede pulsar la barra espaciadora para "
-"avanzar una página mientras lee y pulsar Retroceso para retroceder una "
-"página. Asegúrese de que usa las teclas cuando la lista de mensajes está "
-"activada."
+"Para leer correo con el teclado puede pulsar la barra espaciadora para "
+"avanzar una página y pulsar Retroceso para retroceder una página mientras "
+"lee un correo-e. Asegúrese de que usa las teclas cuando la lista de mensajes "
+"está activada."
 
-#: C/evolution.xml:1135(para)
+#: C/evolution.xml:1138(para)
 msgid ""
 "Navigate the message list by using the arrow keys on the keyboard. To go to "
 "the next and previous unread messages, press the period (.) or comma (,) "
-"keys. On most keyboards, these keys are also marked with the &gt; and &lt; "
+"keys. On some keyboards, these keys are also marked with the &gt; and &lt; "
 "symbols, which is a convenient way to remember that they move you forward "
 "and backward in your message list. You can also use the right square bracket "
 "(]) for the next unread message, and the left square bracket ([) for the "
@@ -3047,11 +3024,11 @@ msgstr ""
 "corchete derecho (]) para el siguiente mensaje no leído y el corchete "
 "izquierdo ([) para el mensaje anterior no leído."
 
-#: C/evolution.xml:1139(title)
+#: C/evolution.xml:1142(title)
 msgid "Magic Spacebar For Reading Mail"
 msgstr "Barra espaciadora mágica para leer correos"
 
-#: C/evolution.xml:1140(para)
+#: C/evolution.xml:1143(para)
 msgid ""
 "With Magic Spacebar, you can easily read the unread messages in all the mail "
 "folders. You can read mail, scroll through mail and switch folders by using "
@@ -3061,25 +3038,29 @@ msgstr ""
 "en todas las carpetas de correo. Puede leer correo, deslizar el correo y "
 "cambiar entre las carpetas usando la barra espaciadora de su teclado."
 
-#: C/evolution.xml:1141(para)
+#: C/evolution.xml:1144(para)
 msgid "To enable Magic Spacebar:"
 msgstr "Activar la Barra espaciadora mágica:"
 
-#: C/evolution.xml:1144(para)
-msgid ""
-"Click Edit &gt; Preferences &gt; Mail Preferences and select the Enable "
-"Magic Spacebar check box."
-msgstr ""
-"Pulse Editar &gt; Preferencias &gt; Opciones de correo y seleccione la "
-"casilla de selección Activar la barra espaciadora mágica."
+#: C/evolution.xml:1147(para) C/evolution.xml:1243(para)
+#: C/evolution.xml:2128(para) C/evolution.xml:2167(para)
+#: C/evolution.xml:2228(para) C/evolution.xml:5053(para)
+#: C/evolution.xml:5326(para) C/evolution.xml:5609(para)
+#: C/evolution.xml:5625(para) C/evolution.xml:6043(para)
+msgid "Select Edit &gt; Preferences, then select Mail Accounts."
+msgstr "Pulse Editar &gt; Preferencias, después seleccione Cuentas de correo."
+
+#: C/evolution.xml:1150(para)
+msgid "Select the Enable Magic Spacebar check box."
+msgstr "Activar la casilla de verificación de la Barra espaciadora mágica."
 
-#: C/evolution.xml:1147(para)
+#: C/evolution.xml:1153(para)
 msgid "When you are in the Mail view, the Spacebar has the following behavior:"
 msgstr ""
 "Cuando esté en la vista de correo, la barra espaciadora se comportará de la "
 "siguiente manera:"
 
-#: C/evolution.xml:1150(para)
+#: C/evolution.xml:1156(para)
 msgid ""
 "When you press the Spacebar for the first time, it takes you to the next "
 "unread message."
@@ -3087,15 +3068,16 @@ msgstr ""
 "Al pulsar la barra espaciadora la primera vez, le llevará al siguiente "
 "correo no leído."
 
-#: C/evolution.xml:1153(para)
+#: C/evolution.xml:1159(para)
+#, fuzzy
 msgid ""
-"If the message is more than one screen long, the apacebar works as Page Down "
+"If the message is more than one screen long, the Spacebar works as Page Down "
 "key."
 msgstr ""
 "Si el mensaje es más largo que la pantalla, la barra espaciadora funciona "
 "como avance de página."
 
-#: C/evolution.xml:1156(para)
+#: C/evolution.xml:1162(para)
 msgid ""
 "If you press the Spacebar after you reach the bottom of the page, it takes "
 "you to the next unread message."
@@ -3103,7 +3085,7 @@ msgstr ""
 "Si pulsa la barra espaciadora cuando ha llegado al final de la página, le "
 "lleva al siguiente mensaje no leído."
 
-#: C/evolution.xml:1159(para)
+#: C/evolution.xml:1165(para)
 msgid ""
 "If there are no more unread messages in the mailbox, pressing the Spacebar "
 "takes you to the next unread message in the next folder."
@@ -3111,7 +3093,7 @@ msgstr ""
 "Si no hay más mensajes sin leer en el buzón de correo, la barra espaciadora "
 "le lleva al siguiente mensaje sin leer en la siguiente carpeta."
 
-#: C/evolution.xml:1162(para)
+#: C/evolution.xml:1168(para)
 msgid ""
 "If new messages arrive in a number of folders, the Spacebar toggles between "
 "those folders. This feature allows you to switch to the next unread message "
@@ -3122,15 +3104,16 @@ msgstr ""
 "siguiente mensaje no leído en una carpeta diferente sin tener que pulsar "
 "sobre la carpeta."
 
-#: C/evolution.xml:1168(title)
+#: C/evolution.xml:1174(title)
 msgid "Checking for New Mail"
 msgstr "Comprobación de correo nuevo"
 
-#: C/evolution.xml:1169(para)
+#: C/evolution.xml:1175(para)
+#, fuzzy
 msgid ""
 "To check your mail, click Send/Receive in the toolbar. If you haven't "
 "created any mail accounts yet, the setup assistant asks you for the "
-"information it needs to check your e-mail. For information on creating mail "
+"information it needs to check your email. For information on creating mail "
 "accounts, see <link linkend=\"usage-mainwindow-starting\">Starting Evolution "
 "for the First Time</link>."
 msgstr ""
@@ -3140,17 +3123,18 @@ msgstr ""
 "información acerca de crear cuentas de correo, vea <link linkend=\"usage-"
 "mainwindow-starting\">Iniciar Evolution por primera vez</link>."
 
-#: C/evolution.xml:1170(para)
+#: C/evolution.xml:1176(para)
+#, fuzzy
 msgid ""
 "If this is your first time checking mail, or you haven't asked Evolution to "
 "store your password, you are prompted for the password. Enter your password "
-"to download your e-mail."
+"to download your email."
 msgstr ""
 " Si es la primera vez que comprueba el correo-e, o no se le ha pedido a "
 "Evolution que almacena su contraseña, se le pedirá la contraseña. Introduzca "
 "su contraseña para descargar su correo."
 
-#: C/evolution.xml:1171(para)
+#: C/evolution.xml:1177(para)
 msgid ""
 "If you get an error message instead of mail, you probably need to check your "
 "network settings. To learn how to do that, see <link linkend=\"mail-prefs-"
@@ -3161,24 +3145,27 @@ msgstr ""
 "linkend=\"mail-prefs-headers\">Opciones de las cabeceras del correo</link> o "
 "pregunte al administrador del sistema."
 
-#: C/evolution.xml:1175(title)
+#: C/evolution.xml:1181(title)
 msgid "New Mail Notification"
 msgstr "Notificaciones de correo nuevo"
 
-#: C/evolution.xml:1176(para)
+#: C/evolution.xml:1182(para)
+#, fuzzy
 msgid ""
-"Evolution notifies you of new e-mail. When you receive a new mail in your "
+"Evolution notifies you of new email. When you receive a new mail in your "
 "inbox, a blinking icon appears on the Switcher."
 msgstr ""
 "Evolution le notifica la llegada de nuevo correo-e. Cuando reciba un nuevo "
 "correo en su buzón, aparecerá un icono parpadeante en el Selector."
 
-#: C/evolution.xml:1178(para)
+#: C/evolution.xml:1184(para)
+#, fuzzy
 msgid ""
-"You can also view a blinking icon <inlinegraphic format=\"PNG\" fileref="
+"You can also see a blinking icon <inlinegraphic format=\"PNG\" fileref="
 "\"figures/evo_blink.png\"/> in the notification area that disappears when "
-"you open the new e-mail. Mouse over the <inlinegraphic format=\"PNG\" "
-"fileref=\"figures/evo_blink.png\"/> icon to view the notification message."
+"you open the new email. You can keep the mouse over the <inlinegraphic "
+"format=\"PNG\" fileref=\"figures/evo_blink.png\"/> icon to view the "
+"notification message."
 msgstr ""
 "También puede ver un icono que parpadea <inlinegraphic format=\"PNG\" "
 "fileref=\"figures/evo_blink.png\"/> en el área de notificación y que "
@@ -3186,11 +3173,11 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/> mostrará "
 "el mensaje de notificación."
 
-#: C/evolution.xml:1182(title)
+#: C/evolution.xml:1188(title)
 msgid "Vertical View Versus Classical View"
 msgstr "Vista vertical y vista clásica"
 
-#: C/evolution.xml:1183(para)
+#: C/evolution.xml:1189(para)
 msgid ""
 "Evolution provides you vertical view in addition to the classical view. In "
 "the vertical view, message preview pane is located at the right side of the "
@@ -3205,22 +3192,22 @@ msgstr ""
 "vista vertical le permite usar la anchura extra en los monitores de pantalla "
 "panorámica."
 
-#: C/evolution.xml:1185(title)
+#: C/evolution.xml:1191(title)
 msgid "Vertical View:"
 msgstr "Vista vertical:"
 
-#: C/evolution.xml:1186(para)
+#: C/evolution.xml:1192(para)
 msgid "To switch to vertical view"
 msgstr "Para cambiar a la vista vertical"
 
-#: C/evolution.xml:1190(para)
+#: C/evolution.xml:1196(para)
 msgid "Click View &gt; Preview &gt; Vertical View"
 msgstr "Pulse Ver &gt; Vista previa &gt; Vista vertical"
 
-#: C/evolution.xml:1193(para)
+#: C/evolution.xml:1199(para)
 msgid ""
 "In Vertical view, default message list contains a double line compressed "
-"headers, which enables you to consume the extra width in the preview column."
+"headers, which enables you to consume the extra width in the preview column. "
 "The compressed columns have Sender Name and Email, Attachment Icon, Date and "
 "Subject in the second line."
 msgstr ""
@@ -3230,23 +3217,23 @@ msgstr ""
 "correo electrónico del remitente, el icono de adjuntos, la fecha y el asunto "
 "en la segunda línea."
 
-#: C/evolution.xml:1196(title)
+#: C/evolution.xml:1202(title)
 msgid "Classical View:"
 msgstr "Vista clásica:"
 
-#: C/evolution.xml:1197(para)
+#: C/evolution.xml:1203(para)
 msgid "To switch to classical view,"
 msgstr "Para cambiar a la vista clásica,"
 
-#: C/evolution.xml:1201(para)
+#: C/evolution.xml:1207(para)
 msgid "Click View &gt; Preview &gt; Classical View"
 msgstr "Pulse Ver &gt; Vista previa &gt; Vista clásica"
 
-#: C/evolution.xml:1207(title)
+#: C/evolution.xml:1213(title)
 msgid "Collapsible Message Headers"
 msgstr "Cabeceras de mensajes contraíbles"
 
-#: C/evolution.xml:1208(para)
+#: C/evolution.xml:1214(para)
 msgid ""
 "Evolution compresses the TO, CC, BCC headers of received mail and shows only "
 "limited addresses. You can set the limit of the number of addresses to be "
@@ -3256,37 +3243,40 @@ msgstr ""
 "muestra sólo direcciones limitadas. Puede establecer un límite en el número "
 "de direcciones para mostrar en el panel de vista previa."
 
-#: C/evolution.xml:1210(para)
+#: C/evolution.xml:1216(para)
 msgid "Use the following procedure to set the limit of addresses to be displayed:"
 msgstr ""
 "Use el siguiente procedimiento para establecer el límite de direcciones a "
 "mostrar:"
 
-#: C/evolution.xml:1213(para)
-msgid "Click Edit &gt; Preferences"
-msgstr "Pulse Editar &gt; Preferencias"
+#: C/evolution.xml:1219(para) C/evolution.xml:1877(para)
+#: C/evolution.xml:2204(para) C/evolution.xml:5028(para)
+#: C/evolution.xml:5222(para) C/evolution.xml:6333(para)
+msgid "Select Edit &gt; Preferences."
+msgstr "Seleccione Editar &gt; Preferencias."
 
-#: C/evolution.xml:1216(para)
-msgid "Select Mail Preferences"
-msgstr "Seleccione Opciones de correo"
+#: C/evolution.xml:1222(para)
+msgid "Select Mail Preferences."
+msgstr "Seleccione Opciones de correo."
 
-#: C/evolution.xml:1219(para)
+#: C/evolution.xml:1225(para)
 msgid ""
 "Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
-"address"
+"address."
 msgstr ""
 "Marque la columna <guilabel>Reducir las cabeceras Para / Cc / Cco a</"
 "guilabel> para limitar las direcciones"
 
-#: C/evolution.xml:1222(para)
+#: C/evolution.xml:1228(para)
 msgid "Enter the limit in the field."
 msgstr "Introduzca el límite en el campo."
 
-#: C/evolution.xml:1225(para)
+#: C/evolution.xml:1231(para)
+#, fuzzy
 msgid ""
-"You can expand the message headers by click the <inlinegraphic format=\"PNG"
-"\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> in "
-"the message preview pane. To collapse click <inlinegraphic format=\"PNG\" "
+"You can expand the message headers by clicking the <inlinegraphic format="
+"\"PNG\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> "
+"in the message preview pane. To collapse click <inlinegraphic format=\"PNG\" "
 "fileref=\"figures/minus.png\"/> icon in the preview pane."
 msgstr ""
 "Puede expandir las cabeceras del mensaje pulsando el icono <inlinegraphic "
@@ -3294,35 +3284,38 @@ msgstr ""
 "en el panel de vista previa. Para contraerlas pulse el icono <inlinegraphic "
 "format=\"PNG\" fileref=\"figures/minus.png\"/> en el panel de vista previa."
 
-#: C/evolution.xml:1229(title)
+#: C/evolution.xml:1235(title)
 msgid "Sharing Mailboxes with Other Mail Programs"
 msgstr "Compartir buzones con otros programas de correo"
 
-#: C/evolution.xml:1230(para)
+#: C/evolution.xml:1236(para)
+#, fuzzy
 msgid ""
-"If you want to use Evolution and another e-mail client, such as Mutt, at the "
+"If you want to use Evolution and another email client, such as Mutt, at the "
 "same time, use the following procedure:"
 msgstr ""
 "Si quiere usar Evolution y además otro cliente de correo electrónico, como "
 "Mutt, al mismo tiempo, use el siguiente procedimiento:"
 
-#: C/evolution.xml:1233(para)
+#: C/evolution.xml:1239(para)
 msgid "Download your mail in the other application as you would normally."
 msgstr "Descargue su correo en la otra aplicación como haría con normalidad."
 
-#: C/evolution.xml:1236(para)
+#: C/evolution.xml:1242(para)
+msgid "In Evolution:"
+msgstr "En Evolution:"
+
+#: C/evolution.xml:1244(para)
 msgid ""
-"In Evolution, click Edit &gt; Preferences, then click Mail Accounts. Select "
-"the account you want to use to share mail and click Edit. Instead of Edit, "
-"you might want to create a new account just for this source of mail by "
+"Select the account you want to use to share mail and click Edit. Instead of "
+"Edit, you might want to create a new account just for this source of mail by "
 "clicking New."
 msgstr ""
-"En Evolution, pulse Editar &gt; Preferencias, después pulse en Cuentas de "
-"correo. Seleccione la cuenta que quiere usar para compartir correo y pulse "
-"Editar. En lugar de Editar, quizá quiera crear una cuenta nueva sólo para "
-"esta fuente de correo pulsando Nuevo."
+"Seleccione la cuenta que quiere usar para compartir correo y pulse Editar. "
+"En lugar de Editar, quizá quiera crear una cuenta nueva sólo para esta "
+"fuente de correo pulsando Nuevo."
 
-#: C/evolution.xml:1239(para)
+#: C/evolution.xml:1247(para)
 msgid ""
 "Under the Receiving Mail tab, select the type of mail file that your other "
 "mail application uses, then specify the full path to that location. A "
@@ -3334,7 +3327,7 @@ msgstr ""
 "lugar. Una eleción habitual son los archivos mbox, con la ruta «/home/"
 "<varname>nombresdelusuario</varname>/Mail»."
 
-#: C/evolution.xml:1245(para)
+#: C/evolution.xml:1253(para)
 msgid ""
 "You can only use one mail client at a time. The mail files are locked by the "
 "mail program that is currently using them, so the mail files can't be "
@@ -3344,11 +3337,11 @@ msgstr ""
 "bloquean por el programa de correo que los esté usando en ese momento, así "
 "que los archivos no pueden accederse por otro programa de correo."
 
-#: C/evolution.xml:1249(title)
+#: C/evolution.xml:1257(title)
 msgid "Working with Attachments and HTML Mail"
 msgstr "Trabajar con adjuntos y correo HTML"
 
-#: C/evolution.xml:1250(para)
+#: C/evolution.xml:1258(para)
 msgid ""
 "If someone sends you an <link linkend=\"attachment\">attachment</link>, "
 "Evolution displays a file icon at the end of the message to which it is "
@@ -3367,19 +3360,20 @@ msgstr ""
 "de adjuntos. Para abrir un adjunto, pulse dos veces en él. pulse el botón "
 "Guardar todo para guardar todos los adjuntos."
 
-#: C/evolution.xml:1253(title)
+#: C/evolution.xml:1261(title)
 msgid "Saving or Opening Attachments"
 msgstr "Guardar o abrir adjuntos"
 
-#: C/evolution.xml:1254(para)
+#: C/evolution.xml:1262(para)
+#, fuzzy
 msgid ""
-"If you get an e-mail message with an attachment, Evolution can help you save "
+"If you get an email message with an attachment, Evolution can help you save "
 "the attachment or open it with the appropriate applications."
 msgstr ""
 "Si recibe un adjunto dentro de un mensaje de correo electrónica, Evolution "
 "le ayuda a guardarlo o a abrirlo con las aplicaciones adecuadas."
 
-#: C/evolution.xml:1255(para)
+#: C/evolution.xml:1263(para)
 msgid ""
 "Evolution shows a right-arrow icon, the number of attachments, and a Save or "
 "Save All button to save all the attachments. Click the right-arrow icon to "
@@ -3390,39 +3384,35 @@ msgstr ""
 "adjuntos. Pulse en el icono de la flecha derecha para mostar la barra de "
 "adjuntos."
 
-#: C/evolution.xml:1256(para)
+#: C/evolution.xml:1264(para)
 msgid "To save an attachment to disk:"
 msgstr "Para guardar un adjunto en el disco:"
 
-#: C/evolution.xml:1259(para)
+#: C/evolution.xml:1267(para) C/evolution.xml:1282(para)
 msgid ""
-"Click the down-arrow on the attachment icon, or right-click the attachment "
-"icon in the attachment bar, then click Save As."
+"Click the down-arrow on the attachment icon or right-click the attachment "
+"icon in the attachment bar."
 msgstr ""
-"Pulse en la flecha hacia abjo del icono del adjunto, o pulse con el botón "
-"derecho en el icono del adjunto, después pulse Guadar como."
+"Pulse la flecha hacia abajo en el icono de adjunto o pulse con el botón "
+"derecho sobre el icono del adjunto en la barra de adjuntos."
 
-#: C/evolution.xml:1262(para)
+#: C/evolution.xml:1270(para)
+msgid "Click Save As."
+msgstr "Pulse Guardar como."
+
+#: C/evolution.xml:1273(para)
 msgid "Select a location and name for the file."
 msgstr "Seleccine una ubicación y un nombre para el archivo."
 
-#: C/evolution.xml:1268(para)
+#: C/evolution.xml:1279(para)
 msgid "To open an attachment using another application:"
 msgstr "Para abrir un adjunto usando otra aplicación:"
 
-#: C/evolution.xml:1271(para)
-msgid ""
-"Click the down-arrow on the attachment icon or right-click the attachment "
-"icon in the attachment bar."
-msgstr ""
-"Pulse la flecha hacia abajo en el icono de adjunto o pulse con el botón "
-"derecho sobre el icono del adjunto en la barra de adjuntos."
-
-#: C/evolution.xml:1274(para)
+#: C/evolution.xml:1285(para)
 msgid "Select the application to open the attachment."
 msgstr "Seleccione la aplicación para abrir el adjunto."
 
-#: C/evolution.xml:1280(para)
+#: C/evolution.xml:1291(para)
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications your system has installed. For example, "
@@ -3436,11 +3426,11 @@ msgstr ""
 "org y cualquier otro procesador de textos, y archivos comprimidos se pueden "
 "abrir con la aplicación File Roller."
 
-#: C/evolution.xml:1284(title)
+#: C/evolution.xml:1295(title)
 msgid "Inline Images in HTML Mail"
 msgstr "Imágenes dentro de correos HTML"
 
-#: C/evolution.xml:1285(para)
+#: C/evolution.xml:1296(para)
 msgid ""
 "When someone sends you HTML mail that includes an image in the body of the "
 "message (for example, the welcome message in your Inbox), Evolution displays "
@@ -3455,13 +3445,14 @@ msgstr ""
 "compositor. Alternativamente, sólo arrastre una imagen dentro del área de "
 "composición del mensaje."
 
-#: C/evolution.xml:1286(para)
+#: C/evolution.xml:1297(para)
+#, fuzzy
 msgid ""
 "Some images are links in a message, rather than being part of the message. "
 "Evolution can download those images from the Internet, but does not do so "
-"unless you request it. This is because remotely Servered images can be slow "
+"unless you request it. This is because remotely servered images can be slow "
 "to load and display, and can even be used by spammers to track who reads the "
-"e-mail. Not automatically loading images helps protect your privacy."
+"email. Not automatically loading images helps protect your privacy."
 msgstr ""
 "Algunas imágenes son enlaces dentro de un mensaje, más que una parte del "
 "mensaje. Evolution puede descargar esas imágenes desde internet, pero no lo "
@@ -3471,27 +3462,27 @@ msgstr ""
 "lee los mensajes. No cargar automáticamente las imágenes ayuda a proteger su "
 "privacidad."
 
-#: C/evolution.xml:1287(para)
+#: C/evolution.xml:1298(para)
 msgid "To load the images for one message:"
 msgstr "Para cargar las imágenes de un mensaje:"
 
-#: C/evolution.xml:1290(para)
+#: C/evolution.xml:1301(para)
 msgid "Click View &gt; Load Images."
 msgstr "Pulse Ver &gt; Cargar imágenes."
 
-#: C/evolution.xml:1293(para)
+#: C/evolution.xml:1304(para)
 msgid "To set the default action for loading images:"
 msgstr "Para establecer la acción predeterminada para cargar imágenes:"
 
-#: C/evolution.xml:1296(para)
-msgid "Click Edit &gt; Preferences, then click Mail Preferences."
-msgstr "Pulse Editar &gt; Preferencias, después pulse Opciones de correo."
+#: C/evolution.xml:1307(para)
+msgid "Select Edit &gt; Preferences, then select Mail Preferences."
+msgstr "Seleccione Editar &gt; Preferencias, después pulse Opciones de correo."
 
-#: C/evolution.xml:1299(para)
+#: C/evolution.xml:1310(para)
 msgid "Click the HTML Mail tab."
 msgstr "Pulse sobre la solapa Correo en HTML."
 
-#: C/evolution.xml:1302(para)
+#: C/evolution.xml:1313(para)
 msgid ""
 "Select one of the items: Never Load Images Off the Net, Load Images in Mail "
 "From Contacts, or Always Load Images Off the Net."
@@ -3500,27 +3491,28 @@ msgstr ""
 "Cargar imágenes en el correo de los contactos o Siempre cargar las imágenes "
 "desde internet."
 
-#: C/evolution.xml:1305(para) C/evolution.xml:1353(para)
-#: C/evolution.xml:1779(para) C/evolution.xml:1813(para)
-#: C/evolution.xml:1836(para) C/evolution.xml:2131(para)
-#: C/evolution.xml:2169(para) C/evolution.xml:2200(para)
-#: C/evolution.xml:2229(para)
+#: C/evolution.xml:1316(para) C/evolution.xml:1364(para)
+#: C/evolution.xml:1555(para) C/evolution.xml:1790(para)
+#: C/evolution.xml:1824(para) C/evolution.xml:1847(para)
+#: C/evolution.xml:2143(para) C/evolution.xml:2182(para)
+#: C/evolution.xml:2216(para) C/evolution.xml:2248(para)
+#: C/evolution.xml:5686(para) C/evolution.xml:6064(para)
 msgid "Click Close."
 msgstr "Pulse Cerrar."
 
-#: C/evolution.xml:1308(para)
+#: C/evolution.xml:1319(para)
 msgid "To set your proxy in KDE:"
 msgstr "Para establecer su proxy en KDE:"
 
-#: C/evolution.xml:1311(para)
+#: C/evolution.xml:1322(para)
 msgid "Click the menu icon &gt; System &gt; Configuration &gt; Yast."
 msgstr "Pulse el icono de menú &gt; Sistema &gt; Configuración &gt; Yast."
 
-#: C/evolution.xml:1314(para) C/evolution.xml:1329(para)
+#: C/evolution.xml:1325(para) C/evolution.xml:1340(para)
 msgid "Click Network Services, then click Proxy."
 msgstr "Pulse Servicios de red, después Proxy."
 
-#: C/evolution.xml:1317(para) C/evolution.xml:1332(para)
+#: C/evolution.xml:1328(para) C/evolution.xml:1343(para)
 msgid ""
 "Specify your proxy settings (if you don't know your proxy settings, contact "
 "your ISP or system administrator)."
@@ -3528,15 +3520,15 @@ msgstr ""
 "Especifique la configuración de su proxy (si no conoce los ajustes de su "
 "proxy, contacte con su ISP o el administrador de su sistema)."
 
-#: C/evolution.xml:1320(para) C/evolution.xml:1335(para)
+#: C/evolution.xml:1331(para) C/evolution.xml:1346(para)
 msgid "Click Finish, then click Close."
 msgstr "Pulse Finalizar, después Cerrar."
 
-#: C/evolution.xml:1323(para)
+#: C/evolution.xml:1334(para)
 msgid "To set your proxy in GNOME:"
 msgstr "Para establecer su proxy en GNOME:"
 
-#: C/evolution.xml:1326(para)
+#: C/evolution.xml:1337(para)
 msgid ""
 "Click System &gt; Administrative Settings (enter your root password if "
 "needed)."
@@ -3544,17 +3536,18 @@ msgstr ""
 "Pulse Sistema &gt; Preferencias &gt; Proxy de la red (si es necesario "
 "introduzca su contraseña de superusuario)."
 
-#: C/evolution.xml:1342(title)
+#: C/evolution.xml:1353(title)
 msgid "Using Evolution for News"
 msgstr "Usar Evolution para noticias"
 
-#: C/evolution.xml:1343(para)
+#: C/evolution.xml:1354(para)
+#, fuzzy
 msgid ""
 "USENET newsgroups are similar to mail, so it is often convenient to read "
 "news and mail side by side. You can add a news source, called an NNTP "
-"server, the same way you would add <link linkend=\"bse54o0\">new e-mail "
-"account</link>, selecting USENET News as the source type. The news server "
-"appear as a remote mail server, and each news group works like an IMAP "
+"server, the same way you would add <link linkend=\"bse54o0\">new email "
+"account</link>, selecting USENET News as the Server type. The news server "
+"appear as a remote mail server, and each newsgroup works like an IMAP "
 "folder. When you click Send/Receive, Evolution also checks for news messages."
 msgstr ""
 "Los grupos de USENET son similares al correo, así que a menudo es "
@@ -3566,19 +3559,19 @@ msgstr ""
 "una carpeta IMAP. Cuando pulse Enviar/Recibir, Evolution también comprueba "
 "mensajes de noticias."
 
-#: C/evolution.xml:1344(para)
+#: C/evolution.xml:1355(para)
 msgid ""
-"When you create a news group account, you are not subscribed to any groups. "
-"To subscribe to a news group:"
+"When you create a newsgroup account, you are not subscribed to any groups. "
+"To subscribe to a newsgroup:"
 msgstr ""
-"Cuando crea una cuenta de grupo de noticias USENET, no está suscrito a "
-"ningún grupo. Para suscribirse a un grupo de noticias:"
+"Cuando crea una cuenta de grupo de noticias, no está suscrito a ningún "
+"grupo. Para suscribirse a un grupo de noticias:"
 
-#: C/evolution.xml:1347(para) C/evolution.xml:5317(para)
+#: C/evolution.xml:1358(para) C/evolution.xml:5296(para)
 msgid "Click Folder &gt; Subscriptions."
 msgstr "Pulse Carpeta &gt; Suscripciones."
 
-#: C/evolution.xml:1350(para)
+#: C/evolution.xml:1361(para)
 msgid ""
 "Select your NNTP account, select the groups you want to subscribe to, then "
 "click Subscribe."
@@ -3586,11 +3579,11 @@ msgstr ""
 "Seleccione su cuenta NNTP, seleccione los grupos a los que quiere "
 "suscribirse, después pulse Subscribir."
 
-#: C/evolution.xml:1359(title)
+#: C/evolution.xml:1370(title)
 msgid "Deleting Mail"
 msgstr "Borrado de correo"
 
-#: C/evolution.xml:1360(para)
+#: C/evolution.xml:1371(para)
 msgid ""
 "Evolution allows you to delete unwanted messages. To delete a message, "
 "select it and press the Delete key, or click the delete tool in the toolbar, "
@@ -3601,10 +3594,11 @@ msgstr ""
 "de herramientas, pulse Ctrl+D o pulse con el botón derecho del ratón sobre "
 "él y después pulse Borrar."
 
-#: C/evolution.xml:1361(para)
+#: C/evolution.xml:1372(para)
+#, fuzzy
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
-"deleted, but is marked for deletion. Your e-mail is recoverable until you "
+"deleted, but is marked for deletion. Your email is recoverable until you "
 "have expunged your mail. When you expunge a folder, you remove all the mail "
 "that you have marked for deletion.To show deleted messages, uncheck Hide "
 "Deleted Messages option from the View menu. You can view the messages "
@@ -3619,7 +3613,7 @@ msgstr ""
 "menú Ver. Puede ver los mensajes marcados para ser borrados posteriormente. "
 "Puede además encontrar los mensajes borrados en la carpeta Papelera."
 
-#: C/evolution.xml:1362(para)
+#: C/evolution.xml:1373(para)
 msgid ""
 "To permanently erase all the deleted messages in a folder, click Folder &gt; "
 "Expunge or press Ctrl+E."
@@ -3627,11 +3621,11 @@ msgstr ""
 "Para borrar permanentemente todos los mensajes borrados en una carpeta, "
 "pulse Carpeta &gt; Compactar o pulse Ctrl+E."
 
-#: C/evolution.xml:1363(para)
+#: C/evolution.xml:1374(para)
 msgid ""
 "Trash folders in GroupWise, local and IMAP accounts are actually virtual "
 "search folders that display all messages you have marked for later deletion. "
-"Hence, emptying Trash is nothing but expunging deleted mails from all your "
+"Hence, emptying Trash is nothing but expunging deleted mail from all your "
 "folders in the account."
 msgstr ""
 "Las carpetas papelera en cuentas GroupWise, local e IMAP realmente son "
@@ -3639,7 +3633,7 @@ msgstr ""
 "para un borrado posterior. De tal manera que vaciar la Papelera no es otra "
 "cosa que purgar los correos borrados de todas sus carpetas en la cuenta."
 
-#: C/evolution.xml:1364(para)
+#: C/evolution.xml:1375(para)
 msgid ""
 "However, this is not true for the Trash folder on Exchange servers, which "
 "behaves just the same as it does in Outlook. It is a normal folder with "
@@ -3652,19 +3646,22 @@ msgstr ""
 "acerca de carpetas de búsquedas, vea <link linkend=\"usage-mail-organize-"
 "vfolders\">Uso de carpetas de búsqueda</link>."
 
-#: C/evolution.xml:1368(title)
+#: C/evolution.xml:1379(title)
 msgid "Undeleting Messages"
 msgstr "Recuperar mensajes"
 
-#: C/evolution.xml:1369(para)
+#: C/evolution.xml:1380(para)
 msgid ""
 "You can undelete a message that has been deleted but not expunged. To "
-"undelete a message, select the message, click Edit &gt; Undelete."
+"undelete a message, select the message, click Edit &gt; Undelete. Note that "
+"View &gt; Hide Deleted messages in the menubar must be disabled for this."
 msgstr ""
 "Puede recuperar un mensaje que ha sido borrado pero no ha sido purgado. Para "
-"recuperar un mensaje, seleccione el mensaje, pulse Editar &gt: Recuperar."
+"recuperar un mensaje, seleccione el mensaje, pulse Editar &gt: Recuperar. "
+"Note que Ver &gt; Ocultar mensajes borrados en la barra de menú debe estar "
+"desactivado para esto."
 
-#: C/evolution.xml:1370(para)
+#: C/evolution.xml:1381(para)
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is removed from the Trash folder."
@@ -3672,9 +3669,10 @@ msgstr ""
 "Si ha marcado un mensaje para su eliminación, recuperándolo eliminará la "
 "marca y el mensaje se borrará de la carpeta Papelera."
 
-#: C/evolution.xml:1376(para)
+#: C/evolution.xml:1387(para)
+#, fuzzy
 msgid ""
-"You can start writing a new e-mail message by clicking File &gt; New &gt; "
+"You can start writing a new email message by clicking File &gt; New &gt; "
 "Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking "
 "New in the toolbar."
 msgstr ""
@@ -3682,11 +3680,12 @@ msgstr ""
 "Nuevo &gt; Mensaje de correo, pulsando Ctrl+N cuando esté en la herramienta "
 "de correo o pulsando Nuevo en la barra de herramientas."
 
-#: C/evolution.xml:1377(para)
+#: C/evolution.xml:1388(para)
+#, fuzzy
 msgid ""
 "Enter an address in the To field. If you want to enter multiple email "
-"addresses, type in the addresses separated by comma. You can also use "
-"contact list to send messages to multiple recipients.Enter a subject in the "
+"addresses, type in the addresses separated by comma. You can also use a "
+"contact list to send messages to multiple recipients. Enter a subject in the "
 "Subject field, and a message in the box at the bottom of the window. After "
 "you have written your message, click Send."
 msgstr ""
@@ -3697,65 +3696,69 @@ msgstr ""
 "en la parte inferior, el texto del mensaje. Una vez que haya escrito su "
 "mensaje pulse «Enviar»."
 
-#: C/evolution.xml:1378(para)
+#: C/evolution.xml:1389(para)
 msgid "New mail message window look like this:"
 msgstr "La ventana de mensaje de correo nuevo es así:"
 
-#: C/evolution.xml:1380(para) C/evolution.xml:5962(para)
+#: C/evolution.xml:1391(para) C/evolution.xml:5944(para)
 msgid "This section contains the following topics:"
 msgstr "Esta sección contiene los siguientes temas:"
 
-#: C/evolution.xml:1383(link) C/evolution.xml:1421(title)
+#: C/evolution.xml:1394(link) C/evolution.xml:1432(title)
 msgid "Unicode, ASCII, and Non-Latin Alphabets"
 msgstr "Unicode, ASCII, y alfabetos no latinos"
 
-#: C/evolution.xml:1386(link) C/evolution.xml:1433(title)
+#: C/evolution.xml:1397(link) C/evolution.xml:1444(title)
 msgid "Sending Composed Messages Later"
 msgstr "Enviar los mensajes nuevos más tarde"
 
-#: C/evolution.xml:1389(link) C/evolution.xml:1449(title)
+#: C/evolution.xml:1400(link) C/evolution.xml:1460(title)
 msgid "Working Offline"
 msgstr "Trabar desconectado"
 
-#: C/evolution.xml:1392(link) C/evolution.xml:1502(title)
+#: C/evolution.xml:1403(link) C/evolution.xml:1513(title)
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: C/evolution.xml:1395(link) C/evolution.xml:1549(title)
-msgid "Specifying Additional Recipients for E-Mail"
+#: C/evolution.xml:1406(link) C/evolution.xml:1560(title)
+#, fuzzy
+msgid "Specifying Additional Recipients for Email"
 msgstr "Especificar destinatarios adicioneles para correo electrónico"
 
-#: C/evolution.xml:1398(link) C/evolution.xml:1574(title)
+#: C/evolution.xml:1409(link) C/evolution.xml:1585(title)
 msgid "Choosing Recipients Quickly"
 msgstr "Eligiendo los destinatarios rápidamente"
 
-#: C/evolution.xml:1401(link) C/evolution.xml:1582(title)
-msgid "Replying to E-Mail Messages"
+#: C/evolution.xml:1412(link) C/evolution.xml:1593(title)
+#, fuzzy
+msgid "Replying to Email Messages"
 msgstr "Responder a mensajes de correo-e"
 
-#: C/evolution.xml:1404(link) C/evolution.xml:1648(title)
+#: C/evolution.xml:1415(link) C/evolution.xml:1659(title)
 msgid "Searching and Replacing with the Composer"
 msgstr "Buscar y sustituir en el editor de mensajes"
 
-#: C/evolution.xml:1407(link) C/evolution.xml:1670(title)
-msgid "Enhancing Your E-Mail with HTML"
+#: C/evolution.xml:1418(link) C/evolution.xml:1681(title)
+#, fuzzy
+msgid "Enhancing Your Email with HTML"
 msgstr "Mejore su correo electrónico con HTML"
 
-#: C/evolution.xml:1410(link) C/evolution.xml:1844(title)
+#: C/evolution.xml:1421(link) C/evolution.xml:1855(title)
 msgid "Mail Send Options"
 msgstr "Opciones de envío de correo"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1413(link) C/evolution.xml:1922(title)
+#: C/evolution.xml:1424(link) C/evolution.xml:1933(title)
 msgid "Forwarding Mail"
 msgstr "Reenviar correo"
 
-#: C/evolution.xml:1416(link) C/evolution.xml:1942(title)
-msgid "Tips for E-Mail Courtesy"
+#: C/evolution.xml:1427(link) C/evolution.xml:1954(title)
+#, fuzzy
+msgid "Tips for Email Courtesy"
 msgstr "Consejos para correo electrónico de cortesía"
 
-#: C/evolution.xml:1422(para)
+#: C/evolution.xml:1433(para)
 msgid ""
 "If you want to write in a non-Latin alphabet while using a Latin keyboard, "
 "try selecting a different input method in the message composer. Right-click "
@@ -3778,7 +3781,7 @@ msgstr ""
 "cirílicas apropiadas, y la comilla simple (‘) proporciona un carácter de "
 "signo suave."
 
-#: C/evolution.xml:1423(para)
+#: C/evolution.xml:1434(para)
 msgid ""
 "For greater language display capabilities, click Edit &gt; Preferences, then "
 "select the character set choices in the Mail Preferences and Composer "
@@ -3792,11 +3795,11 @@ msgstr ""
 "seguro de cuáles usar, seleccione UTF-8, que ofrece el mayor rango de "
 "caracteres disponibles en el mayor número de idiomas."
 
-#: C/evolution.xml:1426(title)
+#: C/evolution.xml:1437(title)
 msgid "Using Character Sets"
 msgstr "Usar los juegos de codificaciones"
 
-#: C/evolution.xml:1427(para)
+#: C/evolution.xml:1438(para)
 msgid ""
 "A character set is a computer's version of an alphabet. In the past, the "
 "ASCII character set was used almost universally. However, it contains only "
@@ -3819,18 +3822,18 @@ msgstr ""
 "de estándares desarrollaron el juego de caracteres UTF-8 Unicode* para "
 "proporcionar un juego de caracteres único para todo el mundo."
 
-#: C/evolution.xml:1428(para)
-msgid ""
-"Most e-mail messages state in advance which character set they use, so "
-"Evolution usually knows what to display for a given binary number. However, "
-"if you find that messages are displayed as rows of incomprehensible "
-"characters, try selecting a different character set in the mail settings "
-"screen. If your recipients can't read your messages, try selecting a "
-"different character set in the composer options dialog box. For some "
-"languages, such as Turkish or Korean, it might work best for you to select "
-"the language-specific character set. However, the best choice for most users "
-"is UTF-8, which offers the widest range of characters for the widest range "
-"of languages."
+#: C/evolution.xml:1439(para)
+#, fuzzy
+msgid ""
+"Most email messages state in advance which character set they use, so "
+"Evolution usually can display those messages correctly. However, if you find "
+"that messages are displayed as rows of incomprehensible characters, try "
+"selecting a different character set in the mail settings screen. If your "
+"recipients can't read your messages, try selecting a different character set "
+"in the composer options dialog box. For some languages, such as Turkish or "
+"Korean, it might work best for you to select the language-specific character "
+"set. However, the best choice for most users is UTF-8, which offers the "
+"widest range of characters for the widest range of languages."
 msgstr ""
 "La mayoría de mensajes de correo-e advierten con antelación qué juego de "
 "caracteres usan, de tal forma que Evolution sabe cómo representarlo para un "
@@ -3844,7 +3847,7 @@ msgstr ""
 "mayoría de usuarios es UTF-8, que ofrece el rango más grande de caracteres "
 "para el rango más grande de idiomas."
 
-#: C/evolution.xml:1434(para)
+#: C/evolution.xml:1445(para)
 msgid ""
 "Evolution normally sends mail as soon as you click Send. However, can save a "
 "message to be sent later:"
@@ -3853,7 +3856,7 @@ msgstr ""
 "Sin embargo hay unas cuantas maneras de guardar un mensaje para enviarlo más "
 "tarde:"
 
-#: C/evolution.xml:1437(para)
+#: C/evolution.xml:1448(para)
 msgid ""
 "If you are offline when you click Send, Evolution adds your message to the "
 "Outbox queue. The next time you connect to the Internet and send or receive "
@@ -3863,7 +3866,7 @@ msgstr ""
 "mensajes en la carpeta «Bandeja de salida». El mensaje se enviará la próxima "
 "vez que se conecte a Internet y envíe o reciba correo."
 
-#: C/evolution.xml:1440(para)
+#: C/evolution.xml:1451(para)
 msgid ""
 "Click File &gt; Save Draft to store your messages in the drafts folder for "
 "later revision."
@@ -3871,7 +3874,7 @@ msgstr ""
 "Pulse Archivo &gt; Guardar borrador para guardar sus mensajes en la carpeta "
 "de borradores y poder revisarlos después."
 
-#: C/evolution.xml:1443(para)
+#: C/evolution.xml:1454(para)
 msgid ""
 "If you prefer to save your message as a text file, click File &gt; Save As, "
 "then specify a filename."
@@ -3879,9 +3882,10 @@ msgstr ""
 "Si prefiere guardar el mensaje como un archivo de texto pulse Archivo &gt; "
 "Guardar como, y después especifique un nombre de archivo."
 
-#: C/evolution.xml:1450(para)
+#: C/evolution.xml:1461(para)
+#, fuzzy
 msgid ""
-"Offline mode help you communicate with remote mail storage systems like "
+"Offline mode helps you communicate with remote mail storage systems like "
 "<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
 "situations where you are not connected to the network at all times. "
 "Evolution keeps a local copy of one or more folders to allow you to compose "
@@ -3894,7 +3898,7 @@ msgstr ""
 "permite crear nuevos mensajes, guardarlos en la Bandeja de salida y enviarlo "
 "en cuanto vuelva a conectarse."
 
-#: C/evolution.xml:1451(para)
+#: C/evolution.xml:1462(para)
 msgid ""
 "POP mail downloads all messages to your local system, but other connections "
 "usually download just the headers, and get the rest only when you want to "
@@ -3907,21 +3911,21 @@ msgstr ""
 "descargará todos los mensajes sin leer desde las carpetas que haya elegido "
 "almacenar."
 
-#: C/evolution.xml:1452(para)
+#: C/evolution.xml:1463(para)
 msgid "To mark a folder for offline use,"
 msgstr "Para marcar una carpeta para su uso desconectado,"
 
-#: C/evolution.xml:1455(para)
+#: C/evolution.xml:1466(para)
 msgid "Right-click the folder, then click Properties."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre la carpeta, después elija "
 "Propiedades."
 
-#: C/evolution.xml:1458(para)
+#: C/evolution.xml:1469(para)
 msgid "Click Copy Folder Content Locally for Offline Operation."
 msgstr "Pulse Copiar el contenido de la carpeta localmente para operar desconectado."
 
-#: C/evolution.xml:1461(para)
+#: C/evolution.xml:1472(para)
 msgid ""
 "Your connection status is shown by the small icon in the lower left border "
 "of the Evolution main window. When you are online, it displays two connected "
@@ -3932,11 +3936,11 @@ msgstr ""
 "mostrará dos cables enchufados. Cuando esté desconectado los cables estarán "
 "desenchufados."
 
-#: C/evolution.xml:1462(para)
+#: C/evolution.xml:1473(para)
 msgid "To cache your selected folders and disconnect from the network,"
 msgstr "Para cachear las carpetas seleccionadas y desconectar de la red,"
 
-#: C/evolution.xml:1465(para)
+#: C/evolution.xml:1476(para)
 msgid ""
 "Click File &gt; Work Offline, or click the connection status icon in the "
 "lower left of the screen."
@@ -3944,7 +3948,7 @@ msgstr ""
 "Pulse Archivo &gt; Trabajar desconectado o pulse el icono de estado de la "
 "conexión en la esquina inferior izquierda de la pantalla."
 
-#: C/evolution.xml:1466(para)
+#: C/evolution.xml:1477(para)
 msgid ""
 "A message pop-ups and asks you whether you want to go offline immediately or "
 "cache before you go offline."
@@ -3952,7 +3956,7 @@ msgstr ""
 "Un mensaje emergerá y le preguntará si quiere desconectarse inmediatamente o "
 "cachear antes de desconectarse."
 
-#: C/evolution.xml:1471(para)
+#: C/evolution.xml:1482(para)
 msgid ""
 "Click Synchronize to download all the messages to the folders marked for "
 "offline."
@@ -3960,11 +3964,11 @@ msgstr ""
 "Pulse Sincronizar para descargar todos los mensajes en las carpetas marcadas "
 "para trabajar desconectado."
 
-#: C/evolution.xml:1472(para) C/evolution.xml:3678(para)
+#: C/evolution.xml:1483(para) C/evolution.xml:3696(para)
 msgid "Or"
 msgstr "O"
 
-#: C/evolution.xml:1473(para)
+#: C/evolution.xml:1484(para)
 msgid ""
 "Click Do not synchronize to go offline immediately, without downloading the "
 "messages locally for offline operations."
@@ -3972,7 +3976,7 @@ msgstr ""
 "Pulse No sincronizar para desconectarse inmediatamente, sin descargar los "
 "mensajes localmente para trabajar desconectado."
 
-#: C/evolution.xml:1474(para)
+#: C/evolution.xml:1485(para)
 msgid ""
 "Select Do not show this message again to switch off this popup. The default "
 "is to not synchronize while going offline."
@@ -3980,21 +3984,21 @@ msgstr ""
 "Seleccione No mostrar otra vez este mensaje para desactivar este mensaje "
 "emergente. Lo predeterminado es no sincronizar al desconectar."
 
-#: C/evolution.xml:1477(para)
+#: C/evolution.xml:1488(para)
 msgid "When you want to reconnect,"
 msgstr "Cuando quiera reconectar,"
 
-#: C/evolution.xml:1480(para)
+#: C/evolution.xml:1491(para)
 msgid "Click File &gt; Work Online, or click the connection status icon again."
 msgstr ""
 "Pulse Archivo &gt; Trabajar conectado o pulse el icono de estado de la "
 "conexión de nuevo."
 
-#: C/evolution.xml:1485(title)
+#: C/evolution.xml:1496(title)
 msgid "Download Messages for Offline Operations"
 msgstr "Descargar los mensajes para trabajar desconectado"
 
-#: C/evolution.xml:1486(para)
+#: C/evolution.xml:1497(para)
 msgid ""
 "This features prepares you for going offline and for offline operations. It "
 "helps you download all the messages locally before you go offline. If "
@@ -4006,19 +4010,19 @@ msgstr ""
 "De otra manera y de forma predeterminada, se desconecta cuando pulsa el "
 "botón de desconexión sin descargar los mensajes."
 
-#: C/evolution.xml:1487(para)
+#: C/evolution.xml:1498(para)
 msgid "To download messages for offline operations,"
 msgstr "Para descargar mensajes para trabajar desconectado,"
 
-#: C/evolution.xml:1490(para)
+#: C/evolution.xml:1501(para)
 msgid "Select File &gt; Download messages for offline."
 msgstr "Seleccione Archivo &gt; Descargar mensajes para trabajar sin conexión."
 
-#: C/evolution.xml:1496(title)
+#: C/evolution.xml:1507(title)
 msgid "Automatic Network State Handling"
 msgstr "Gestión automática del estado de la red"
 
-#: C/evolution.xml:1497(para)
+#: C/evolution.xml:1508(para)
 msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
@@ -4031,30 +4035,31 @@ msgstr ""
 "esta característica, asegúrese de que su sistema tiene instalado Network "
 "Manager."
 
-#: C/evolution.xml:1503(para)
-msgid "To attach a file to your e-mail:"
+#: C/evolution.xml:1514(para)
+#, fuzzy
+msgid "To attach a file to your email:"
 msgstr "Para adjuntar un archivo a su correo-e:"
 
-#: C/evolution.xml:1506(para)
+#: C/evolution.xml:1517(para)
 msgid "Click the Attach icon in the composer toolbar."
 msgstr "Pulse el botón Adjuntar en la barra de herramientas del editor."
 
-#: C/evolution.xml:1509(para)
+#: C/evolution.xml:1520(para)
 msgid "Select the file you want to attach."
 msgstr "Seleccione el archivo que quiere adjuntar."
 
-#: C/evolution.xml:1515(para)
+#: C/evolution.xml:1526(para)
 msgid ""
-"You can also drag a file into the composer window. If you want to send it as "
-"an inline attachment, right-click the attachment and click Properties, then "
-"select Automatic Display of Attachments."
+"You can also drag a file to the attachment bar of the composer window. If "
+"you want to send it as an inline attachment, right-click the attachment and "
+"click Properties, then select Automatic Display of Attachments."
 msgstr ""
-"También puede soltar un archivo en la ventana del editor. Si quiere enviarlo "
-"como un adjunto en línea, pulse con el botón derecho del ratón sobre el "
-"adjunto y puse Propiedades, después seleccione Mostrado automático de los "
-"adjuntos."
+"También puede arrastrar un archivo en la barra de adjuntos de la ventana del "
+"editor. Si quiere enviarlo como un adjunto en línea, pulse con el botón "
+"derecho del ratón sobre el adjunto y puse Propiedades, después seleccione "
+"Mostrado automático de los adjuntos."
 
-#: C/evolution.xml:1516(para)
+#: C/evolution.xml:1527(para)
 msgid ""
 "When you send the message, a copy of the attached file goes with it. Be "
 "aware that large attachments can take a long time to send and receive."
@@ -4063,21 +4068,22 @@ msgstr ""
 "presente que los adjuntos de gran tamaño pueden tomar mucho tiempo al ser "
 "enviados y recibidos."
 
-#: C/evolution.xml:1519(title)
+#: C/evolution.xml:1530(title)
 msgid "Attachment Reminder:"
 msgstr "Recuerdo de adjuntos:"
 
-#: C/evolution.xml:1520(para)
+#: C/evolution.xml:1531(para)
+#, fuzzy
 msgid ""
 "Evolution has an Attachment Reminder plugin you can use to remind yourself "
-"to attach a file to an e-mail. If it determines that you have not attached "
+"to attach a file to an email. If it determines that you have not attached "
 "the file, it displays the following message:"
 msgstr ""
 "Evolution tiene un complemento de Recuerdo de adjuntos que puede usar para "
 "recordarle que adjunte un archivo en un correo-e. Si determina que el "
 "archivo no está adjuntado, muestra el siguiente mensaje:"
 
-#: C/evolution.xml:1524(para)
+#: C/evolution.xml:1535(para)
 msgid ""
 "Click Continue Editing to attach the missing file, or click Send to send the "
 "message without any attachment."
@@ -4085,15 +4091,15 @@ msgstr ""
 "Pulse Continuar editando para adjuntar el archivo que se le está recordando "
 "que falta o pulse Enviar para enviar el mensaje sin ningún adjunto."
 
-#: C/evolution.xml:1527(para)
+#: C/evolution.xml:1538(para)
 msgid "To enable the Attachment Reminder:"
 msgstr "Para activar el Recuerdo de adjuntos:"
 
-#: C/evolution.xml:1530(para)
+#: C/evolution.xml:1541(para)
 msgid "Select Edit &gt; Plugins &gt; Attachment Reminder."
 msgstr "Seleccione Editar &gt; Complementos &gt; Recuerdo de adjuntos."
 
-#: C/evolution.xml:1533(para)
+#: C/evolution.xml:1544(para)
 msgid ""
 "Click Configuration, then make sure that Remind Missing Attachments is "
 "selected."
@@ -4101,7 +4107,7 @@ msgstr ""
 "Pulse Configuración, después asegúrese de que Recordar los adjuntos "
 "faltantes está seleccionado."
 
-#: C/evolution.xml:1537(para)
+#: C/evolution.xml:1548(para)
 msgid ""
 "Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> "
 "and click Add."
@@ -4109,7 +4115,7 @@ msgstr ""
 "Seleccione las palabras clave tales como <quote>Adjuntar</quote> o "
 "<quote>Adjunto</quote> y pulse Añadir."
 
-#: C/evolution.xml:1538(para)
+#: C/evolution.xml:1549(para)
 msgid ""
 "Based on the keywords you have added here, it searches every mail you are "
 "sending. If it finds the keywords such as <quote>attach</quote> in your mail "
@@ -4121,7 +4127,7 @@ msgstr ""
 "tales como <quote>adjuntar</quote> y no hay un archivo adjunto, se le "
 "recuerda que faltan adjuntos."
 
-#: C/evolution.xml:1541(para)
+#: C/evolution.xml:1552(para)
 msgid ""
 "To edit any of the existing keywords, select the keyword, click Edit, then "
 "modify the word as desired."
@@ -4129,21 +4135,14 @@ msgstr ""
 "Para editar cualquiera de las palabras clave existentes, seleccione la "
 "palabra clave y pulse Editar, después modifique la palabra como desee."
 
-#: C/evolution.xml:1544(para)
+#: C/evolution.xml:1561(para)
+#, fuzzy
 msgid ""
-"When you have finished making your selections, click Close to exit the "
-"Plugin Manager."
-msgstr ""
-"Cuando haya terminado de marcar su selección, pulse Cerrar para salir del "
-"Gestor de complementos."
-
-#: C/evolution.xml:1550(para)
-msgid ""
-"<trademark>Evolution</trademark>, like most e-mail programs, recognizes "
-"three types of addressee: primary recipients, secondary recipients, and "
-"hidden (blind) recipients. The simplest way to direct a message is to put "
-"the e-mail address or addresses in the To: field, which denotes primary "
-"recipients. Use the Cc: field to send a message to secondary recipients."
+"<trademark>Evolution</trademark>, like most email programs, recognizes three "
+"types of addresses: primary recipients, secondary recipients, and hidden "
+"(blind) recipients. The simplest way to direct a message is to put the email "
+"address or addresses in the To: field, which denotes primary recipients. Use "
+"the Cc: field to send a message to secondary recipients."
 msgstr ""
 "<trademark>Evolution</trademark>, como la mayoría de programas de correo "
 "electrónico, reconoce tres tipos de direcciones: destinatarios primarios, "
@@ -4152,7 +4151,7 @@ msgstr ""
 "electrónico en el campo Para:, que denota los destinatarios primarios. Use "
 "el campo Cc: para enviar un mensaje de correo a destinatarios secundarios."
 
-#: C/evolution.xml:1551(para)
+#: C/evolution.xml:1562(para)
 msgid ""
 "Addresses on the Bcc: list are hidden from the other recipients of the "
 "message. You can use it to send mail to large groups of people, especially "
@@ -4164,9 +4163,10 @@ msgstr ""
 "especialmente si no se conocen entre sí o si es importante mantener la "
 "privacidad. Si el campo Cco: no está a la vista pulse Ver &gt; Campo Cco."
 
-#: C/evolution.xml:1552(para)
+#: C/evolution.xml:1563(para)
+#, fuzzy
 msgid ""
-"If you frequently write e-mail to the same groups of people, you can create "
+"If you frequently write email to the same groups of people, you can create "
 "address lists in the contacts tool, and then send them mail as though they "
 "have a single address. To learn how to do that, see <link linkend=\"usage-"
 "contact-organize-group-list\">Creating a List of Contacts</link>."
@@ -4177,24 +4177,25 @@ msgstr ""
 "cómo hacerlo consulte <link linkend=\"usage-contact-organize-group-list"
 "\">Crear una lista de contactos</link>."
 
-#: C/evolution.xml:1553(para)
+#: C/evolution.xml:1564(para)
+#, fuzzy
 msgid ""
-"Evolution has the ability to let you specify the Reply-To in an e-mail. "
-"Using this, you can set up a special Reply-To for an e-mail.To do this:"
+"Evolution has the ability to let you specify the Reply-To in an email. Using "
+"this, you can set up a special Reply-To for an email. To do this:"
 msgstr ""
 "Evolution tiene la capacidad de permitirle especificar el campo «Responder "
 "a:» en un correo-e. Usando esto, puede establecer un «Responder a:» especial "
 "para un correo-e. Para hacer esto:"
 
-#: C/evolution.xml:1556(para)
+#: C/evolution.xml:1567(para)
 msgid "Open a compose window."
 msgstr "Abra una ventana del editor."
 
-#: C/evolution.xml:1559(para)
+#: C/evolution.xml:1570(para)
 msgid "Open the Reply-To field by clicking View &gt; Reply To."
 msgstr "Abra el campo Responder a pulsando en Ver &gt; Responder a."
 
-#: C/evolution.xml:1562(para)
+#: C/evolution.xml:1573(para)
 msgid ""
 "Specify the address you want as the Reply-To address in the new Reply-To "
 "field."
@@ -4202,18 +4203,20 @@ msgstr ""
 "Especifique la dirección a la que quiere que le respondan en el nuevo campo "
 "«Responder a»."
 
-#: C/evolution.xml:1565(para)
+#: C/evolution.xml:1576(para)
 msgid "Complete the rest of your message."
 msgstr "Complete el resto de su mensaje."
 
-#: C/evolution.xml:1568(para)
+#: C/evolution.xml:1579(para) C/evolution.xml:1947(para)
+#: C/evolution.xml:2161(para) C/evolution.xml:5206(para)
 msgid "Click Send."
 msgstr "Pulse Enviar."
 
-#: C/evolution.xml:1575(para)
+#: C/evolution.xml:1586(para)
+#, fuzzy
 msgid ""
 "Address auto completion is by default enabled in Evolution when you create "
-"contacts.Evolution makes it easy for you to quickly fill in the address "
+"contacts. Evolution makes it easy for you to quickly fill in the address "
 "field without having to remember the email address of recipients. You can "
 "type nicknames or other portions of address data in the address field and "
 "Evolution will display a drop-down list of possible address completions from "
@@ -4230,20 +4233,22 @@ msgstr ""
 "tarjeta, Evolution abrirá una caja de diálogo para preguntarle a qué persona "
 "se refiere."
 
-#: C/evolution.xml:1576(para)
+#: C/evolution.xml:1587(para)
 msgid ""
 "If Evolution does not complete addresses automatically, click Edit &gt; "
-"Preferences, then click Autocompletion. There, select the groups of contacts "
-"you want to use for address autocompletion in the mailer."
+"Preferences, then click Autocompletion. There, select the address book you "
+"want to use for address autocompletion in the mailer."
 msgstr ""
 "Si Evolution no completa automáticamente las direcciones, pulse Editar &gt; "
-"Preferencias, después pulse Autocompletado. Allí seleccione los grupos de "
-"contactos que quiere usar para el autocompletado de direcciones en el correo."
+"Preferencias, después pulse Autocompletado. Allí seleccione la libreta de "
+"direcciones quequiere usar para el autocompletado de direcciones en el "
+"correo."
 
-#: C/evolution.xml:1577(para)
+#: C/evolution.xml:1588(para)
+#, fuzzy
 msgid ""
 "Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of "
-"the e-mail addresses in your contacts. Select addresses and click the arrows "
+"the email addresses in your contacts. Select addresses and click the arrows "
 "to move them into the appropriate address columns."
 msgstr ""
 "Alternativamente, puede pulsar los botones Para:, Cc:, Cco:, para obtener "
@@ -4251,9 +4256,10 @@ msgstr ""
 "Seleccione las direcciones y pulse las flechas para moverlas entre las "
 "columnas de direcciones apropiadas."
 
-#: C/evolution.xml:1578(para)
+#: C/evolution.xml:1589(para)
+#, fuzzy
 msgid ""
-"For more information about using e-mail with the contact manager and the "
+"For more information about using email with the contact manager and the "
 "calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: "
 "Adding New Cards Quickly</link> and <link linkend=\"usage-calendar-apts"
 "\">Scheduling With the Evolution Calendar</link>."
@@ -4264,16 +4270,17 @@ msgstr ""
 "link> y <link linkend=\"usage-calendar-apts\">Planificación con el "
 "calendario de Evolution</link>."
 
-#: C/evolution.xml:1583(para)
+#: C/evolution.xml:1594(para)
+#, fuzzy
 msgid ""
-"To reply to a message, click the message to reply to in the e-mail list and "
-"click Reply, or right-click within the message and select Reply to Sender. "
-"This opens the message composer. The To: and Subject: fields are already "
-"filled, although you can alter them if you prefer. In addition, the full "
-"text of the old message is inserted into the new message, either in grey "
-"with a blue line on one side (for HTML display) or with the &gt; character "
-"before each line (in plain text mode), to indicate that it is part of the "
-"previous message."
+"To reply to a message, click the message to reply to in the message list and "
+"click the Reply button in the toolbar, or right-click within the message and "
+"select Reply to Sender. This opens the message composer. The To: and "
+"Subject: fields are already filled, although you can alter them if you "
+"prefer. In addition, the full text of the old message is inserted into the "
+"new message, either in grey with a blue line on one side (for HTML display) "
+"or with the &gt; character before each line (in plain text mode), to "
+"indicate that it is part of the previous message."
 msgstr ""
 "Para responder a un mensaje, pulse en el mensaje para responder en la lista "
 "y pulse Responder, o pulse con el botón derecho en el mensaje y seleccione "
@@ -4282,9 +4289,9 @@ msgstr ""
 "se insertará el texto completo del mensaje antiguo en el nuevo mensaje, en "
 "gris o bien con una línea azul a un lado (sólo para correos en HTML) o con "
 "el carácter &gt; antes de cada línea (para el modo texto plano), para "
-"indicar qué parte corresponde al mensaje anterior."
+"indicar que es parte del mensaje anterior."
 
-#: C/evolution.xml:1584(para)
+#: C/evolution.xml:1595(para)
 msgid ""
 "If you're reading a message with several recipients, you can use Reply to "
 "All instead of Reply. If there are large numbers of people in the Cc: or To: "
@@ -4294,13 +4301,14 @@ msgstr ""
 "Responder a todos en lugar de Responder. Si hay un gran número de personas "
 "en los campos Para: o Cc: esto puede ahorrar mucho tiempo."
 
-#: C/evolution.xml:1587(title)
+#: C/evolution.xml:1598(title)
 msgid "Using the Reply To All Feature"
 msgstr "Uso de la característica de Responder a todos"
 
-#: C/evolution.xml:1588(para)
+#: C/evolution.xml:1599(para)
+#, fuzzy
 msgid ""
-"Susan sends an e-mail to a client and sends copies to Tim and to an internal "
+"Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
 "of them to read, he uses Reply to All, but if he just wants to tell Susan "
 "that he agrees with her, he uses Reply. His reply does not reach anyone that "
@@ -4314,7 +4322,7 @@ msgstr ""
 "respuesta no la recibirá nadie a quien Susana haya incluido en la lista de "
 "Cco: de su mensaje original porque tal lista no ha sido compartida con nadie."
 
-#: C/evolution.xml:1589(para)
+#: C/evolution.xml:1600(para)
 msgid ""
 "If you subscribe to a mailing list, and want your reply to go just to the "
 "list, rather than to the sender, select Reply to List instead of Reply or "
@@ -4324,71 +4332,71 @@ msgstr ""
 "la misma en lugar de al remitente pulse en Responder la lista en lugar de "
 "Responder o de Responder a todos."
 
-#: C/evolution.xml:1593(title)
+#: C/evolution.xml:1604(title)
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: C/evolution.xml:1601(para)
+#: C/evolution.xml:1612(para)
 msgid "Tools"
 msgstr "Herramientas"
 
-#: C/evolution.xml:1604(para)
+#: C/evolution.xml:1615(para)
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: C/evolution.xml:1611(para)
+#: C/evolution.xml:1622(para)
 msgid "Reply to sender"
 msgstr "Responder al remitente"
 
-#: C/evolution.xml:1614(para)
+#: C/evolution.xml:1625(para)
 msgid "Ctrl+R"
 msgstr "Ctrl+R"
 
-#: C/evolution.xml:1619(para)
+#: C/evolution.xml:1630(para)
 msgid "Reply to List"
 msgstr "Responder a la lista"
 
-#: C/evolution.xml:1622(para)
+#: C/evolution.xml:1633(para)
 msgid "Clrl+L"
 msgstr "Clrl+L"
 
-#: C/evolution.xml:1627(para)
+#: C/evolution.xml:1638(para)
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: C/evolution.xml:1630(para)
+#: C/evolution.xml:1641(para)
 msgid "Shift+Ctrl+R"
 msgstr "Shift+Ctrl+R"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1635(para)
+#: C/evolution.xml:1646(para)
 msgid "Forward"
 msgstr "Reenviar"
 
-#: C/evolution.xml:1638(para)
+#: C/evolution.xml:1649(para)
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
-#: C/evolution.xml:1649(para)
+#: C/evolution.xml:1660(para)
 msgid "The message composer makes several text searching features available to you."
 msgstr ""
 "El editor de mensajes le proporciona varias características de búsqueda de "
 "texto."
 
-#: C/evolution.xml:1651(title)
+#: C/evolution.xml:1662(title)
 msgid "Find:"
 msgstr "Buscar:"
 
-#: C/evolution.xml:1652(para)
+#: C/evolution.xml:1663(para)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr "Escriba una palabra o frase y Evolution la encontrará en el mensaje."
 
-#: C/evolution.xml:1655(title)
+#: C/evolution.xml:1666(title)
 msgid "Find Regex:"
 msgstr "Buscar expresión regular:"
 
-#: C/evolution.xml:1656(para)
+#: C/evolution.xml:1667(para)
 msgid ""
 "You can search for a complex pattern of characters, called a <link linkend="
 "\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
@@ -4400,23 +4408,23 @@ msgstr ""
 "ventana de su editor. Si no está seguro de lo que es una expresión regular, "
 "debería ignorar esta característica."
 
-#: C/evolution.xml:1659(title)
+#: C/evolution.xml:1670(title)
 msgid "Find Again:"
 msgstr "Buscar de nuevo:"
 
-#: C/evolution.xml:1660(para)
+#: C/evolution.xml:1671(para)
 msgid "Select this item to repeat the last search you performed."
 msgstr "Seleccione este elemento para repetir la última búsqueda que haya realizado."
 
-#: C/evolution.xml:1663(title)
+#: C/evolution.xml:1674(title)
 msgid "Replace:"
 msgstr "Reemplazar:"
 
-#: C/evolution.xml:1664(para)
+#: C/evolution.xml:1675(para)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr "Buscar una palabra o una frase y sustituirla por otra cosa."
 
-#: C/evolution.xml:1666(para)
+#: C/evolution.xml:1677(para)
 msgid ""
 "For all of these menu items, you can choose whether to search backwards in "
 "the document from the point where your cursor is. You can also determine "
@@ -4426,10 +4434,11 @@ msgstr ""
 "punto el que se encuentra el cursor. También puede determinar si quiere que "
 "la búsqueda sea sensible a mayúsculas o no."
 
-#: C/evolution.xml:1671(para)
+#: C/evolution.xml:1682(para)
+#, fuzzy
 msgid ""
-"Normally, you can't set text styles or insert pictures in e-mail. However, "
-"most newer e-mail programs can display images and text styles in addition to "
+"Normally, you can't set text styles or insert pictures in email. However, "
+"most newer email programs can display images and text styles in addition to "
 "basic alignment and paragraph formatting. They do this with <link linkend="
 "\"html\">HTML</link>, just like Web pages do."
 msgstr ""
@@ -4439,7 +4448,7 @@ msgstr ""
 "básico y formateo de párrafos. Esto es posible al usar <glossterm linkend="
 "\"html\">HTML</glossterm> al igual que las páginas web."
 
-#: C/evolution.xml:1672(para)
+#: C/evolution.xml:1683(para)
 msgid ""
 "Some people do not have HTML-capable mail clients, or prefer not to receive "
 "HTML-enhanced mail because it is slower to download and display. Because of "
@@ -4450,19 +4459,20 @@ msgstr ""
 "descargar y de mostrar en pantalla. Por ello Evolution envía mensajes de "
 "texto plano a menos que le pida explícitamenteque los componga con HTML."
 
-#: C/evolution.xml:1675(title)
+#: C/evolution.xml:1686(title)
 msgid "Basic HTML Formatting"
 msgstr "Formateo básico de HTML"
 
-#: C/evolution.xml:1676(para)
+#: C/evolution.xml:1687(para)
+#, fuzzy
 msgid ""
-"You can change the format of an e-mail message from plain text to HTML by "
-"choosing Format HTML."
+"You can change the format of an email message from plain text to HTML by "
+"choosing Format &gt; HTML from the menu bar."
 msgstr ""
-"Puede cambiar el formato de un mensaje de correo de texto plano a HTML "
-"eligiendo Formato HTML."
+"Puede cambiar el formato de un mensaje de correo electrónico de texto plano "
+"a HTML eligiendo Formato &gt; HTML desde la barra de menú."
 
-#: C/evolution.xml:1677(para)
+#: C/evolution.xml:1688(para)
 msgid ""
 "To send all your mail as HTML by default, set your mail format preferences "
 "in the mail configuration dialog box. See <link linkend=\"config-prefs-mail-"
@@ -4473,7 +4483,7 @@ msgstr ""
 "de configuración del correo. Para obtener más información consulte la <xref "
 "linkend=\"config-prefs-mail-composer\"/>."
 
-#: C/evolution.xml:1678(para)
+#: C/evolution.xml:1689(para)
 msgid ""
 "HTML formatting tools are located in the toolbar just above the space where "
 "you actually compose the message. They also appear in the Insert and Format "
@@ -4483,7 +4493,7 @@ msgstr ""
 "justo encima del espacio en el que realmente compone su mensaje y también "
 "aparecen en los menús Insertar y Formato."
 
-#: C/evolution.xml:1679(para)
+#: C/evolution.xml:1690(para)
 msgid ""
 "The icons in the toolbar are explained in <link linkend=\"tooltip\">tool-"
 "tips</link>, which appear when you hold your mouse pointer over the buttons. "
@@ -4493,11 +4503,11 @@ msgstr ""
 "\"tooltip\">consejos</glossterm> que aparecen cuando mantiene el ratón sobre "
 "los botones. Estos se clasifican en cuatro categorías:"
 
-#: C/evolution.xml:1681(title)
+#: C/evolution.xml:1692(title)
 msgid "Headers and Lists:"
 msgstr "Cabeceras y listas:"
 
-#: C/evolution.xml:1682(para)
+#: C/evolution.xml:1693(para)
 msgid ""
 "At the left edge of the toolbar, you can choose Normal for a default text "
 "style or Header 1 through Header 6 for varying sizes of header from large "
@@ -4510,7 +4520,7 @@ msgstr ""
 "pequeño). Otros estilos disponibles para los más organizados son Preformato, "
 "la lista de puntos o los tres tipos de listas numeradas."
 
-#: C/evolution.xml:1684(para)
+#: C/evolution.xml:1695(para)
 msgid ""
 "For instance, instead of using asterisks to mark a bulleted list, you can "
 "use the Bulleted List style from the style drop-down list. Evolution uses "
@@ -4522,13 +4532,14 @@ msgstr ""
 "distintos estilos para las listas de topos y maneja varios niveles de "
 "sangría y de ajuste para las palabras."
 
-#: C/evolution.xml:1686(title)
+#: C/evolution.xml:1697(title)
 msgid "Text Styles:"
 msgstr "Estilos de texto:"
 
-#: C/evolution.xml:1687(para)
+#: C/evolution.xml:1698(para)
+#, fuzzy
 msgid ""
-"Use these buttons to determine the way your e-mail looks. If you have text "
+"Use these buttons to determine the way your email looks. If you have text "
 "selected, the style applies to the selected text. If you do not have text "
 "selected, the style applies to whatever you type next."
 msgstr ""
@@ -4536,15 +4547,15 @@ msgstr ""
 "seleccionado un texto, el estilo se aplicará sobre él. Si no, el estilo se "
 "aplicará a lo próximo que escriba."
 
-#: C/evolution.xml:1696(para)
+#: C/evolution.xml:1707(para)
 msgid "Button"
 msgstr "Botón"
 
-#: C/evolution.xml:1706(para)
+#: C/evolution.xml:1717(para)
 msgid "TT"
 msgstr "TT"
 
-#: C/evolution.xml:1709(para)
+#: C/evolution.xml:1720(para)
 msgid ""
 "Typewriter text, which is approximately the same as the Courier monospace "
 "font."
@@ -4552,43 +4563,43 @@ msgstr ""
 "Texto de máquina de escribir, es aproximadamente igual a la tipografía "
 "monoespaciadia Courier."
 
-#: C/evolution.xml:1714(para)
+#: C/evolution.xml:1725(para)
 msgid "Bold A"
 msgstr "A en negrita"
 
-#: C/evolution.xml:1717(para)
+#: C/evolution.xml:1728(para)
 msgid "Bolds the text."
 msgstr "Pone el texto en negrita."
 
-#: C/evolution.xml:1722(para)
+#: C/evolution.xml:1733(para)
 msgid "Italic A"
 msgstr "A en cursiva"
 
-#: C/evolution.xml:1725(para)
+#: C/evolution.xml:1736(para)
 msgid "Italicizes the text."
 msgstr "Pone el texto en cursiva."
 
-#: C/evolution.xml:1730(para)
+#: C/evolution.xml:1741(para)
 msgid "Underlined A"
 msgstr "A subrayada"
 
-#: C/evolution.xml:1733(para)
+#: C/evolution.xml:1744(para)
 msgid "Underlines the text."
 msgstr "Subraya el texto."
 
-#: C/evolution.xml:1738(para)
+#: C/evolution.xml:1749(para)
 msgid "Strike through A"
 msgstr "A tachada"
 
-#: C/evolution.xml:1741(para)
+#: C/evolution.xml:1752(para)
 msgid "Marks a line through the text."
 msgstr "Tacha el texto."
 
-#: C/evolution.xml:1748(title)
+#: C/evolution.xml:1759(title)
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: C/evolution.xml:1749(para)
+#: C/evolution.xml:1760(para)
 msgid ""
 "Located next to the text style buttons, the three paragraph icons should be "
 "familiar to users of most word processing software. The left most button "
@@ -4600,11 +4611,11 @@ msgstr ""
 "El que está más a la izquierda alinea el texto a la izquierda, el del "
 "centro, lo centra y el de la derecha lo alinea hacia el lado derecho."
 
-#: C/evolution.xml:1752(title)
+#: C/evolution.xml:1763(title)
 msgid "Indentation Rules:"
 msgstr "Reglas de sangrado:"
 
-#: C/evolution.xml:1753(para)
+#: C/evolution.xml:1764(para)
 msgid ""
 "The button with the arrow pointing left decreases a paragraph's indentation, "
 "and the right arrow increases its indentation."
@@ -4612,18 +4623,19 @@ msgstr ""
 "El botón con la flecha que apunta a la izquierda reducirá la sangría de un "
 "párrafo y el de la derecha la aumentará."
 
-#: C/evolution.xml:1756(title)
+#: C/evolution.xml:1767(title)
 msgid "Color Selection:"
 msgstr "Selección de color:"
 
-#: C/evolution.xml:1757(para)
+#: C/evolution.xml:1768(para)
+#, fuzzy
 msgid ""
 "At the far right is the color section tool, where a box displays the current "
 "text color. To choose a new color, click the arrow button to the right. If "
 "you have text selected, the color applies to the selected text. If you do "
 "not have text selected, the color applies to whatever you type next. You can "
 "select a background color or image by right-clicking the message background, "
-"then selecting Style Page."
+"then selecting Style &gt; Page Style."
 msgstr ""
 "En el extremo de la derecha está la herramienta de selección del color, "
 "donde una caja muestra el color actual del texto. Para elegir uno nuevo "
@@ -4633,25 +4645,26 @@ msgstr ""
 "fondo pulsando con el botón derecho del ratón sobre el fondo del mensaje, "
 "para después seleccionar Estilo de la página."
 
-#: C/evolution.xml:1762(title)
+#: C/evolution.xml:1773(title)
 msgid "Advanced HTML Formatting"
 msgstr "Formato HTML avanzado"
 
-#: C/evolution.xml:1763(para)
+#: C/evolution.xml:1774(para)
+#, fuzzy
 msgid ""
 "Under the Insert menu, there are several more items you can use to style "
-"your e-mail. To use these and other HTML formatting tools, make sure you "
-"have enabled HTML mode by using Format HTML."
+"your email. To use these and other HTML formatting tools, make sure you have "
+"enabled HTML mode by using Format &gt; HTML from the menu bar."
 msgstr ""
 "Bajo el menú Insertar, hay varios elementos más que puede usar para dar "
 "estilo a su correo-e. Para usar éstas y otras herramientas de formato HTML , "
 "asegúrese de que ha activado el modo HTML usando Formato HTML."
 
-#: C/evolution.xml:1766(title)
+#: C/evolution.xml:1777(title)
 msgid "Inserting a Link"
 msgstr "Insertar un enlace"
 
-#: C/evolution.xml:1767(para)
+#: C/evolution.xml:1778(para)
 msgid ""
 "Use the Insert a Link tool to put hyperlinks in your HTML messages. If you "
 "don't want special link text, you can just enter the address directly, and "
@@ -4661,97 +4674,98 @@ msgstr ""
 "HTML. Si no quiere escribir ningún texto en particular, sólo tiene que "
 "escribir la dirección directamente y Evolution la reconocerá como un enlace."
 
-#: C/evolution.xml:1770(para)
+#: C/evolution.xml:1781(para)
 msgid "Select the text you want to link from."
 msgstr "Seleccione el texto en el que quiere poner el enlace."
 
-#: C/evolution.xml:1773(para)
+#: C/evolution.xml:1784(para)
 msgid "Right-click in the text, then click Insert Link."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el texto, después elija Insertar "
 "enlace."
 
-#: C/evolution.xml:1776(para)
+#: C/evolution.xml:1787(para)
 msgid "Type the URL in the URL field."
 msgstr "Escriba el URL en el campo URL."
 
-#: C/evolution.xml:1785(title)
+#: C/evolution.xml:1796(title)
 msgid "Inserting an Image"
 msgstr "Insertar una imagen"
 
-#: C/evolution.xml:1788(para)
-msgid "Click Image."
-msgstr "Pulse Insertar imagen."
+#: C/evolution.xml:1799(para)
+msgid "Click Insert &gt; Image in the menubar."
+msgstr "Pulse Insertar &gt; Imagen en la barra del menú,"
 
-#: C/evolution.xml:1791(para)
+#: C/evolution.xml:1802(para)
 msgid "Browse to and select the image file."
 msgstr "Navegue y seleccione el archivo de la imagen."
 
-#: C/evolution.xml:1800(title)
+#: C/evolution.xml:1811(title)
 msgid "Inserting a Rule"
 msgstr "Insertar una regla"
 
-#: C/evolution.xml:1801(para)
+#: C/evolution.xml:1812(para)
 msgid "You can insert a horizontal line into the text to help divide two sections:"
 msgstr "Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
 
-#: C/evolution.xml:1804(para)
-msgid "Click Rule."
-msgstr "Pulse en Regla."
+#: C/evolution.xml:1815(para)
+msgid "Click Insert &gt; Rule in the menubar."
+msgstr "Pulse Insertar &gt; Regla en la barra de menú."
 
-#: C/evolution.xml:1807(para)
+#: C/evolution.xml:1818(para)
 msgid "Select the width, size, and alignment."
 msgstr "Seleccione la anchura, tamaño y el alineamiento."
 
-#: C/evolution.xml:1810(para)
+#: C/evolution.xml:1821(para)
 msgid "Select Shade if necessary."
 msgstr "Si es necesario, seleccione el sombreado."
 
-#: C/evolution.xml:1819(title)
+#: C/evolution.xml:1830(title)
 msgid "Inserting a Table"
 msgstr "Insertar una tabla"
 
-#: C/evolution.xml:1820(para)
+#: C/evolution.xml:1831(para)
 msgid "You can insert a table into the text:"
 msgstr "Para insertar una tabla en el texto:"
 
-#: C/evolution.xml:1823(para)
-msgid "Click Table."
-msgstr "Pulse sobre Insertar tabla."
+#: C/evolution.xml:1834(para)
+msgid "Click Insert &gt; Table in the menubar."
+msgstr "Pulse Insertar &gt; Tabla en la barra de menú."
 
-#: C/evolution.xml:1826(para)
+#: C/evolution.xml:1837(para)
 msgid "Select the number of rows and columns."
 msgstr "Seleccione el número de filas y columnas."
 
-#: C/evolution.xml:1829(para)
+#: C/evolution.xml:1840(para)
 msgid "Select the type of layout for the table."
 msgstr "Seleccione el tipo de disposición para la tabla."
 
-#: C/evolution.xml:1832(para)
+#: C/evolution.xml:1843(para)
 msgid "Select a background for the table."
 msgstr "Seleccione un fondo para la tabla."
 
-#: C/evolution.xml:1833(para)
+#: C/evolution.xml:1844(para)
 msgid ""
-"To insert a picture for the background, click Browse and select the desired "
-"image."
+"To insert a picture for the background, click the filechooser button and "
+"select the desired image."
 msgstr ""
-"Para introducir una imagen para el fondo de pantalla, pulse Examinar y "
-"seleccione la imagen que desee."
+"Para introducir una imagen para el fondo de pantalla, pulse el botón del "
+"selector de archivos y seleccione la imagen que desee."
 
-#: C/evolution.xml:1845(para)
-msgid "You can set the following options when sending mails in Evolution."
+#: C/evolution.xml:1856(para)
+msgid "You can set the following options when sending mail in Evolution."
 msgstr "Puede establecer las siguientes opciones cuando envía correos con Evolution."
 
-#: C/evolution.xml:1847(title)
+#: C/evolution.xml:1858(title)
 msgid "Read Receipts:"
 msgstr "Confirmación de lectura:"
 
-#: C/evolution.xml:1848(para)
+#: C/evolution.xml:1859(para)
+#, fuzzy
 msgid ""
 "Evolution allows you to request a receipt for your sent messages to indicate "
 "when your message is being viewed by the recipient. Receipts are useful when "
-"sending e-mail that is time-sensitive. To request a receipt, click Insert "
+"sending email that is time-sensitive. To request a receipt, click Insert "
 "&gt; Request Read Receipt in the composer window."
 msgstr ""
 "Evolution le permite enviar una petición de lectura para los mensajes "
@@ -4760,11 +4774,11 @@ msgstr ""
 "importante. Para enviar una petición de lectura, pulse Insertar &gt; "
 "Solicitar confirmación de lectura en la ventana del editor."
 
-#: C/evolution.xml:1851(title)
+#: C/evolution.xml:1862(title)
 msgid "Prioritize Message:"
 msgstr "Priorizar mensaje:"
 
-#: C/evolution.xml:1852(para)
+#: C/evolution.xml:1863(para)
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
 "relative importance.To prioritize a message, click Insert &gt; Prioritize "
@@ -4774,7 +4788,7 @@ msgstr ""
 "importancia relativa. Para priorizar un mensaje, pulse Insertar &gt; "
 "Priorizar mensaje en la ventana del editor."
 
-#: C/evolution.xml:1855(para)
+#: C/evolution.xml:1866(para)
 msgid ""
 "Evolution will ignore the message priority, because it assumes that the "
 "recipient should decide whether the message is important or not."
@@ -4783,11 +4797,11 @@ msgstr ""
 "debería decidir si el mensaje es importante o no."
 
 # index.docbook:29, index.docbook:30
-#: C/evolution.xml:1860(title)
+#: C/evolution.xml:1871(title)
 msgid "Default Settings"
 msgstr "Ajustes predeterminados"
 
-#: C/evolution.xml:1861(para)
+#: C/evolution.xml:1872(para)
 msgid ""
 "Evolution allows you to change the default settings. You can organize your "
 "draft folder and sent folder, set the addresses to which you want to sent "
@@ -4800,31 +4814,25 @@ msgstr ""
 "También puede cambiar los ajustes para los destinatarios de los mensajes "
 "desde la ventana Predeterminados."
 
-#: C/evolution.xml:1863(para)
+#: C/evolution.xml:1874(para)
 msgid "To change your default settings,"
 msgstr "Cambiar los ajustes predeterminados,"
 
-#: C/evolution.xml:1866(para)
-msgid "Select Edit &gt;Preferences to open Evolution Preferences window."
-msgstr ""
-"Seleccione Editar &gt; Preferencias para abrir la ventana de preferencias de "
-"Evolution."
-
-#: C/evolution.xml:1869(para)
-msgid "Select the mail account you want to change the default settings."
+#: C/evolution.xml:1880(para)
+msgid "Select the mail account whose default settings you want to change."
 msgstr ""
 "Seleccione la cuenta de correo de la que quiere cambiar los ajustes "
 "predeterminados."
 
-#: C/evolution.xml:1872(para)
+#: C/evolution.xml:1883(para)
 msgid "Click Edit to open Account Editor window."
 msgstr "Pulse Editar para abrir la ventana del editor de cuentas."
 
-#: C/evolution.xml:1875(para)
+#: C/evolution.xml:1886(para)
 msgid "Click Default tab."
 msgstr "Pulse sobre la solapa Predeterminados."
 
-#: C/evolution.xml:1878(para)
+#: C/evolution.xml:1889(para)
 msgid ""
 "Click the respective check boxes and enter the email addresses you want CC "
 "and BCC to."
@@ -4832,17 +4840,17 @@ msgstr ""
 "Pulse las respectivas casillas de verificación e introduzca la dirección de "
 "correo-e que quiere usar para los campos Cc y Cco."
 
-#: C/evolution.xml:1881(para)
+#: C/evolution.xml:1892(para)
 msgid "Select the desired option for send message receipts from the drop-down list."
 msgstr ""
 "Seleccione la opción que desea para la notificación de recepción de mensajes "
 "de la lista desplegable."
 
-#: C/evolution.xml:1886(title)
+#: C/evolution.xml:1897(title)
 msgid "Changing Default Folder for Sent and Draft Items"
 msgstr "Cambiar la carpeta predeterminada para el Correo enviado y los Borradores"
 
-#: C/evolution.xml:1887(para)
+#: C/evolution.xml:1898(para)
 msgid ""
 "By default, all the sent messages directly goes to Sent folder and those "
 "messages marked as drafts are saved in Draft folder. To change the default "
@@ -4853,39 +4861,40 @@ msgstr ""
 "la carpeta Borradores. Para cambiar el ajuste predeterminado para los "
 "borradores,"
 
-#: C/evolution.xml:1890(para)
+#: C/evolution.xml:1901(para)
 msgid "Click Drafts button to open Folder view."
 msgstr "Pulse el botón Borradores para abrir la vista de carpeta."
 
-#: C/evolution.xml:1893(para)
+#: C/evolution.xml:1904(para)
 msgid "Select the folder you want to save the drafts to."
 msgstr "Seleccione la carpeta en la que quiere guardar los borradores."
 
-#: C/evolution.xml:1899(para) C/evolution.xml:1915(para)
+#: C/evolution.xml:1910(para) C/evolution.xml:1926(para)
 msgid "Click Revert button to revert back to previous settings."
 msgstr "Pulse el botón Revertir para revertir al ajuste anterior."
 
-#: C/evolution.xml:1903(para)
+#: C/evolution.xml:1914(para)
 msgid "To change the default folder for sent items,"
 msgstr "Para cambiar la carpeta predeterminada para los elementos enviados,"
 
-#: C/evolution.xml:1906(para)
+#: C/evolution.xml:1917(para)
 msgid "Click Sent button to open the Folder view."
 msgstr "Pulse el botón Correo enviado para abrir la vista de carpeta."
 
-#: C/evolution.xml:1909(para)
+#: C/evolution.xml:1920(para)
 msgid "Select the desired folder for sent items."
 msgstr "Seleccione la carpeta que desea para los elementos enviados."
 
-#: C/evolution.xml:1923(para)
+#: C/evolution.xml:1934(para)
+#, fuzzy
 msgid ""
-"When you receive an e-mail, you can forward it to other individuals or "
-"groups that might be interested. You can forward a message as an attachment "
-"to a new message (this is the default) or you can send it <link linkend="
-"\"inline\">in line</link> as a quoted portion of the message you are "
-"sending. Attachment forwarding is best if you want to send the full, "
-"unaltered message to someone else. Inline forwarding is best if you want to "
-"send portions of a message, or if you have a large number of comments on "
+"When you receive an email, you can forward it to other individuals or groups "
+"that might be interested. You can forward a message as an attachment to a "
+"new message (this is the default) or you can send it <link linkend=\"inline"
+"\">in line</link> as a quoted portion of the message you are sending. "
+"Attachment forwarding is best if you want to send the full, unaltered "
+"message to someone else. Inline forwarding is best if you want to send "
+"portions of a message, or if you have a large number of comments on "
 "different sections of the message you are forwarding. Remember to note from "
 "whom the message came, and whether you have removed or altered content."
 msgstr ""
@@ -4900,15 +4909,15 @@ msgstr ""
 "al autor original del mensaje y diferenciar claramente las partes del texto "
 "que ha modificado, borrado o añadido."
 
-#: C/evolution.xml:1924(para)
+#: C/evolution.xml:1935(para)
 msgid "To forward a message you are reading:"
 msgstr "Reenviar un mensaje que está leyendo:"
 
-#: C/evolution.xml:1927(para)
+#: C/evolution.xml:1938(para)
 msgid "Click Forward on the toolbar."
 msgstr "Pulse Reenviar en la barra de herramientas."
 
-#: C/evolution.xml:1929(para)
+#: C/evolution.xml:1940(para)
 msgid ""
 "If you prefer to forward the message <link linkend=\"inline\">inline</link> "
 "instead of attached, click Message &gt; Forward As &gt; Inline from the menu."
@@ -4917,7 +4926,7 @@ msgstr ""
 "lugar de como adjunto, pulse en el menú Mensaje &gt; Reenviar como &gt; "
 "Incluido en línea."
 
-#: C/evolution.xml:1932(para)
+#: C/evolution.xml:1943(para)
 msgid ""
 "Select an addressee as you would when sending a new message; the subject is "
 "already entered, although you can alter it if you want."
@@ -4925,13 +4934,11 @@ msgstr ""
 "Seleccione una dirección como lo haría al enviar un mensaje nuevo, el asunto "
 "ya está introducido, aunque puede cambiarlo si lo desea."
 
-#: C/evolution.xml:1935(para)
-msgid "Add your comments on the message in the composition frame, then click Send."
-msgstr ""
-"Añada sus comentarios en el marco de edición del mensaje, después pulse "
-"Enviar."
+#: C/evolution.xml:1946(para)
+msgid "Add your comments on the message in the composition frame"
+msgstr "Añada sus comentarios en el mensaje dentro del marco de edición"
 
-#: C/evolution.xml:1938(para)
+#: C/evolution.xml:1950(para)
 msgid ""
 "Attachments to a message you are forwarding are forwarded only when you send "
 "the original message as an attachment. Inline messages do not forward any "
@@ -4941,7 +4948,7 @@ msgstr ""
 "el mensaje original como un adjunto. Los mensajes incluidos no reenvían "
 "ningún adjunto."
 
-#: C/evolution.xml:1945(para)
+#: C/evolution.xml:1957(para)
 msgid ""
 "Don't forward chain letters. If you must, watch out for hoaxes and urban "
 "legends, and make sure the message doesn't have multiple layers of greater-"
@@ -4952,7 +4959,7 @@ msgstr ""
 "varias capas de signos de mayor que (&gt;) que indican sucesivos reenvíos "
 "descuidados."
 
-#: C/evolution.xml:1948(para)
+#: C/evolution.xml:1960(para)
 msgid ""
 "Always begin and close with a salutation. Say <quote>please</quote> and "
 "<quote>thank you,</quote> just like you do in real life. You can keep your "
@@ -4962,7 +4969,7 @@ msgstr ""
 "<quote>gracias</quote> de la misma manera que haría en la vida real. Puede "
 "ser breve en sus cumplidos pero sea educado."
 
-#: C/evolution.xml:1951(para)
+#: C/evolution.xml:1963(para)
 msgid ""
 "WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole "
 "message in capital letters. It hurts people's ears."
@@ -4970,7 +4977,7 @@ msgstr ""
 "CUANDO ESCRIBE CON MAYÚSCULAS SIGNIFICA QUE ESTÁ GRITANDO No escriba "
 "mensajes enteros con mayúsculas porque a la gente le dolerán los oídos."
 
-#: C/evolution.xml:1954(para)
+#: C/evolution.xml:1966(para)
 msgid ""
 "Check your spelling and use complete sentences. By default, Evolution puts a "
 "red line beneath words it doesn't recognize, as you type them."
@@ -4979,11 +4986,11 @@ msgstr ""
 "preconfigurado para destacar las palabras que no reconozca con una línea "
 "roja bajo las palabras conforme las vaya escribiendo."
 
-#: C/evolution.xml:1957(para)
-msgid "Don't send nasty e-mails (flames). If you get one, don't write back."
+#: C/evolution.xml:1969(para)
+msgid "Don't send nasty emails (flames). If you get one, don't write back."
 msgstr "No envíe correos desagradables. Si recibe alguno, mejor no lo responda."
 
-#: C/evolution.xml:1960(para)
+#: C/evolution.xml:1972(para)
 msgid ""
 "When you reply or forward, include enough of the previous message to provide "
 "context."
@@ -4991,37 +4998,38 @@ msgstr ""
 "Cuando conteste o reenvíe un mensaje incluya lo justo del mensaje anterior "
 "para proporcionar el contexto necesario."
 
-#: C/evolution.xml:1963(para)
+#: C/evolution.xml:1975(para)
 msgid "Don't send spam."
 msgstr "No envíe spam."
 
-#: C/evolution.xml:1971(para)
+#: C/evolution.xml:1983(para)
+#, fuzzy
 msgid ""
 "If you create an event in the calendar component, you can then send "
-"invitations to the attendee list through the Evolution e-mail tool. The "
+"invitations to the attendee list through the Evolution email tool. The "
 "invitation card is sent as an attachment in iCal format."
 msgstr ""
 "Al crear un acontecimiento en la agenda puede enviar invitaciones por correo "
 "electrónico la lista de invitados. Las invitaciones se envían como archivos "
 "adjuntos en formato iCal."
 
-#: C/evolution.xml:1972(para)
+#: C/evolution.xml:1984(para)
 msgid ""
-"To send an invitation in GroupWise, right click on the calendar item and "
-"click Forward as iCalendar."
+"To send an invitation, right click on the calendar item and click Forward as "
+"iCalendar."
 msgstr ""
-"Para enviar invitaciones en GroupWise, pulse con el botón derecho sobre el "
-"elemento del calendario y pulse Enviar como iCalendar."
+"Para enviar una invitación pulse con el botón derecho sobre el elemento del "
+"calendario y pulse Reenviar como iCalendar."
 
-#: C/evolution.xml:1973(para)
+#: C/evolution.xml:1985(para)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Cuando reciba una invitación, tiene varias opciones:"
 
-#: C/evolution.xml:1975(title)
+#: C/evolution.xml:1987(title)
 msgid "Accept:"
 msgstr "Aceptar:"
 
-#: C/evolution.xml:1976(para)
+#: C/evolution.xml:1988(para)
 msgid ""
 "Indicates you will attend the meeting. When you click the OK button, the "
 "meeting is entered into your calendar."
@@ -5029,11 +5037,11 @@ msgstr ""
 "Indica que asistirá a la reunión. Cuando pulse el botón Aceptar, la reunión "
 "se apuntará en su agenda."
 
-#: C/evolution.xml:1979(title)
+#: C/evolution.xml:1991(title)
 msgid "Tentatively Accept:"
 msgstr "Aceptado provisionalmente:"
 
-#: C/evolution.xml:1980(para)
+#: C/evolution.xml:1992(para)
 msgid ""
 "Indicates you will probably attend the meeting. When you click the OK "
 "button, the meeting is entered into your calendar, but is marked as "
@@ -5042,31 +5050,32 @@ msgstr ""
 "Indica que es probable que asista a la reunión. Cuando pulse el botón "
 "Aceptar la reunión se apuntará en su agenda, pero marcada como provisional."
 
-#: C/evolution.xml:1983(title)
+#: C/evolution.xml:1995(title)
 msgid "Decline:"
 msgstr "Rehusar:"
 
-#: C/evolution.xml:1984(para)
+#: C/evolution.xml:1996(para)
+#, fuzzy
 msgid ""
 "Indicates you are unable to attend the meeting. The meeting is not entered "
 "into your calendar when you click OK, although your response is sent to the "
-"meeting host if you have selected the RSVP option."
+"meeting host if you have selected the Send reply to sender option."
 msgstr ""
 "Elija esta opción si no va a poder asistir a la reunión. Al pulsar Aceptar "
 "no se anotará en su agenda pero si ha marcado la casilla RSVP (confirmación "
 "de asistencia) su respuesta se enviará al organizador."
 
-#: C/evolution.xml:1987(title)
-msgid "RSVP:"
-msgstr "RSVP (confirmación de asistencia):"
+#: C/evolution.xml:1999(title)
+msgid "Send reply to sender:"
+msgstr "Responder al remitente:"
 
-#: C/evolution.xml:1988(para)
+#: C/evolution.xml:2000(para)
 msgid "Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 "Marque esta casilla si quiere que su respuesta llegue a los organizadores de "
 "la reunión."
 
-#: C/evolution.xml:1994(para)
+#: C/evolution.xml:2006(para)
 msgid ""
 "Because IMAP folders exist on the server, and opening them or checking them "
 "takes time, you need fine-grained control over the way that you use IMAP "
@@ -5082,11 +5091,11 @@ msgstr ""
 "si quiere escoger elementos específicos y excluir el resto, puede usar la "
 "herramienta de gestión de suscripciones."
 
-#: C/evolution.xml:1997(para)
+#: C/evolution.xml:2009(para)
 msgid "Select Folder &gt; Subscriptions."
 msgstr "Seleccione Carpeta &gt; Suscripciones."
 
-#: C/evolution.xml:2000(para)
+#: C/evolution.xml:2012(para)
 msgid ""
 "If you have accounts on multiple IMAP servers, select the server where you "
 "want to manage your subscriptions."
@@ -5094,15 +5103,15 @@ msgstr ""
 "Si tiene cuentas en varios servidores IMAP, seleccione el servidor donde "
 "quiere gestionar sus suscripciones."
 
-#: C/evolution.xml:2001(para)
+#: C/evolution.xml:2013(para)
 msgid "Evolution displays a list of available files and folders."
 msgstr "Evolution mostrará la lista de carpetas y archivos disponibles."
 
-#: C/evolution.xml:2004(para)
+#: C/evolution.xml:2016(para)
 msgid "Select a file or folder by clicking it."
 msgstr "Seleccione un archivo o carpeta pulsando sobre él."
 
-#: C/evolution.xml:2005(para)
+#: C/evolution.xml:2017(para)
 msgid ""
 "You should select at least the Inbox folder. Depending upon the way your "
 "IMAP server is configured, the list of available files might include non-"
@@ -5113,31 +5122,33 @@ msgstr ""
 "puede incluir carpetas que no son de correo, que puede ignorar sin mayor "
 "problema."
 
-#: C/evolution.xml:2008(para)
-msgid "Click Subscribe to add a folder to the subscribed list."
-msgstr "Pulse Suscribir para añadir el elemento a su lista de suscripción."
+#: C/evolution.xml:2020(para)
+msgid "Enable the corresponding checkbox to add a folder to the subscribed list."
+msgstr ""
+"Active la correspondiente casilla de verificación para añadir una carpeta a "
+"su lista de suscripción."
 
-#: C/evolution.xml:2011(para)
+#: C/evolution.xml:2023(para)
 msgid "When you have subscribed to the folders you want, close the window."
 msgstr "Cierre la ventana cuando se haya suscrito a las carpetas que desea."
 
-#: C/evolution.xml:2018(para)
+#: C/evolution.xml:2030(para)
 msgid ""
-"To protect and encode your e-mail transmissions, Evolution offers two "
+"To protect and encode your email transmissions, Evolution offers two "
 "encryption methods:"
 msgstr ""
 "Para proteger y codificar sus transmisiones de correos-e, Evolution ofrece "
-"dos métodos de cifrad:"
+"dos métodos de cifrado:"
 
-#: C/evolution.xml:2021(para)
+#: C/evolution.xml:2033(para)
 msgid "GPG Encryption"
 msgstr "Cifrado GPG"
 
-#: C/evolution.xml:2024(para) C/evolution.xml:2181(title)
+#: C/evolution.xml:2036(para) C/evolution.xml:2194(title)
 msgid "S/MIME Encryption"
 msgstr "Cifrado S/MIME"
 
-#: C/evolution.xml:2027(para)
+#: C/evolution.xml:2039(para)
 msgid ""
 "Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), "
 "an implementation of strong <link linkend=\"public-key-encryption\">Public "
@@ -5147,39 +5158,38 @@ msgstr ""
 "Guard (GPG), una implementación del potente algoritmo de <link linkend="
 "\"public-key-encryption\">cifrado de clave pública</link>."
 
-#: C/evolution.xml:2028(para)
-msgid ""
-"GPG uses two keys: public and private. You can give your public key to "
-"anyone you want to receive encrypted messages, or put it on a public key "
-"server so that people can look it up before contacting you. Your private key "
-"lets you decrypt any message encrypted with your public key. Never give your "
-"private key to anyone."
-msgstr ""
-"GPG usa dos claves: una pública y otra privada. Puede darle su clave pública "
-"a cualquiera del que quiera recibir mensajes cifrados o puede ponerla en un "
-"servidor de claves públicas para que cualquiera pueda mirar allí antes de "
-"escribirle. La clave privada es la que le permite descifrar cualquier "
-"mensaje cifrado con su clave pública. Nunca jamás le de a nadie su clave "
-"privada."
-
-#: C/evolution.xml:2029(para)
-msgid ""
-"When you send a message that is encrypted, you must encrypt it using your "
-"intended recipient's public key. To receive an encrypted message, you must "
-"make sure that the sender has your public key in advance. For signing "
-"messages, you encrypt the signature with your private key, so only your "
-"public key can unlock it. When you send the message, the recipient gets your "
-"public key and unlocks the signature, verifying your identity."
-msgstr ""
-"Para mandar un mensaje cifrado necesita usar la clave pública del "
-"destinatario a quien pretende enviarlo. Para poder recibir y leer un mensaje "
-"cifrado, debe asegurarse de que el remitente tiene su clave pública (la "
-"suya, de usted). Para firmar mensajes debe cifrar la firma del mensaje con "
-"su clave privada de manera que solamente su clave pública puede "
-"debloquearla. Cuando envía el mensaje, el destinatario obtiene su clave "
-"pública y desvela la firma, verificando su identidad."
-
-#: C/evolution.xml:2030(para)
+#: C/evolution.xml:2040(para)
+#, fuzzy
+msgid ""
+"In order to send and receive encrypted emails using GPG, it is necessary to "
+"use two kinds of encryption keys: public and private. Public keys are used "
+"to encrypt messages and private keys to decrypt them. To send encrypted "
+"email, you must have the recepient's public key, which is used to encrypt "
+"the message. The recipient then uses his/her private key to decrypt (and "
+"read) the encrypted message."
+msgstr ""
+"Para poder cifrar y descifrar correos usando GPG es necesario usar dos tipos "
+"de claves de cifrado: públicas y privadas. Las claves privadas se usan para "
+"cifrar mensajes y las claves públicas para cescifrarlos. Las claves privadas "
+"no se deben compartir con otros, mientras que las claves públicas se pueden "
+"compartir con aquellos a los que quiera enviar mensajes cifrados. También "
+"puede subirlas a un servidor de claves públicas."
+
+#: C/evolution.xml:2041(para)
+msgid ""
+"Those who wish to send you encrypted email must first have a copy of your "
+"public key on your keyring. To this end, public keys can be shared with "
+"those who want to send encrypted messages to you. In order to do this, you "
+"may place your public key on a public key server. Private keys should not be "
+"shared with others."
+msgstr ""
+"Aquellos que quieran enviarle un correo electrónico cifrado deben tener una copia de su "
+"clave pública en su depósito de claves. Para este fin, las claves públicas se pueden compartir "
+"con aquellos que quieran enviarle mensajes cifrados. Para ello, debe subir sus "
+"claves públicas a un servidor de claves públicas. Las claves privadas no se deben "
+"compartir con otros."
+
+#: C/evolution.xml:2042(para)
 msgid ""
 "Evolution does not support older versions of PGP, such as OpenPGP and Inline "
 "PGP."
@@ -5187,11 +5197,11 @@ msgstr ""
 "Evolution no soporta versiones antiguas de PGP, tales como OpenPGP y PGP "
 "inluido."
 
-#: C/evolution.xml:2031(para)
+#: C/evolution.xml:2043(para)
 msgid "You can use encryption in two different ways:"
 msgstr "El cifrado se puede usar de dos maneras diferentes:"
 
-#: C/evolution.xml:2034(para)
+#: C/evolution.xml:2046(para)
 msgid ""
 "You can encrypt the entire message, so that nobody but the recipient can "
 "read it."
@@ -5199,7 +5209,7 @@ msgstr ""
 "Puede cifrar el mensaje entero para que nadie, excepto el destinatario, "
 "pueda leerlo."
 
-#: C/evolution.xml:2037(para)
+#: C/evolution.xml:2049(para)
 msgid ""
 "You can attach an encrypted signature to a plain text message, so that the "
 "recipient can read the message without decrypting it, and needs decrypting "
@@ -5210,7 +5220,7 @@ msgstr ""
 "necesitaría descifrar la firma cuando quiera verificar la identidad del "
 "remitente."
 
-#: C/evolution.xml:2040(para)
+#: C/evolution.xml:2052(para)
 msgid ""
 "For example, suppose that Kevin wants to send an encrypted message to his "
 "friend Rachel. He looks up her public key on a general key server, and then "
@@ -5226,11 +5236,11 @@ msgstr ""
 "usa su clave privada para descifrarlo y el mensaje quedará listo para su "
 "lectura."
 
-#: C/evolution.xml:2043(title)
+#: C/evolution.xml:2055(title)
 msgid "Making a GPG Encryption Key"
 msgstr "Crear claves de cifrado GPG"
 
-#: C/evolution.xml:2044(para)
+#: C/evolution.xml:2056(para)
 msgid ""
 "Before you can get or send encrypted mail, you need to generate your public "
 "and private keys with GPG. This procedure covers version 1.2.4 of GPG. If "
@@ -5243,15 +5253,15 @@ msgstr ""
 "exacto. Puede averiguar la versión exacta usando la orden <command>gpg --"
 "version</command>."
 
-#: C/evolution.xml:2047(para)
+#: C/evolution.xml:2059(para)
 msgid "Open a terminal and enter <command>gpg --gen-key</command>."
 msgstr "Abra una terminal e instroduzca el comando <command>gpg --gen-key</command>."
 
-#: C/evolution.xml:2050(para)
+#: C/evolution.xml:2062(para)
 msgid "Select an algorithm, then press Enter."
 msgstr "Seleccione un algoritmo, después pulse Intro."
 
-#: C/evolution.xml:2052(para)
+#: C/evolution.xml:2064(para)
 msgid ""
 "To accept the default algorithm of DSA and ElGamal, press Enter "
 "(recommended)."
@@ -5259,7 +5269,7 @@ msgstr ""
 "Para aceptar el algoritmo predeterminado «DSA y ElGamal», pulse Intro "
 "(recomendado)."
 
-#: C/evolution.xml:2055(para)
+#: C/evolution.xml:2067(para)
 msgid ""
 "Select a key length, then press Enter. To accept the default, 1024 bits, "
 "press Enter."
@@ -5267,11 +5277,11 @@ msgstr ""
 "Seleccione una longitud de clave, después pulse Intro. Para aceptar la "
 "predeterminada, de 1024 bits, pulse Intro."
 
-#: C/evolution.xml:2058(para)
+#: C/evolution.xml:2070(para)
 msgid "Enter how long your key should be valid for."
 msgstr "Introduzca el timepo para la cual su clave deberá ser válida."
 
-#: C/evolution.xml:2060(para)
+#: C/evolution.xml:2072(para)
 msgid ""
 "To accept the default of no expiration, press Enter, then press Y when you "
 "are prompted to verify the selection."
@@ -5279,31 +5289,31 @@ msgstr ""
 "Para aceptar la opción predeterminada sin caducidad, pulse Intro, después "
 "puse Y cuando se le pregunte la verificación de su elección."
 
-#: C/evolution.xml:2063(para)
+#: C/evolution.xml:2075(para)
 msgid "Type your real name, then press Enter."
 msgstr "Escriba su nombre real, después pulse Intro."
 
-#: C/evolution.xml:2066(para)
-msgid "Type your e-mail address, then press Enter."
+#: C/evolution.xml:2078(para)
+msgid "Type your email address, then press Enter."
 msgstr "Escriba su dirección de correo-e, después pulse Intro."
 
-#: C/evolution.xml:2069(para)
+#: C/evolution.xml:2081(para)
 msgid "(Optional) Type a comment, then press Enter."
 msgstr "(Opcional) Escriba un comentario, después pulse Intro."
 
-#: C/evolution.xml:2072(para)
+#: C/evolution.xml:2084(para)
 msgid "Review your selected user ID. If it is correct, press O."
 msgstr "Compruebe el ID de usuario que ha seleccionado. Si es correcto pulse O."
 
-#: C/evolution.xml:2075(para)
+#: C/evolution.xml:2087(para)
 msgid "Type a passphrase, then press Enter."
 msgstr "Escriba una frase de paso, después pulse Intro."
 
-#: C/evolution.xml:2078(para)
+#: C/evolution.xml:2090(para)
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Mueva su ratón aleatoriamente para generar las claves."
 
-#: C/evolution.xml:2081(para)
+#: C/evolution.xml:2093(para)
 msgid ""
 "After the keys are generated, you can view your key information by entering "
 "<command>gpg --list-keys</command>. You should see something similar to "
@@ -5319,7 +5329,7 @@ msgstr ""
 "you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </"
 "computeroutput>"
 
-#: C/evolution.xml:2082(para)
+#: C/evolution.xml:2094(para)
 msgid ""
 "GPG creates one list, or keyring, for your public keys and one for your "
 "private keys. All the public keys you know are stored in the file ~/.gnupg/"
@@ -5330,11 +5340,11 @@ msgstr ""
 "están guardadas en el archivo ~/.gnupg/pubring.gpg. Si quiere darle a "
 "alguien su clave, envíele éste archivo."
 
-#: C/evolution.xml:2083(para)
+#: C/evolution.xml:2095(para)
 msgid "If you want, you can upload your keys to a key server."
 msgstr "Si lo desea puede subir sus claves a un servidor de claves."
 
-#: C/evolution.xml:2086(para)
+#: C/evolution.xml:2098(para)
 msgid ""
 "Check your public key ID with gpg--list-keys. It is the string after 1024D "
 "on the line beginning with pub. In the example above, it is 32j38dk2."
@@ -5343,7 +5353,7 @@ msgstr ""
 "identificador será la cadena que está detras de 1024D en la línea que "
 "empieza con «pub». En estte ejemplo es 32j38dk2."
 
-#: C/evolution.xml:2089(para)
+#: C/evolution.xml:2101(para)
 msgid ""
 "Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Substitute your key ID for "
@@ -5354,7 +5364,7 @@ msgstr ""
 "clave por <varname>32j38dk2</varname>. Necesitará su contraseña para poder "
 "hacerlo."
 
-#: C/evolution.xml:2092(para)
+#: C/evolution.xml:2104(para)
 msgid ""
 "Key servers store your public keys for you so that your friends can decrypt "
 "your messages. If you choose not to use a key server, you can manually send "
@@ -5369,7 +5379,7 @@ msgstr ""
 "publicarla de una vez y permitir a los demás descargarlas desde un servidor "
 "central cuando ellos quieran."
 
-#: C/evolution.xml:2093(para)
+#: C/evolution.xml:2105(para)
 msgid ""
 "If you don't have a key to unlock or encrypt a message, you can set your "
 "encryption tool to look it up automatically. If it can't find the key, an "
@@ -5379,11 +5389,11 @@ msgstr ""
 "herramienta de cifrado para buscarla automáticamente. Si no puede encontrar "
 "la clave se mostrará un mensaje de error."
 
-#: C/evolution.xml:2097(title)
+#: C/evolution.xml:2109(title)
 msgid "Getting and Using GPG Public Keys"
 msgstr "Obtener y usar claves GPG públicas"
 
-#: C/evolution.xml:2098(para)
+#: C/evolution.xml:2110(para)
 msgid ""
 "To send an encrypted message, you need to use the recipient's public key in "
 "combination with your private key. Evolution handles the encryption, but you "
@@ -5393,7 +5403,7 @@ msgstr ""
 "combinación con su clave privada. Evolution lo hace por usted, pero con todo "
 "necesitará obtener su clave y añadirla a su depósito de claves."
 
-#: C/evolution.xml:2099(para)
+#: C/evolution.xml:2111(para)
 msgid ""
 "To get public keys from a public key server, enter the command<command> gpg "
 "--recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, "
@@ -5406,7 +5416,7 @@ msgstr ""
 "por el identificador del destinatario. Necesitará escribir su contraseña y "
 "su identificador se añadirá automáticamente a su llavero."
 
-#: C/evolution.xml:2101(para)
+#: C/evolution.xml:2113(para)
 msgid ""
 "The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
 "to multiple hosts in various networks. The gpg utility tries to connect to "
@@ -5418,7 +5428,7 @@ msgstr ""
 "a una en la red actual y si ese servidor en particular está caído, falla al "
 "superarse el tiempo de expiración."
 
-#: C/evolution.xml:2104(para)
+#: C/evolution.xml:2116(para)
 msgid ""
 "To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal "
 "console and get the IP address of the hosts. You can ping each of them to "
@@ -5433,7 +5443,7 @@ msgstr ""
 "wwwkeys.pgp.net keyid con el número de dirección IP explícito que devolvió "
 "la utilidad del servidor."
 
-#: C/evolution.xml:2109(para)
+#: C/evolution.xml:2121(para)
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
 "enter the command <command>gpg <varname>--import</varname></command> to add "
@@ -5443,83 +5453,70 @@ msgstr ""
 "de texto plano e introduzca el comando <command>gpg <varname>--import</"
 "varname></command> para añadirá a su depósito de claves."
 
-#: C/evolution.xml:2113(title)
+#: C/evolution.xml:2125(title)
 msgid "Setting up GPG Encryption"
 msgstr "Configurar el cifrado GPG"
 
-#: C/evolution.xml:2116(para) C/evolution.xml:5630(para)
-#: C/evolution.xml:5646(para) C/evolution.xml:6061(para)
-msgid "Click Edit &gt; Preferences, then click Mail Accounts."
-msgstr "Pulse Editar &gt; Preferencias, después pulse Cuentas de correo."
-
-#: C/evolution.xml:2119(para)
+#: C/evolution.xml:2131(para) C/evolution.xml:2170(para)
 msgid "Select the account you want to use securely, then click Edit."
 msgstr "Seleccione la cuenta que quiere usar de forma segura, después pulse Editar."
 
-#: C/evolution.xml:2122(para) C/evolution.xml:2160(para)
+#: C/evolution.xml:2134(para) C/evolution.xml:2173(para)
 msgid "Click the Security tab."
 msgstr "Pulse en la solapa de Seguridad."
 
-#: C/evolution.xml:2125(para)
+#: C/evolution.xml:2137(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
 msgstr "Especifique el ID de su clave en el campo ID de la clave GPG/PGP."
 
-#: C/evolution.xml:2134(para)
+#: C/evolution.xml:2146(para)
 msgid ""
 "Evolution requires that you know your key ID. If you don't remember it, you "
-"can find it by typing <command>gpg --list-keys</command> in a console "
+"can find it by typing <command>gpg --list-keys</command> in a terminal "
 "window. Your key ID is an eight-character string with random numbers and "
 "letters."
 msgstr ""
 "Evolution necesita que usted sepa su identificador (ID) de clave. Si no lo "
-"recuerda puede encontrarlo con la orden <command>gpg --list-keys</command> "
-"en una consola. El identificador de clave es una cadena de 8 caracteres con "
+"recuerda puede encontrarlo con el comando <command>gpg --list-keys</command> "
+"en un terminal. El identificador de clave es una cadena de 8 caracteres con "
 "números y letras aleatorios."
 
-#: C/evolution.xml:2138(title)
+#: C/evolution.xml:2150(title)
 msgid "Encrypting Messages"
 msgstr "Cifrar mensajes"
 
-#: C/evolution.xml:2139(para)
+#: C/evolution.xml:2151(para)
 msgid "To encrypt a single message:"
 msgstr "Cifrar un sólo mensaje:"
 
-#: C/evolution.xml:2142(para)
+#: C/evolution.xml:2154(para)
 msgid "Open a Compose a Message window."
 msgstr "Abra una ventana del editor de mensajes."
 
-#: C/evolution.xml:2145(para)
+#: C/evolution.xml:2157(para)
 msgid "Click Security &gt; PGP Encrypt."
 msgstr "Pulse Seguridad &gt; Cifrado PGP."
 
-#: C/evolution.xml:2148(para)
-msgid "Compose your message, then click Send."
-msgstr "Edite su mensaje, después pulse Enviar."
+#: C/evolution.xml:2160(para)
+msgid "Compose your message."
+msgstr "Edite su mensaje."
 
-#: C/evolution.xml:2151(para)
-msgid "You can set Evolution to always sign your e-mail messages:"
+#: C/evolution.xml:2164(para)
+msgid "You can set Evolution to always sign your email messages:"
 msgstr ""
 "Puede configurar Evolution para que firme siempre sus mensajes de correo "
 "electrónico:"
 
-#: C/evolution.xml:2154(para)
-msgid "Click Edit &gt; Preferences, then select Mail Accounts."
-msgstr "Pulse Editar &gt; Preferencias, después seleccione Cuentas de correo."
-
-#: C/evolution.xml:2157(para)
-msgid "Select the mail account to encrypt, then click Edit."
-msgstr "Seleccione la cuenta de correo para cifrar, después pulse Editar."
-
 # index.docbook:172, index.docbook:216
-#: C/evolution.xml:2163(para)
+#: C/evolution.xml:2176(para)
 msgid "Select Always Sign Outgoing Messages When Using This Account."
 msgstr "Seleccione Firmar siempre los mensajes salientes cuando se use esta cuenta."
 
-#: C/evolution.xml:2175(title)
+#: C/evolution.xml:2188(title)
 msgid "Unencrypting a Received Message"
 msgstr "Descifrar un mensaje recibido"
 
-#: C/evolution.xml:2176(para)
+#: C/evolution.xml:2189(para)
 msgid ""
 "If you receive an encrypted message, you need to decrypt it before you read "
 "it. Remember, the sender must have your public key before they can send you "
@@ -5529,7 +5526,7 @@ msgstr ""
 "Recuerde que el remitente tiene que tener su clave pública (la suya, de "
 "usted) antes de enviarle un mensaje cifrado."
 
-#: C/evolution.xml:2177(para)
+#: C/evolution.xml:2190(para)
 msgid ""
 "When you view the message, Evolution prompts you for your PGP password. "
 "Enter it, and the unencrypted message is displayed."
@@ -5537,7 +5534,7 @@ msgstr ""
 "Cuando vea el mensaje, Evolution le pedirá que escriba su contraseña PGP. "
 "Escríbala y el mensaje se mostrará apropiadamente."
 
-#: C/evolution.xml:2182(para)
+#: C/evolution.xml:2195(para)
 msgid ""
 "S/MIME encryption also uses a key-based approach, but it has some "
 "significant advantages in convenience and security. S/MIME uses "
@@ -5559,7 +5556,7 @@ msgstr ""
 "certificado S/MIME, su sistema recibirá automáticamente la parte pública del "
 "certificado y descifrará o verificará el mensaje."
 
-#: C/evolution.xml:2183(para)
+#: C/evolution.xml:2196(para)
 msgid ""
 "S/MIME is used most often in corporate settings. In these cases, "
 "administrators supply certificates that they have purchased from a "
@@ -5575,13 +5572,13 @@ msgstr ""
 "VeriSign* o Thawte*.  En cualquier caso, el administrador del sistema le "
 "proporciona un archivo de certificado."
 
-#: C/evolution.xml:2184(para)
+#: C/evolution.xml:2197(para)
+#, fuzzy
 msgid ""
 "If you want to use S/MIME independently, you can extract an identification "
-"certificate from your Mozilla* or Netscape* Web browser. See the Mozilla "
-"help <ulink url=\"http://www.mozilla.org/projects/security/pki/psm/help_21/"
-"using_certs_help.html\">Mozilla Help</ulink>for more information on security "
-"certificates."
+"certificate from your Mozilla* or Netscape* Web browser. See the <ulink url="
+"\"http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help."
+"html\">Mozilla Help</ulink>for more information on security certificates."
 msgstr ""
 "Si quiere usar S/MIME independientemente, puede extraer un certificado de "
 "identificación de su navegador Mozilla* o Netscape*. Para obtener más "
@@ -5589,27 +5586,27 @@ msgstr ""
 "org/projects/security/pki/psm/help_21/using_certs_help.html\">ayuda de "
 "mozilla</ulink>."
 
-#: C/evolution.xml:2185(para)
+#: C/evolution.xml:2198(para)
 msgid "The certificate file is a password-protected file on your computer."
 msgstr "El archivo certificado es un archivo protegido por contraseña en su equipo."
 
-#: C/evolution.xml:2188(title)
+#: C/evolution.xml:2201(title)
 msgid "Adding a Signing Certificate"
 msgstr "Añadir un certificado firmado"
 
-#: C/evolution.xml:2191(para)
-msgid "Click Edit &gt; Preferences, then click Certificate."
-msgstr "Pulse Editar &gt; Preferencias, después pulse Certificar."
+#: C/evolution.xml:2207(para)
+msgid "Click Certificates."
+msgstr "Pulse Certificados."
 
-#: C/evolution.xml:2194(para) C/evolution.xml:2314(para)
+#: C/evolution.xml:2210(para) C/evolution.xml:2333(para)
 msgid "Click Import."
 msgstr "Pulse Importar."
 
-#: C/evolution.xml:2197(para)
+#: C/evolution.xml:2213(para)
 msgid "Select the file to import, then click Open."
 msgstr "Seleccione el archivo a importar, después pulse Abrir."
 
-#: C/evolution.xml:2203(para)
+#: C/evolution.xml:2219(para)
 msgid ""
 "Similarly, you can add certificates that are sent to you independently of "
 "any authority by clicking the Contact Certificates tab and using the same "
@@ -5622,11 +5619,11 @@ msgstr ""
 "nuevas autoridades de certificados, que tienen sus propios archivos de "
 "certificados, de la misma forma."
 
-#: C/evolution.xml:2207(title)
+#: C/evolution.xml:2223(title)
 msgid "Signing or Encrypting Every Message"
 msgstr "Firmar o cifrar cada mensaje"
 
-#: C/evolution.xml:2208(para)
+#: C/evolution.xml:2224(para)
 msgid ""
 "After you have added your certificate, you can sign or encrypt a message by "
 "clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
@@ -5635,23 +5632,19 @@ msgstr ""
 "mensaje pulsando Seguridad &gt; Firma S/MIME o Cifrado S/MIME en el editor "
 "de mensajes."
 
-#: C/evolution.xml:2209(para)
+#: C/evolution.xml:2225(para)
 msgid "To have every message signed or encrypted:"
 msgstr "Para enviar cada mensaje cifrado o firmado:"
 
-#: C/evolution.xml:2212(para)
-msgid ""
-"Click Edit &gt; Preferences, then select the account to encrypt the messages "
-"in."
-msgstr ""
-"Pulse Editar &gt; Preferencias, después seleccione la cuenta que en la que "
-"cifrar los mensajes."
+#: C/evolution.xml:2231(para)
+msgid "Select the account to encrypt the messages in."
+msgstr "Seleccione la cuenta en la que cifrar mensajes."
 
-#: C/evolution.xml:2215(para)
+#: C/evolution.xml:2234(para)
 msgid "Click Edit, then click Security."
 msgstr "Pulse Editar, después pulse en Seguridad."
 
-#: C/evolution.xml:2218(para)
+#: C/evolution.xml:2237(para)
 msgid ""
 "Click Select next to Signing Certificate and specify the path to your "
 "signing certificate."
@@ -5659,7 +5652,7 @@ msgstr ""
 "Pulse Seleccionar junto a Certificado de firma y especificar la ruta a su "
 "certificado de firma."
 
-#: C/evolution.xml:2220(para)
+#: C/evolution.xml:2239(para)
 msgid ""
 "Click Select next to Encryption Certificate and specify the path to your "
 "encryption certificate."
@@ -5667,13 +5660,14 @@ msgstr ""
 "Pulse seleccionar junto a Certificado de cifrado y especifique la ruta a su "
 "certificado de cifrado."
 
-#: C/evolution.xml:2223(para)
+#: C/evolution.xml:2242(para)
 msgid "Select the appropriate options."
 msgstr "Seleccione las opciones apropiadas."
 
-#: C/evolution.xml:2239(para)
+#: C/evolution.xml:2258(para)
+#, fuzzy
 msgid ""
-"Whether you only get a few e-mail messages a day, or you receive hundreds, "
+"Whether you only get a few email messages a day, or you receive hundreds, "
 "you probably want to sort and organize them. <trademark>Evolution</"
 "trademark> has the tools to help you do it."
 msgstr ""
@@ -5681,55 +5675,55 @@ msgstr ""
 "cientos, probablemente querrá organizarlos. <trademark>Evolution</trademark> "
 "tiene las herramientas para ayudarle a hacerlo."
 
-#: C/evolution.xml:2242(link) C/evolution.xml:2265(title)
-msgid "Importing Your Old E-Mail"
+#: C/evolution.xml:2261(link) C/evolution.xml:2284(title)
+msgid "Importing Your Old Email"
 msgstr "Importar su correo-e antiguo"
 
-#: C/evolution.xml:2245(link) C/evolution.xml:2354(title)
+#: C/evolution.xml:2264(link) C/evolution.xml:2374(title)
 msgid "Sorting the Message List"
 msgstr "Ordenación de la lista de mensajes"
 
-#: C/evolution.xml:2248(link) C/evolution.xml:2525(title)
+#: C/evolution.xml:2267(link) C/evolution.xml:2545(title)
 msgid "Getting Organized with Folders"
 msgstr "Organización básica de carpetas"
 
-#: C/evolution.xml:2251(link) C/evolution.xml:2540(title)
+#: C/evolution.xml:2270(link) C/evolution.xml:2560(title)
 msgid "Searching for Messages"
 msgstr "Búsqueda de mensajes"
 
-#: C/evolution.xml:2254(link) C/evolution.xml:2744(title)
+#: C/evolution.xml:2273(link) C/evolution.xml:2764(title)
 msgid "Create Rules to Automatically Organize Mail"
 msgstr "Creación de reglas para organizar automáticamente el correo"
 
-#: C/evolution.xml:2257(link) C/evolution.xml:2983(title)
+#: C/evolution.xml:2276(link) C/evolution.xml:3003(title)
 msgid "Using Search Folders"
 msgstr "Usar las carpetas de búsqueda"
 
-#: C/evolution.xml:2260(link) C/evolution.xml:3116(title)
+#: C/evolution.xml:2279(link) C/evolution.xml:3136(title)
 msgid "Stopping Junk Mail (Spam)"
 msgstr "Parar el correo basura (SPAM)"
 
-#: C/evolution.xml:2266(para)
+#: C/evolution.xml:2285(para)
 msgid ""
-"Evolution allows you to import old e-mail and contacts so that you don't "
-"need to worry about losing your old information."
+"Evolution allows you to import old email and contacts so that you don't need "
+"to worry about losing your old information."
 msgstr ""
 "Evolution le permite importar correo-e antiguo y sus contactos para que no "
 "tenga que preocuparse por la pérdida de información anterior."
 
-#: C/evolution.xml:2269(title)
+#: C/evolution.xml:2288(title)
 msgid "Importing Single Files"
 msgstr "Importar un sólo archivo"
 
-#: C/evolution.xml:2270(para)
+#: C/evolution.xml:2289(para)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution puede importar los siguientes tipos de archivos:"
 
-#: C/evolution.xml:2272(title)
+#: C/evolution.xml:2291(title)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd):"
 
-#: C/evolution.xml:2273(para)
+#: C/evolution.xml:2292(para)
 msgid ""
 "The address book format used by the GNOME, KDE, and many other contact "
 "management applications. You should be able to export to vCard format from "
@@ -5739,11 +5733,11 @@ msgstr ""
 "numerosas aplicaciones de administración de contactos. Será necesario poder "
 "exportar la libreta de direcciones de su otra aplicación al formato vCard."
 
-#: C/evolution.xml:2276(title)
-msgid "vCalender:"
-msgstr "vCalender:"
+#: C/evolution.xml:2295(title)
+msgid "vCalendar:"
+msgstr "vCalendar:"
 
-#: C/evolution.xml:2277(para)
+#: C/evolution.xml:2296(para)
 msgid ""
 "A format for storing calender files, which is generally used by Evolution, "
 "Microsoft Outlook, Sunbird, and Korganizer."
@@ -5751,11 +5745,11 @@ msgstr ""
 "Un formato para almacenar archivos de calendario. generalmente usado por "
 "Evolution, Microsoft Outlook, Sunbird y Korganizer."
 
-#: C/evolution.xml:2280(title)
+#: C/evolution.xml:2299(title)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar or iCal (.ics):"
 
-#: C/evolution.xml:2281(para)
+#: C/evolution.xml:2300(para)
 msgid ""
 "A format for storing calendar files. iCalendar is used by Palm OS handhelds, "
 "Evolution, and Microsoft Outlook."
@@ -5764,23 +5758,23 @@ msgstr ""
 "programa utilizado por equipos de mano PalmOS, así como Evolution y "
 "Microsoft Outlook."
 
-#: C/evolution.xml:2284(title)
+#: C/evolution.xml:2303(title)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
-#: C/evolution.xml:2285(para)
-msgid "CSV or Tab files saved using Evolution, Microsoft Outlook and Mozilla."
+#: C/evolution.xml:2304(para)
+msgid "CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
 msgstr ""
 "Los archivos CSV o Tab guardados al usar Evolution, Microsoft Outlook y "
 "Mozilla."
 
-#: C/evolution.xml:2288(title)
+#: C/evolution.xml:2307(title)
 msgid "Microsoft Outlook Express 4 (.mbx):"
 msgstr "Microsoft Outlook Express 4 (.mbx):"
 
-#: C/evolution.xml:2289(para)
+#: C/evolution.xml:2308(para)
 msgid ""
-"The e-mail file format used by Microsoft Outlook Express 4. For other "
+"The email file format used by Microsoft Outlook Express 4. For other "
 "versions of Microsoft Outlook and Outlook Express, see the workaround "
 "described in <link linkend=\"bsawgkk\">Step 1</link>."
 msgstr ""
@@ -5788,48 +5782,49 @@ msgstr ""
 "otras versiones de Microsoft Outlook y Outlook Express, vea la solución "
 "descrita en el <link linkend=\"bsawgkk\">Paso 1</link>."
 
-#: C/evolution.xml:2292(title)
+#: C/evolution.xml:2311(title)
 msgid "LDAP Data Interchange Format (.LDIF):"
 msgstr "Formato de intercambio de datos de LDAP (.LDIF):"
 
-#: C/evolution.xml:2293(para)
+#: C/evolution.xml:2312(para)
 msgid "A standard data format for contact cards."
 msgstr "Un formato de datos estándar para tarjetas de visita."
 
-#: C/evolution.xml:2296(title)
+#: C/evolution.xml:2315(title)
 msgid "Berkley Mailbox (.mbox or null extension):"
 msgstr "Berkley Mailbox (.mbox o extensión nula):"
 
-#: C/evolution.xml:2297(para)
+#: C/evolution.xml:2316(para)
 msgid ""
-"The e-mail format used by Mozilla, Netscape, Evolution, Eudora*, and many "
-"other e-mail clients."
+"The email format used by Mozilla, Netscape, Evolution, Eudora*, and many "
+"other email clients."
 msgstr ""
 "El formato de buzón de correo utilizado por los programas Mozilla, Netscape, "
 "Evolution, Eudora* y muchos otros clientes de correo electrónico."
 
-#: C/evolution.xml:2299(para)
-msgid "To import your old e-mail:"
+#: C/evolution.xml:2318(para)
+#, fuzzy
+msgid "To import your old email:"
 msgstr "Importar sus correos electrónicos antiguos:"
 
-#: C/evolution.xml:2302(para) C/evolution.xml:2324(para)
-#: C/evolution.xml:3428(para)
+#: C/evolution.xml:2321(para) C/evolution.xml:2343(para)
+#: C/evolution.xml:3446(para)
 msgid "Click File &gt; Import."
 msgstr "Pulse Archivo &gt; Importar."
 
-#: C/evolution.xml:2308(para)
+#: C/evolution.xml:2327(para)
 msgid "Select Import a Single File, then click Forward."
 msgstr "Seleccione Importar un único archivo, después pulse Siguiente."
 
-#: C/evolution.xml:2311(para)
+#: C/evolution.xml:2330(para)
 msgid "Select the file to import, then click Forward."
 msgstr "Seleccione el archivo para importar, después pulse Adelante."
 
-#: C/evolution.xml:2320(title)
+#: C/evolution.xml:2339(title)
 msgid "Importing Multiple Files"
 msgstr "Importar múltiples archivos"
 
-#: C/evolution.xml:2321(para)
+#: C/evolution.xml:2340(para)
 msgid ""
 "Evolution automates the import process for several applications it can "
 "recognize."
@@ -5837,13 +5832,13 @@ msgstr ""
 "Evolution automatiza el proceso de importación para distintas aplicaciones "
 "que puede reconocer."
 
-#: C/evolution.xml:2330(para)
+#: C/evolution.xml:2349(para)
 msgid "Select Import Data and Settings From Older Programs, then click Forward."
 msgstr ""
 "Seleccione Importar datos y configuración de programas antiguos, después "
 "pulse Adelante."
 
-#: C/evolution.xml:2331(para)
+#: C/evolution.xml:2350(para)
 msgid ""
 "Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link "
 "linkend=\"bsawf2t\">Step 5</link> to import."
@@ -5851,7 +5846,7 @@ msgstr ""
 "Siga los pasos <link linkend=\"bsawely\">Paso 3</link> hasta <link linkend="
 "\"bsawf2t\">Paso 5</link> para importar."
 
-#: C/evolution.xml:2332(para)
+#: C/evolution.xml:2351(para)
 msgid ""
 "Evolution searches for old mail programs and, if possible, imports the data "
 "from them."
@@ -5859,14 +5854,13 @@ msgstr ""
 "Evolution busca programas de correo antiguos y, si es posible, importa los "
 "datos de ellos."
 
-#: C/evolution.xml:2336(para)
+#: C/evolution.xml:2356(para)
+#, fuzzy
 msgid ""
-"Microsoft Outlook and versions of Outlook Express after version 4 use "
-"proprietary formats that Evolution cannot read or import. One migration "
-"method that works well is to use the Outport application. See <ulink url="
-"\"http://outport.sourceforge.net\">outport.sourceforge.net</ulink> for "
-"additional information. You can also import data into another Windows mail "
-"client such as Mozilla."
+"One migration method that works well is to use the Outport application. See "
+"<ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</"
+"ulink> for additional information. You can also import data into another "
+"Windows mail client such as Mozilla."
 msgstr ""
 "Microsoft Outlook y las versiones posteriores a Outlook Express 4 usan "
 "formatos propietarios que Evolution no puede leer o importar. Un método de "
@@ -5875,7 +5869,7 @@ msgstr ""
 "obtener información adicional. También puede importar datos en otro cliente "
 "de correo para Windows como Mozilla."
 
-#: C/evolution.xml:2339(para)
+#: C/evolution.xml:2359(para)
 msgid ""
 "While in Windows, import your .pst files into Mozilla Mail (or another mail "
 "program such as Netscape or Eudora that uses the standard mbox format)."
@@ -5884,28 +5878,17 @@ msgstr ""
 "otro cliente de correo que utilice el formato mbox estándar, como Netscape o "
 "Eudora)."
 
-#: C/evolution.xml:2340(para)
-msgid ""
-"Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders "
-"from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports "
-"and undeletes the messages in your Trash folders."
-msgstr ""
-"Los usuarios de Mozilla y Netscape deben pulsar Archivo &gt; Compactar &gt; "
-"Todas las carpetas desde la herramienta de correo de Netscape o Mozilla. De "
-"otra manera Evolution importa y recupera los mensajes en sus carpetas de "
-"papelera."
-
-#: C/evolution.xml:2343(para)
+#: C/evolution.xml:2363(para)
 msgid "Copy the files to the system or partition that Evolution is installed on."
 msgstr ""
 "Copie los archivos al sistema o a la partición en la que esté instalado "
 "Evolution."
 
-#: C/evolution.xml:2346(para)
+#: C/evolution.xml:2366(para)
 msgid "Use the Evolution import tool to import the files."
 msgstr "Use la herramienta de importar de Evolution para importar los archivos."
 
-#: C/evolution.xml:2349(para)
+#: C/evolution.xml:2369(para)
 msgid ""
 "For POP mail, filters are applied as messages are downloaded. For IMAP mail, "
 "filters are applied to new messages when you open the Inbox folder. On "
@@ -5922,9 +5905,10 @@ msgstr ""
 "todos los mensajes en la carpeta, seleccione la carpeta entera pulsaando Ctrl"
 "+A y después aplique los filtros pulsando Ctrl+Y."
 
-#: C/evolution.xml:2355(para)
+#: C/evolution.xml:2375(para)
+#, fuzzy
 msgid ""
-"Evolution helps you work by letting you sort your e-mail. To sort by sender, "
+"Evolution helps you work by letting you sort your email. To sort by sender, "
 "subject, or date, click the bars with those labels at the top of the message "
 "list. The direction of the arrow next to the label indicates the direction "
 "of the sort. Click again, to sort them in reverse order. For example, click "
@@ -5944,26 +5928,28 @@ msgstr ""
 "disponer de un conjunto de opciones de ordenación y añadir o quitar columnas "
 "de la lista de mensajes."
 
-#: C/evolution.xml:2356(para)
+#: C/evolution.xml:2376(para)
+#, fuzzy
 msgid ""
-"To look at the complete headers for a message, click View &gt; Message "
-"Display &gt; Show Full Headers. To see all message data, click View &gt; "
-"Message Display &gt; Show E-Mail Source."
+"To look at the complete headers for a message, click View &gt; All Message "
+"Headers. To see all message data, click View &gt; Message Source."
 msgstr ""
 "Para ver todas las cabeceras de un mensaje, pulse Ver &gt; Mostrar mensaje "
 "&gt; Mostrar cabeceras completas. Para ver todos los datos del mensaje, "
 "pulse Ver &gt; Mensaje en bruto."
 
-#: C/evolution.xml:2359(title)
-msgid "Sorting Mail In E-mail Threads"
+#: C/evolution.xml:2379(title)
+#, fuzzy
+msgid "Sorting Mail In Email Threads"
 msgstr "Ordenar los correos-e por conversaciones"
 
-#: C/evolution.xml:2360(para)
+#: C/evolution.xml:2380(para)
+#, fuzzy
 msgid ""
-"You can also choose a threaded message view. Click View &gt; Threaded "
-"Message List to turn the threaded view on or off. When you select this "
-"option, Evolution groups the replies to a message with the original, so you "
-"can follow the thread of a conversation from one message to the next."
+"You can also choose a threaded message view. Click View &gt; Group By "
+"Threads to turn the threaded view on or off. When you select this option, "
+"Evolution groups the replies to a message with the original, so you can "
+"follow the thread of a conversation from one message to the next."
 msgstr ""
 "Puede elegir una vista de mensajes por conversaciones. Elija Ver &gt; Lista "
 "de mensajes por conversaciones para activarla o desactivarla. Cuando elije "
@@ -5971,7 +5957,7 @@ msgstr ""
 "por lo que puede seguir el hilo de la conversación de un mensaje al "
 "siguiente."
 
-#: C/evolution.xml:2362(para)
+#: C/evolution.xml:2382(para)
 msgid ""
 "In a thread of conversation view, each new message is stacked below of the "
 "ones that arrived before it, so that the newest message is always the one "
@@ -5988,7 +5974,7 @@ msgstr ""
 "conversaciones se ordenan por la fecha del mensaje más reciente en las "
 "conversaciones."
 
-#: C/evolution.xml:2364(para)
+#: C/evolution.xml:2384(para)
 msgid ""
 "There is a gconf key to toggle between the collapsed or expanded state of "
 "mail thread. By default, it is collapsed and you can change this at /apps/"
@@ -6004,11 +5990,11 @@ msgstr ""
 "todas las conversaciones toman este estado. Es una opción muy avanzada sólo "
 "para usuarios avanzados."
 
-#: C/evolution.xml:2369(title)
+#: C/evolution.xml:2389(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "Uso de cabeceras para ordenar los mensajes"
 
-#: C/evolution.xml:2370(para)
+#: C/evolution.xml:2390(para)
 msgid ""
 "The message list normally has columns to indicate whether a message has been "
 "read, whether it has attachments, how important it is, and the sender, date, "
@@ -6020,15 +6006,16 @@ msgstr ""
 "asunto. Puede cambiar el orden de las columnas o añadir y quitar columnas "
 "arrastrando y soltándolas."
 
-#: C/evolution.xml:2374(title)
+#: C/evolution.xml:2394(title)
 msgid "Sorting Mail With Column Headers"
 msgstr "Uso de cabeceras para ordenar los mensajes"
 
-#: C/evolution.xml:2375(para)
+#: C/evolution.xml:2395(para)
+#, fuzzy
 msgid ""
 "In addition to it, Evolution enables you to sort your messages by using Sort-"
-"by list.You can use any of the criteria given in the Sort-by list such as "
-"<emphasis>sender, location, to, from, size, </emphasis>and so forth to "
+"by list. You can use any of the criteria given in the Sort-by list such as "
+"<emphasis>sender, location, to, from, size</emphasis> and so forth to "
 "perform sorting. It returns the sorted email list that matches the criteria "
 "you have selected."
 msgstr ""
@@ -6038,104 +6025,105 @@ msgstr ""
 "emphasis> para realizar la ordenación. Devuelve la lista de correo ordenada "
 "que coincide con los criterios que ha seleccionado."
 
-#: C/evolution.xml:2376(para)
+#: C/evolution.xml:2396(para)
 msgid "To sort messages, perform the following procedure:"
 msgstr "Para ordenar los mensajes, realice el siguiente procedimiento:"
 
-#: C/evolution.xml:2379(para)
+#: C/evolution.xml:2399(para)
 msgid "Right click message header bar."
 msgstr "Pulse con el botón derecho sobre las barra de cabeceras."
 
-#: C/evolution.xml:2382(para)
+#: C/evolution.xml:2402(para)
 msgid "Click Sort by to get a list of options."
 msgstr "Pulse Ordenar por para obtener una lista de opciones."
 
-#: C/evolution.xml:2384(title)
+#: C/evolution.xml:2404(title)
 msgid "Sort by:"
 msgstr "Ordenar por:"
 
-#: C/evolution.xml:2385(para)
+#: C/evolution.xml:2405(para)
 msgid "Sorts the message by different criteria as listed below:"
 msgstr "Ordena los mensajes por diferentes criterios tal y como se lista debajo:"
 
-#: C/evolution.xml:2389(para)
+#: C/evolution.xml:2409(para)
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: C/evolution.xml:2392(para) C/evolution.xml:2398(para)
+#: C/evolution.xml:2412(para) C/evolution.xml:2418(para)
 msgid "Sender"
 msgstr "Remitente"
 
-#: C/evolution.xml:2395(para)
+#: C/evolution.xml:2415(para)
 msgid "Location"
 msgstr "Lugar"
 
-#: C/evolution.xml:2401(para)
+#: C/evolution.xml:2421(para)
 msgid "Due By"
 msgstr "Vence en"
 
-#: C/evolution.xml:2404(para)
+#: C/evolution.xml:2424(para)
 msgid "Follow Up Flag"
 msgstr "Marca de seguimiento"
 
-#: C/evolution.xml:2407(para)
+#: C/evolution.xml:2427(para)
 msgid "Flag Status"
 msgstr "Marca de estado"
 
-#: C/evolution.xml:2410(para)
+#: C/evolution.xml:2430(para)
 msgid "Size"
 msgstr "Tamaño"
 
-#: C/evolution.xml:2413(para)
+#: C/evolution.xml:2433(para)
 msgid "To"
 msgstr "Para"
 
-#: C/evolution.xml:2416(para)
+#: C/evolution.xml:2436(para)
 msgid "Received"
 msgstr "Recibido"
 
-#: C/evolution.xml:2419(para)
+#: C/evolution.xml:2439(para)
 msgid "Date"
 msgstr "Fecha"
 
-#: C/evolution.xml:2422(para)
+#: C/evolution.xml:2442(para)
 msgid "Subject"
 msgstr "Asunto"
 
-#: C/evolution.xml:2425(para)
+#: C/evolution.xml:2445(para)
 msgid "From"
 msgstr "De"
 
-#: C/evolution.xml:2428(para)
+#: C/evolution.xml:2448(para)
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: C/evolution.xml:2431(para)
+#: C/evolution.xml:2451(para)
 msgid "Score"
 msgstr "Puntuación"
 
-#: C/evolution.xml:2434(para)
+#: C/evolution.xml:2454(para)
 msgid "Flagged"
 msgstr "Marcado"
 
-#: C/evolution.xml:2437(para) C/evolution.xml:3350(para)
-#: C/evolution.xml:4236(para) C/evolution.xml:4585(para)
-#: C/evolution.xml:4780(para)
+#: C/evolution.xml:2457(para) C/evolution.xml:3368(para)
+#: C/evolution.xml:4258(para) C/evolution.xml:4609(para)
+#: C/evolution.xml:4804(para)
 msgid "Status"
 msgstr "Estado"
 
-#: C/evolution.xml:2440(para)
+#: C/evolution.xml:2460(para)
 msgid "Custom"
 msgstr "Personalizado"
 
-#: C/evolution.xml:2444(para)
+#: C/evolution.xml:2464(para)
+#, fuzzy
 msgid ""
 "Clicking each sort criteria cycles take you through three possibilities. "
 "Sort by criteria in ascending or descending order or unsort the message. "
 "When you click any of the sort criteria reiteratively, Evolution sort the "
 "messages in a sequential order - ascending, descending and unsort. For "
 "example, when you click Recepients for the first time, Evolution sort the "
-"messages by recepients in ascending order and for the second time, sort in "
+"messages by recipients in ascending order and for the second time, sort in "
 "the reverse order. For the next click, messages will be displayed unsorted."
 msgstr ""
 "Pulsar por cada criterio de ordenación rota por tres posibilidades. Criterio "
@@ -6147,35 +6135,35 @@ msgstr ""
 "los ordenará descendentemente. La siguiente pulsación hará que se muestren "
 "sin orden."
 
-#: C/evolution.xml:2447(title)
+#: C/evolution.xml:2467(title)
 msgid "Sort Ascending:"
 msgstr "Orden ascendente:"
 
-#: C/evolution.xml:2448(para)
+#: C/evolution.xml:2468(para)
 msgid ""
-"Sorts the messages top to bottom and returns you the sorted e-mail list in "
+"Sorts the messages top to bottom and returns you the sorted message list in "
 "the order of oldest to the latest."
 msgstr ""
 "Ordena los mensajes de arriba a abajo y le devuelve la lista ordenada de "
 "correos electrónicos en el orden de más viejo a más nuevo."
 
-#: C/evolution.xml:2451(title)
+#: C/evolution.xml:2471(title)
 msgid "Sort Descending:"
 msgstr "Orden descendente:"
 
-#: C/evolution.xml:2452(para)
+#: C/evolution.xml:2472(para)
 msgid ""
-"Sort descending revers the order and returns you the sorted e-mail list in "
+"Sort descending revers the order and returns you the sorted message list in "
 "the order of newest to oldest."
 msgstr ""
 "Ordena los mensajes de forma descendente y le devuelve la lista ordenada de "
 "correos electrónicos en el orden de más nuevo a más viejo."
 
-#: C/evolution.xml:2455(title)
+#: C/evolution.xml:2475(title)
 msgid "Unsort:"
 msgstr "Desordenar:"
 
-#: C/evolution.xml:2456(para)
+#: C/evolution.xml:2476(para)
 msgid ""
 "Unsort removes sorting from this column, reverting to the order of messages "
 "as they were added to the folder."
@@ -6183,11 +6171,11 @@ msgstr ""
 "Desordenar elimina la ordenación para esta columna, revirtiendo el orden de "
 "los mensajes según fueron añadidos a la carpeta."
 
-#: C/evolution.xml:2459(title)
+#: C/evolution.xml:2479(title)
 msgid "Removing a Column:"
 msgstr "Eliminar una columna:"
 
-#: C/evolution.xml:2460(para)
+#: C/evolution.xml:2480(para)
 msgid ""
 "Remove this column from the display. You can also remove columns by dragging "
 "the header off the list and letting it drop."
@@ -6195,11 +6183,11 @@ msgstr ""
 "Retira la columna de la pantalla. Para retirar columnas, también puede "
 "arrastrar y soltar la cabecera fuera de la lista."
 
-#: C/evolution.xml:2463(title)
+#: C/evolution.xml:2483(title)
 msgid "Adding a Column:"
 msgstr "Añadir una columna:"
 
-#: C/evolution.xml:2464(para)
+#: C/evolution.xml:2484(para)
 msgid ""
 "When you select this item, a dialog box appears, listing the possible "
 "columns. Drag the column you want into a space between existing column "
@@ -6210,11 +6198,11 @@ msgstr ""
 "cabeceras existentes. Una flecha roja le indica el lugar donde quedará la "
 "columna."
 
-#: C/evolution.xml:2467(title)
+#: C/evolution.xml:2487(title)
 msgid "Best Fit:"
 msgstr "Ajuste automático:"
 
-#: C/evolution.xml:2468(para)
+#: C/evolution.xml:2488(para)
 msgid ""
 "Automatically adjusts the widths of the columns for the most efficient use "
 "of space."
@@ -6222,11 +6210,11 @@ msgstr ""
 "Ajusta automáticamente las anchuras de las columnas para un uso más "
 "eficiente del espacio."
 
-#: C/evolution.xml:2471(title)
+#: C/evolution.xml:2491(title)
 msgid "Customizing the Current View:"
 msgstr "Personalizar la vista actual:"
 
-#: C/evolution.xml:2472(para)
+#: C/evolution.xml:2492(para)
 msgid ""
 "Choose this item to pick a more complex sort order for messages, or to "
 "choose which columns of information about your messages you want to display."
@@ -6234,19 +6222,19 @@ msgstr ""
 "Elija este elemento para escoger un orden de los mensajes más complejo o "
 "para elegir qué columnas quiere ver con la información de sus mensajes."
 
-#: C/evolution.xml:2476(para)
-msgid "Select the search criteria."
-msgstr "Seleccione criterio de búsqueda."
+#: C/evolution.xml:2496(para)
+msgid "Select the search criteria from the list."
+msgstr "Seleccione el criterio de búsqueda de la lista."
 
-#: C/evolution.xml:2477(para)
+#: C/evolution.xml:2497(para)
 msgid "You can view the messages in the desired order in the message list."
 msgstr "Puede ver los mensajes en el orden deseado en la lista de mensajes."
 
-#: C/evolution.xml:2483(title)
+#: C/evolution.xml:2503(title)
 msgid "Using the Follow up Feature"
 msgstr "Usar la característica de Marca de seguimiento"
 
-#: C/evolution.xml:2484(para)
+#: C/evolution.xml:2504(para)
 msgid ""
 "To make sure you don't forget about a message, you can use the Follow up "
 "feature."
@@ -6254,45 +6242,45 @@ msgstr ""
 "Para asegurarse de que no se olvida de un mensaje, puede usar la "
 "característica Marca de seguimiento."
 
-#: C/evolution.xml:2487(para)
+#: C/evolution.xml:2507(para)
 msgid "Select one or more messages."
 msgstr "Seleccione uno o más mensajes."
 
-#: C/evolution.xml:2490(para)
+#: C/evolution.xml:2510(para)
 msgid "Right-click one of the messages."
 msgstr "Pulse con el botón derecho sobre uno de los mensajes."
 
-#: C/evolution.xml:2493(para)
+#: C/evolution.xml:2513(para)
 msgid "Click Mark for Follow Up."
 msgstr "Pulse Marca para seguimiento."
 
-#: C/evolution.xml:2496(para)
+#: C/evolution.xml:2516(para)
 msgid "You can also open the Flag to Follow Up window by"
 msgstr "También puede abrir la ventana de Marcar para seguimiento así"
 
-#: C/evolution.xml:2499(para)
+#: C/evolution.xml:2519(para)
 msgid "Select the messages."
 msgstr "Seleccione los mensajes."
 
-#: C/evolution.xml:2502(para)
+#: C/evolution.xml:2522(para)
 msgid "Select Message menu."
 msgstr "Seleccione Menú de mensaje."
 
-#: C/evolution.xml:2505(para)
+#: C/evolution.xml:2525(para)
 msgid "Click Mark as."
 msgstr "Pulse en Marcar como."
 
-#: C/evolution.xml:2508(para)
+#: C/evolution.xml:2528(para)
 msgid "Select Follow Up or press Shift+Ctrl+G."
 msgstr "Seleccione Marcar para seguimiento o pulse Mayús+Ctrl+G."
 
-#: C/evolution.xml:2509(para)
+#: C/evolution.xml:2529(para)
 msgid "A dialog box opens to allow you to set the type of flag and the due date."
 msgstr ""
 "Se abrirá una caja de diálogo para permitirle establecer el tipo de marca y "
 "la fecha de vencimiento."
 
-#: C/evolution.xml:2513(para)
+#: C/evolution.xml:2533(para)
 msgid ""
 "The flag itself is the action you want to remind yourself about. Several are "
 "provided for you, such as Call, Forward, and Reply, but you can enter your "
@@ -6302,7 +6290,7 @@ msgstr ""
 "Tiene varias disponibles, como Llamar, Reenviar y Responder, pero puede "
 "escribir la nota o acción que prefiera."
 
-#: C/evolution.xml:2514(para)
+#: C/evolution.xml:2534(para)
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
 "entirely by right-clicking the message, then click either Flag Completed or "
@@ -6312,7 +6300,7 @@ msgstr ""
 "eliminar la marca pinchando con el botón derecho sobre el mensaje y "
 "eligiendo Marcar como terminado o Quitar marca."
 
-#: C/evolution.xml:2515(para)
+#: C/evolution.xml:2535(para)
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
 "before the message headers. An overdue message might tell you "
@@ -6323,7 +6311,7 @@ msgstr ""
 "un mensaje atrasado podrá decirle algo como <quote>Llamar antes del 7 de "
 "abril de 2003 a las 17:00</quote>."
 
-#: C/evolution.xml:2516(para)
+#: C/evolution.xml:2536(para)
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
 "might add a Flag Status column to your message list and sort that way. "
@@ -6338,22 +6326,22 @@ msgstr ""
 "quitarles las marcas cuando haya acabado, de manera que la carpeta sólo "
 "contenga mensajes pendientes."
 
-#: C/evolution.xml:2518(title)
+#: C/evolution.xml:2538(title)
 msgid "Mark as Important Feature:"
 msgstr "Característica Marcar como importante:"
 
-#: C/evolution.xml:2519(para)
+#: C/evolution.xml:2539(para)
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
 "them as important by right-clicking the message, then click Mark as "
-"Important or Select Message &gt; Mark as &gt;Important."
+"Important or Select Message &gt; Mark as &gt; Important from the menubar."
 msgstr ""
 "Si prefiere una forma más sencilla de recordarse a sí mismo los mensajes, "
 "puede marcarlos como importantes pulsando con el botón derecho del ratón "
 "sobre el mensaje y después pulsando Marcar como importante o Seleccionar "
-"mensaje &gt; Marcar como &gt; Importante."
+"mensaje &gt; Marcar como &gt; Importante desde la barra de menú,"
 
-#: C/evolution.xml:2526(para)
+#: C/evolution.xml:2546(para)
 msgid ""
 "Evolution, like most other mail systems, stores mail in folders. You start "
 "out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can "
@@ -6366,29 +6354,31 @@ msgstr ""
 "desee. Cree nuevas carpetas pulsaando Carpeta &gt; Nueva, o pulsando con el "
 "botón derecho sobre la lista y seleccionando Carpeta nueva."
 
-#: C/evolution.xml:2527(para)
+#: C/evolution.xml:2547(para)
+#, fuzzy
 msgid ""
 "When you click OK, your new folder appears in the folder view. You can then "
-"move the messages to it by dragging and dropping them, or right click &gt; "
-"Move to folder or press Shift+Ctrl+V."
+"move the messages to it by dragging and dropping them, or right click on the "
+"message and choose Move to folder, or press Shift+Ctrl+V."
 msgstr ""
 "Cuando pulse Aceptar, su nueva carpeta aparecerá en la vista de carpetas. "
 "Entonces podrá mover los mensajes a la carpeta arrastrándolos y soltándolos, "
 "o pulsando con el botón derecho &gt; Mover a la carpeta o pulsando Mayús+Ctrl"
 "+V."
 
-#: C/evolution.xml:2528(para)
+#: C/evolution.xml:2548(para)
+#, fuzzy
 msgid ""
 "You can also drop the messages to a particular folder by selecting Message "
-"&gt; Move to folder or press Shift+Ctrl +V. This will open Select folder "
-"window, where you can drop your message to any of the folders listed."
+"&gt; Move to folder. This will open the Select folder window, where you can "
+"drop your message to any of the folders listed."
 msgstr ""
 "También puede soltar los mensajes sobre una carpeta en particular "
 "seleccionando Mensaje &gt; Mover a la carpeta o pulsando Mayús+Ctrl+V. Esto "
 "abrirá la ventana Seleccionar carpeta, donde podrá soltar su mensaje en "
 "cualquiera de las carpetas listadas."
 
-#: C/evolution.xml:2530(para)
+#: C/evolution.xml:2550(para)
 msgid ""
 "If you want to create a new folder click New at the bottom left of the "
 "window. Specify the location and enter the label of the folder at the entry "
@@ -6401,28 +6391,31 @@ msgstr ""
 "puede mover los mensajes desde una carpeta a otra seleccionando el mensaje y "
 "pulsando la solapa Mover en la parte inferior derecha."
 
-#: C/evolution.xml:2531(para)
+#: C/evolution.xml:2551(para)
+#, fuzzy
 msgid ""
 "If you create a filter with the filter assistant, you can have mail filed "
-"automatically. For that select Edit &gt; Message Filters to appear Message "
-"Filters window"
+"automatically. Select Edit &gt; Message Filters to bring up the Message "
+"Filters window."
 msgstr ""
 "Si crea un filtro con el asistente de filtros, puede tener el correo "
 "ordenado automáticamente. Para ello seleccione Editar &gt; Filtros de "
 "mensajes para que aparezca la ventana Filtros de mensajes."
 
-#: C/evolution.xml:2533(para)
+#: C/evolution.xml:2553(para)
+#, fuzzy
 msgid ""
-"Click the Add tab to appear Add Rule window from where you can set different "
-"criteria for filtering messages. For more information refer <link linkend="
-"\"usage-mail-org-filters-new\">Creating New Filter Rules</link>."
+"Click on the Add button to bring up the Add Rule window from where you can "
+"set different criteria for filtering messages. For additional information on "
+"filtering, see <link linkend=\"usage-mail-org-filters-new\">Creating New "
+"Filter Rules</link>."
 msgstr ""
 "Pulse la solapa de añadir para que aparezca la ventana Añadir regla, donde "
 "puede establecer diferentes criterios para filtrar los mensajes. Para "
 "obtener más información vea la <link linkend=\"usage-mail-org-filters-new"
 "\">Crear de reglas de filtrado nuevas</link>."
 
-#: C/evolution.xml:2535(para)
+#: C/evolution.xml:2555(para)
 msgid ""
 "The Inbox folder on most IMAP servers cannot contain both subfolders and "
 "messages. When you create additional folders on your IMAP mail server, "
@@ -6438,7 +6431,7 @@ msgstr ""
 "subcarpetas en el buzón de entrada, dejará de poder leer mensajes que "
 "existen en esta carpeta, hasta que las mueva hacia otro lugar."
 
-#: C/evolution.xml:2541(para)
+#: C/evolution.xml:2561(para)
 msgid ""
 "Most email clients can search the message for you, but Evolution does it "
 "differently and efficiently giving you faster search result with Quick "
@@ -6449,13 +6442,13 @@ msgstr ""
 "una búsqueda más rápida con Búsqueda rápida, Búsqueda personalizada y "
 "Búsqueda avanzada."
 
-#: C/evolution.xml:2543(title) C/evolution.xml:3290(title)
-#: C/evolution.xml:4168(title) C/evolution.xml:4474(title)
-#: C/evolution.xml:4718(title)
+#: C/evolution.xml:2563(title) C/evolution.xml:3308(title)
+#: C/evolution.xml:4190(title) C/evolution.xml:4498(title)
+#: C/evolution.xml:4742(title)
 msgid "Quick Search:"
 msgstr "Búsqueda rápida:"
 
-#: C/evolution.xml:2544(para)
+#: C/evolution.xml:2564(para)
 msgid ""
 "Quick Search displays all the messages that match the in-built criteria you "
 "selected from the drop-down list at the top left side, just above the "
@@ -6465,78 +6458,87 @@ msgstr ""
 "criterios integrados que ha seleccionado de la lista desplegable en la parte "
 "superior izquierda, justo encima de la lista de mensajes."
 
-#: C/evolution.xml:2546(para)
-msgid "To perform quick search, perform the following procedure:"
-msgstr "Para realizar una búsqueda rápida, realice los siguientes procedimientos:"
+#: C/evolution.xml:2566(para)
+msgid "To perform a quick search, perform the following procedure:"
+msgstr "Para realizar una búsqueda rápida, realice el siguiente procedimiento:"
 
-#: C/evolution.xml:2549(para)
-msgid "Click Show to expand the drop-down list."
-msgstr "Pulse Mostrar para expandir la lista desplegable."
+#: C/evolution.xml:2569(para) C/evolution.xml:2648(para)
+#: C/evolution.xml:3271(para) C/evolution.xml:3314(para)
+#: C/evolution.xml:4142(para) C/evolution.xml:4458(para)
+#: C/evolution.xml:4694(para)
+msgid ""
+"Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
+"stock_search.png\"/> to expand the drop-down list."
+msgstr ""
+"Pulse el botón de búsqueda <inlinegraphic format=\"PNG\" fileref=\"figures/"
+"stock_search.png\"/> para expandir la dista desplegable."
 
-#: C/evolution.xml:2552(para)
-msgid "Select the search criteria from the list"
-msgstr "Seleccione el criterio de búsqueda para la lista"
+#: C/evolution.xml:2572(para) C/evolution.xml:3317(para)
+#: C/evolution.xml:4198(para) C/evolution.xml:4540(para)
+#: C/evolution.xml:4750(para)
+msgid "Select the search criteria from the list:"
+msgstr "Seleccione el criterio de búsqueda de la lista:"
 
-#: C/evolution.xml:2555(para)
+#: C/evolution.xml:2575(para)
 msgid "All Messages"
 msgstr "Todos los mensajes"
 
-#: C/evolution.xml:2558(para)
+#: C/evolution.xml:2578(para)
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: C/evolution.xml:2561(para)
+#: C/evolution.xml:2581(para)
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: C/evolution.xml:2564(para) C/evolution.xml:2606(para)
+#: C/evolution.xml:2584(para) C/evolution.xml:2626(para)
 msgid "Important"
 msgstr "Importante"
 
-#: C/evolution.xml:2567(para) C/evolution.xml:2609(para)
+#: C/evolution.xml:2587(para) C/evolution.xml:2629(para)
 msgid "Work"
 msgstr "Trabajo"
 
-#: C/evolution.xml:2570(para) C/evolution.xml:2612(para)
-#: C/evolution.xml:3344(para) C/evolution.xml:4230(para)
-#: C/evolution.xml:4579(para) C/evolution.xml:4774(para)
-#: C/evolution.xml:5389(para)
+#: C/evolution.xml:2590(para) C/evolution.xml:2632(para)
+#: C/evolution.xml:3362(para) C/evolution.xml:4252(para)
+#: C/evolution.xml:4603(para) C/evolution.xml:4798(para)
+#: C/evolution.xml:5368(para)
 msgid "Personal"
 msgstr "Personal"
 
-#: C/evolution.xml:2573(para) C/evolution.xml:2615(para)
+#: C/evolution.xml:2593(para) C/evolution.xml:2635(para)
 msgid "To do"
 msgstr "Por hacer"
 
-#: C/evolution.xml:2576(para) C/evolution.xml:2618(para)
+#: C/evolution.xml:2596(para) C/evolution.xml:2638(para)
 msgid "Later"
 msgstr "Después"
 
-#: C/evolution.xml:2579(para)
+#: C/evolution.xml:2599(para)
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: C/evolution.xml:2582(para)
+#: C/evolution.xml:2602(para)
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: C/evolution.xml:2585(para)
+#: C/evolution.xml:2605(para)
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: C/evolution.xml:2588(para)
+#: C/evolution.xml:2608(para)
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: C/evolution.xml:2591(para)
+#: C/evolution.xml:2611(para)
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: C/evolution.xml:2594(para)
+#: C/evolution.xml:2614(para)
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son spam"
 
-#: C/evolution.xml:2599(para)
+#: C/evolution.xml:2619(para)
 msgid ""
 "Evolution displays the messages matching the criteria present in the shown "
 "message list"
@@ -6544,10 +6546,10 @@ msgstr ""
 "Evolution muestra los mensajes que coincidan con los criterios presentes en "
 "la lista de mensajes mostrada."
 
-#: C/evolution.xml:2603(para)
+#: C/evolution.xml:2623(para)
 msgid ""
 "The following labels need not necessarily be the same as the default names "
-"listed here.You can change the name of these labels by selecting Edit &gt; "
+"listed here. You can change the name of these labels by selecting Edit &gt; "
 "Preferences &gt; Mail Preferences &gt; Colors."
 msgstr ""
 "Las siguientes etiquetas no son necesariamente las mismas que las de los "
@@ -6555,33 +6557,25 @@ msgstr ""
 "etiquetas seleccionando Editar &gt; Preferencias &gt; Preferencias del "
 "correo &gt; Colores."
 
-#: C/evolution.xml:2623(title) C/evolution.xml:3248(title)
-#: C/evolution.xml:4115(title) C/evolution.xml:4430(title)
-#: C/evolution.xml:4665(title)
+#: C/evolution.xml:2643(title) C/evolution.xml:3266(title)
+#: C/evolution.xml:4137(title) C/evolution.xml:4453(title)
+#: C/evolution.xml:4689(title)
 msgid "Customized Search:"
 msgstr "Búsqueda personalizada:"
 
-#: C/evolution.xml:2624(para)
+#: C/evolution.xml:2644(para)
 msgid ""
-"Evolution allows you to perform customized search.To search for a message "
+"Evolution allows you to perform customized search. To search for a message "
 "use the following procedure:"
 msgstr ""
 "Evolution le permite realizar búsquedas personalizadas. Para buscar un "
-"mensaje utilice el siguiente procedimiento:"
-
-#: C/evolution.xml:2628(para)
-msgid ""
-"Click search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"stock_search.png\"/> to specify the search type."
-msgstr ""
-"Pulse el icono de búsqueda <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"stock_search.png\"/> para especificar el tipo de búsqueda."
+"mensaje use el siguiente procedimiento:"
 
-#: C/evolution.xml:2630(title)
+#: C/evolution.xml:2650(title)
 msgid "Subject or Sender Contain:"
 msgstr "El asunto o remitente contiene:"
 
-#: C/evolution.xml:2631(para)
+#: C/evolution.xml:2651(para)
 msgid ""
 "Finds messages that contain the search text in the subject or sender. It "
 "does not search in the message body."
@@ -6589,76 +6583,76 @@ msgstr ""
 "Busca mensajes que contiene el texto buscado en el asunto o remitente. No "
 "busca en el cuerpo del mensaje."
 
-#: C/evolution.xml:2634(title)
+#: C/evolution.xml:2654(title)
 msgid "Recipients Contain:"
 msgstr "El destinatario contiene:"
 
-#: C/evolution.xml:2635(para)
+#: C/evolution.xml:2655(para)
 msgid "Finds messages with the search text in the To: and Cc: headers."
 msgstr "Busca mensajes con el texto buscado en las cabeceras Para: y Cc:."
 
-#: C/evolution.xml:2638(title)
+#: C/evolution.xml:2658(title)
 msgid "Message Contains:"
 msgstr "El mensaje contiene:"
 
-#: C/evolution.xml:2639(para)
+#: C/evolution.xml:2659(para)
 msgid "Searches the message body and all headers for the specified text."
 msgstr ""
 "Busca el texto especificado en el cuerpo del mensaje y en todas las "
 "cabeceras."
 
-#: C/evolution.xml:2642(title)
+#: C/evolution.xml:2662(title)
 msgid "Subject Contain:"
 msgstr "El asunto contiene:"
 
-#: C/evolution.xml:2643(para)
+#: C/evolution.xml:2663(para)
 msgid "Shows messages where the search text is in the subject line."
 msgstr "Muestra los mensajes donde el texto de búsqueda está en la línea del asunto."
 
-#: C/evolution.xml:2646(title)
+#: C/evolution.xml:2666(title)
 msgid "Sender Contain:"
 msgstr "El remitente contiene:"
 
-#: C/evolution.xml:2647(para)
+#: C/evolution.xml:2667(para)
 msgid "Finds messages whose From: header contains a match for your search text."
 msgstr ""
 "Busca mensajes cuya cabecera De: contiene coincidencias con el texto que ha "
 "introducido."
 
-#: C/evolution.xml:2650(title)
+#: C/evolution.xml:2670(title)
 msgid "Body Contains:"
 msgstr "El cuerpo contiene:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2651(para)
+#: C/evolution.xml:2671(para)
 msgid "Searches only in message text, not any other header."
 msgstr "Busca sólo en el cuerpo del mensaje, no en ninguna otra cabecera."
 
-#: C/evolution.xml:2655(para)
+#: C/evolution.xml:2675(para)
 msgid "Click the drop-down list to select the scope"
 msgstr "Pulse sobre la lista desplegable para seleccionar el rango"
 
-#: C/evolution.xml:2658(para)
+#: C/evolution.xml:2678(para)
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: C/evolution.xml:2661(para)
+#: C/evolution.xml:2681(para)
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: C/evolution.xml:2664(para)
+#: C/evolution.xml:2684(para)
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: C/evolution.xml:2667(para)
+#: C/evolution.xml:2687(para)
 msgid "Current Message"
 msgstr "Mensaje actual"
 
-#: C/evolution.xml:2672(para)
+#: C/evolution.xml:2692(para)
 msgid "Type the search string in the search entry and press Enter."
 msgstr "Escriba la cadena de búsqueda en el campo de búsqueda y pulse Intro."
 
-#: C/evolution.xml:2674(para)
+#: C/evolution.xml:2694(para)
 msgid ""
 "The folder list will be disabled while you perform search on All Accounts or "
 "Current Account."
@@ -6666,7 +6660,7 @@ msgstr ""
 "Se deshabilitará la lista de carpetas mientras realiza una búsqueda en Todas "
 "las cuentas o en la Cuenta actual."
 
-#: C/evolution.xml:2678(para)
+#: C/evolution.xml:2698(para)
 msgid ""
 "Evolution shows your search results in the message list. You might want to "
 "create a search folder instead; see <link linkend=\"usage-mail-organize-"
@@ -6677,15 +6671,18 @@ msgstr ""
 "la <link linkend=\"usage-mail-organize-vfolders\">Uso de las carpetas de "
 "búsqueda</link>."
 
-#: C/evolution.xml:2680(para)
+#: C/evolution.xml:2700(para) C/evolution.xml:3306(para)
 msgid ""
-"To clear your search click the Clear button or menu, or enter a blank "
+"To clear your search you can click the Clear icon in the search string "
+"field, or choose Search &gt; Clear from the menubar, or enter a blank "
 "search. You can also press Shift+Ctrl+Q to clear the search."
 msgstr ""
-"Para limpiar su búsqueda pulse el botón o menú Limpiar, o introduzca una "
-"búsqueda vacía. También puede pulsar Mayús+Ctrl+Q para limpiar la búsqueda."
+"Para limpiar su búsqueda puede pulsar el botón o menú Limpiar en el campo de "
+"cadena de búsqueda, elegir Buscar &gt; Limpiar desde la barra de menú, o "
+"introducir una búsqueda vacía. También puede pulsar Mayús+Ctrl+Q para "
+"limpiar la búsqueda."
 
-#: C/evolution.xml:2683(para)
+#: C/evolution.xml:2703(para)
 msgid ""
 "You can even perform a quick search on a customized search results as it "
 "just filters and displays the messages in the message list."
@@ -6694,28 +6691,32 @@ msgstr ""
 "personalizada ya que sólo filtra y muestra los mensajes en la lista de "
 "mensajes."
 
-#: C/evolution.xml:2686(title) C/evolution.xml:4141(title)
-#: C/evolution.xml:4456(title) C/evolution.xml:4691(title)
+#: C/evolution.xml:2706(title) C/evolution.xml:4163(title)
+#: C/evolution.xml:4479(title) C/evolution.xml:4715(title)
 msgid "Advanced Search:"
 msgstr "Búsqueda avanzada:"
 
-#: C/evolution.xml:2687(para)
-msgid "To perform advanced search,"
-msgstr "Para realizar una búsqueda avanzada,"
+#: C/evolution.xml:2707(para) C/evolution.xml:4164(para)
+#: C/evolution.xml:4480(para) C/evolution.xml:4716(para)
+msgid "You can perform an advanced search based on any of the search types."
+msgstr ""
+"Puede realizar una búsqueda avanzada basada en cualquiera de los tipos de "
+"búsqueda."
 
-#: C/evolution.xml:2691(para)
-msgid "Select Search menu"
-msgstr "Seleccione el menú Buscar"
+#: C/evolution.xml:2711(para) C/evolution.xml:4168(para)
+#: C/evolution.xml:4484(para)
+msgid "Select the Search menu."
+msgstr "Seleccione el menú Buscar."
 
-#: C/evolution.xml:2694(para)
-msgid "Click Advanced Search to open Advanced Search dialogue box"
-msgstr "Pulse Búsqueda avanzada para abrir la caja de diálogo Búsqueda avanzada"
+#: C/evolution.xml:2714(para)
+msgid "Click Advanced Search to open Advanced Search dialog box."
+msgstr "Pulse Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda avanzada."
 
-#: C/evolution.xml:2699(para)
+#: C/evolution.xml:2719(para)
 msgid "Enter the Search name."
 msgstr "Introduzca el nombre de la búsqueda."
 
-#: C/evolution.xml:2702(para)
+#: C/evolution.xml:2722(para)
 msgid ""
 "Click Add to add rules. For more information on rules, refer <link linkend="
 "\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A "
@@ -6725,15 +6726,15 @@ msgstr ""
 "acerca de las reglas, vea el <link linkend=\"bsazsjd\">Paso 4</link> bajo "
 "<link linkend=\"vfolder-create\">Crear una carpeta de búsqueda</link>."
 
-#: C/evolution.xml:2708(para)
+#: C/evolution.xml:2728(para)
 msgid "Press Save to save your search results."
 msgstr "Pulse Guardar par aguardar los resultados."
 
-#: C/evolution.xml:2712(title)
+#: C/evolution.xml:2732(title)
 msgid "Save Search:"
 msgstr "Guardar búsqueda:"
 
-#: C/evolution.xml:2713(para)
+#: C/evolution.xml:2733(para)
 msgid ""
 "To save your search results other than from advanced search, select Search "
 "&gt; Save Search. You can view the label of your search results listed under "
@@ -6743,27 +6744,29 @@ msgstr ""
 "seleccione Buscar &gt; Guardar búsqueda. Puede ver la etiqueta de los "
 "resultados de su búsqueda listada bajo el menú Buscar."
 
-#: C/evolution.xml:2716(title)
+#: C/evolution.xml:2736(title)
 msgid "Edit Saved Searches:"
 msgstr "Editar búsquedas guardadas:"
 
-#: C/evolution.xml:2717(para)
-msgid "To edit your saved searches"
-msgstr "Editar sus búsquedas guardadas"
+#: C/evolution.xml:2737(para)
+msgid "To edit your saved searches,"
+msgstr "Editar sus búsquedas guardadas,"
 
-#: C/evolution.xml:2721(para)
-msgid "Select Search"
-msgstr "Seleccione Buscar"
+#: C/evolution.xml:2741(para)
+msgid "Select Search from the menu bar."
+msgstr "Seleccione Buscar en la barra de menú."
 
-#: C/evolution.xml:2724(para)
-msgid "Click Edit Saved Searches to open Searches dialogue box."
+#: C/evolution.xml:2744(para)
+#, fuzzy
+msgid "Click Edit Saved Searches to open the Searches dialog box."
 msgstr "Pulse Editar búsquedas guardadas para abrir el cuadro de diálogo Búsquedas."
 
-#: C/evolution.xml:2729(para)
-msgid "Click Edit tab to edit to open Edit Rule dialogue box"
+#: C/evolution.xml:2749(para)
+#, fuzzy
+msgid "Click the Edit button to open the Edit Rule dialog box."
 msgstr "Pulse sobre la solapa Editar para abrir el cuadro de diálogo de Editar regla"
 
-#: C/evolution.xml:2730(para)
+#: C/evolution.xml:2750(para)
 msgid ""
 "You can also add or remove Searches from the list by using the respective "
 "buttons available at the right."
@@ -6771,11 +6774,11 @@ msgstr ""
 "También puede añadir o quitar Búsquedas de la lista usando los respectivos "
 "botones disponibles a la derecha."
 
-#: C/evolution.xml:2735(para)
-msgid "Edit the title or search criteria from the dialogue box."
+#: C/evolution.xml:2755(para)
+msgid "Edit the title or search criteria from the dialog box."
 msgstr "Edite el título o el criterio de búsqueda desde el cuadro de diálogo."
 
-#: C/evolution.xml:2745(para)
+#: C/evolution.xml:2765(para)
 msgid ""
 "Filters work very much like the mail room in a large company. Their purpose "
 "is to bundle, sort, and distribute mail to the various folders. In addition, "
@@ -6792,29 +6795,29 @@ msgstr ""
 "copias de un mismo mensaje en múltiples carpetas; pueden también conservar o "
 "incluso mandar una copia a otra persona."
 
-#: C/evolution.xml:2748(title)
+#: C/evolution.xml:2768(title)
 msgid "Creating New Filter Rules"
 msgstr "Crear reglas de filtros nuevas"
 
-#: C/evolution.xml:2751(para) C/evolution.xml:2955(para)
-#: C/evolution.xml:2970(para)
+#: C/evolution.xml:2771(para) C/evolution.xml:2975(para)
+#: C/evolution.xml:2990(para)
 msgid "Click Edit &gt; Message Filters."
 msgstr "Pulse Editar &gt; Filtros de mensajes."
 
-#: C/evolution.xml:2754(para) C/evolution.xml:3005(para)
-#: C/evolution.xml:5007(para) C/evolution.xml:5633(para)
+#: C/evolution.xml:2774(para) C/evolution.xml:3025(para)
+#: C/evolution.xml:5031(para) C/evolution.xml:5612(para)
 msgid "Click Add."
 msgstr "Pulse Añadir."
 
-#: C/evolution.xml:2757(para)
+#: C/evolution.xml:2777(para)
 msgid "Type a name for the filter in the Rule name field."
 msgstr "Escriba un nombre para el filtro en el campo de nombre de la regla."
 
-#: C/evolution.xml:2762(para)
-msgid "Define the criteria for the filter in the If section."
-msgstr "Defina el criterio para el filtro en la sección Si."
+#: C/evolution.xml:2782(para)
+msgid "Define the criteria for the filter in the first section."
+msgstr "Defina el criterio para el filtro en la primera sección."
 
-#: C/evolution.xml:2763(para)
+#: C/evolution.xml:2783(para)
 msgid ""
 "For each of the filter criteria, you must first select which parts of the "
 "message you want to filter:"
@@ -6822,42 +6825,41 @@ msgstr ""
 "Para cada criterio de filtrado, debe seleccionar en primer lugar qué partes "
 "de los mensajes quiere filtrar:"
 
-#: C/evolution.xml:2765(title) C/evolution.xml:3015(title)
+#: C/evolution.xml:2785(title) C/evolution.xml:3035(title)
 msgid "Sender:"
 msgstr "Remitente:"
 
-# index.docbook:458, index.docbook:949
-#: C/evolution.xml:2766(para)
-msgid "The sender's address."
-msgstr "La dirección del remitente."
+#: C/evolution.xml:2786(para)
+msgid "The sender's email address or the name of the sender."
+msgstr "La dirección de correo electrónico del remitente o el nombre del remitente."
 
-#: C/evolution.xml:2769(title)
+#: C/evolution.xml:2789(title)
 msgid "Recipient:"
 msgstr "Destinatario:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2770(para) C/evolution.xml:3020(para)
+#: C/evolution.xml:2790(para) C/evolution.xml:3040(para)
 msgid "The recipients of the message."
 msgstr "Los destinatarios del mensaje."
 
-#: C/evolution.xml:2773(title) C/evolution.xml:3023(title)
+#: C/evolution.xml:2793(title) C/evolution.xml:3043(title)
 msgid "Subject:"
 msgstr "Asunto:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2774(para) C/evolution.xml:3024(para)
+#: C/evolution.xml:2794(para) C/evolution.xml:3044(para)
 msgid "The subject line of the message."
 msgstr "La línea asunto del mensaje."
 
-#: C/evolution.xml:2777(title)
+#: C/evolution.xml:2797(title)
 msgid "Specific Header:"
 msgstr "Cabecera específica:"
 
-#: C/evolution.xml:2778(para)
+#: C/evolution.xml:2798(para)
 msgid "Any header including custom ones."
 msgstr "Cualquier cabecera, incluyendo las personalizadas."
 
-#: C/evolution.xml:2780(para)
+#: C/evolution.xml:2800(para)
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
@@ -6875,32 +6877,32 @@ msgstr ""
 "si la segunda declaración no apareciera. Para filtrar mensajes que utilizan "
 "varias cabeceras varias veces, utilice una expresión regular."
 
-#: C/evolution.xml:2782(title) C/evolution.xml:3027(title)
+#: C/evolution.xml:2802(title) C/evolution.xml:3047(title)
 msgid "Message Body:"
 msgstr "Cuerpo del mensaje:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2783(para) C/evolution.xml:3028(para)
+#: C/evolution.xml:2803(para) C/evolution.xml:3048(para)
 msgid "Searches in the actual text of the message."
 msgstr "Busca en el texto efectivo del mensaje."
 
-#: C/evolution.xml:2786(title)
+#: C/evolution.xml:2806(title)
 msgid "Expression:"
 msgstr "Expresión:"
 
-#: C/evolution.xml:2787(para)
+#: C/evolution.xml:2807(para)
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
-"in the Scheme language, used to define filters in Evolution."
+"in the Scheme language used to define filters in Evolution."
 msgstr ""
 "(Sólo para programadores) busca un mensaje que corresponda a una expresión "
-"escrita en lenguaje Scheme, utilizado para definir filtros en Evolution."
+"escrita en lenguaje Scheme, usado para definir filtros en Evolution."
 
-#: C/evolution.xml:2790(title) C/evolution.xml:3035(title)
+#: C/evolution.xml:2810(title) C/evolution.xml:3055(title)
 msgid "Date Sent:"
 msgstr "Fecha de envío:"
 
-#: C/evolution.xml:2791(para) C/evolution.xml:3036(para)
+#: C/evolution.xml:2811(para) C/evolution.xml:3056(para)
 msgid ""
 "Filters messages according to the date on which they were sent. First, "
 "choose the conditions you want a message to meet, such as before a given "
@@ -6918,12 +6920,12 @@ msgstr ""
 "en el calendario. Es posible incluso buscar mensajes dentro de un intervalo "
 "de tiempo relativo, por ejemplo, buscar mensajes en los últimos cuatro días."
 
-#: C/evolution.xml:2794(title) C/evolution.xml:3039(title)
+#: C/evolution.xml:2814(title) C/evolution.xml:3059(title)
 msgid "Date Received:"
 msgstr "Fecha de recepción:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2795(para) C/evolution.xml:3040(para)
+#: C/evolution.xml:2815(para) C/evolution.xml:3060(para)
 msgid ""
 "This works the same way as the Date Sent option, except that it compares the "
 "time you received the message with the dates you specify."
@@ -6931,24 +6933,24 @@ msgstr ""
 "Funciona del mismo modo que la opción Fecha de envío, excepto que compara la "
 "fecha y hora de recepción del mensaje con las fechas especificadas."
 
-#: C/evolution.xml:2798(title) C/evolution.xml:3043(title)
+#: C/evolution.xml:2818(title) C/evolution.xml:3063(title)
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: C/evolution.xml:2799(para)
+#: C/evolution.xml:2819(para) C/evolution.xml:3064(para)
 msgid ""
 "Messages can have labels of Important, Work, Personal, To Do, or Later. You "
-"can set tables with other filters or by hand."
+"can set labels with other filters or manually."
 msgstr ""
-"Los mensajes puede tener las etiquetas Importante, Trabajo, Personal, Tareas "
-"pendientes, o Más tarde. Puede establecer tablas con otros filtros o hacerlo "
-"a mano."
+"Los mensajes pueden tener las etiquetas Importante, Trabajo, personal, "
+"Tareas pendientes o Más tarde. Puede establecer etiquetas con otros filtros "
+"o manualmente."
 
-#: C/evolution.xml:2802(title) C/evolution.xml:3047(title)
+#: C/evolution.xml:2822(title) C/evolution.xml:3067(title)
 msgid "Score:"
 msgstr "Puntuación:"
 
-#: C/evolution.xml:2803(para) C/evolution.xml:3048(para)
+#: C/evolution.xml:2823(para) C/evolution.xml:3068(para)
 msgid ""
 "Sets the message score to any whole number greater than 0. You can have one "
 "filter set or change a message score, and then set up another filter to move "
@@ -6963,20 +6965,20 @@ msgstr ""
 "simplemente un número que puede asignar a mensajes para que otros filtros "
 "puedan procesarlos."
 
-#: C/evolution.xml:2806(title) C/evolution.xml:3051(title)
+#: C/evolution.xml:2826(title) C/evolution.xml:3071(title)
 msgid "Size:"
 msgstr "Tamaño:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2807(para) C/evolution.xml:3052(para)
+#: C/evolution.xml:2827(para) C/evolution.xml:3072(para)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Ordenación basada en el tamaño del mensaje, en kilobytes."
 
-#: C/evolution.xml:2810(title) C/evolution.xml:3055(title)
+#: C/evolution.xml:2830(title) C/evolution.xml:3075(title)
 msgid "Status:"
 msgstr "Estado:"
 
-#: C/evolution.xml:2811(para) C/evolution.xml:3056(para)
+#: C/evolution.xml:2831(para) C/evolution.xml:3076(para)
 msgid ""
 "Filters according to the status of a message. The status can be Replied To, "
 "Draft, Important, Read, or Junk."
@@ -6984,27 +6986,28 @@ msgstr ""
 "Filtros de acuerdo al estado de un mensaje. El estado puede ser Respoder a, "
 "Borrador, Importante, Leído o SPAM."
 
-#: C/evolution.xml:2814(title)
+#: C/evolution.xml:2834(title)
 msgid "Flagged:"
 msgstr "Marcado:"
 
-#: C/evolution.xml:2815(para) C/evolution.xml:3060(para)
+#: C/evolution.xml:2835(para) C/evolution.xml:3080(para)
 msgid "Checks whether the message is flagged for follow-up."
 msgstr "Comprueba si el mensaje está marcado para seguimiento."
 
-#: C/evolution.xml:2818(title) C/evolution.xml:3063(title)
+#: C/evolution.xml:2838(title) C/evolution.xml:3083(title)
 msgid "Attachments:"
 msgstr "Adjuntos:"
 
-#: C/evolution.xml:2819(para) C/evolution.xml:3064(para)
-msgid "Creates a filter based on whether there is an attachment for the e-mail."
+#: C/evolution.xml:2839(para) C/evolution.xml:3084(para)
+#, fuzzy
+msgid "Creates a filter based on whether there is an attachment for the email."
 msgstr "Crea un filtro en función de si el mensaje contiene un adjunto."
 
-#: C/evolution.xml:2822(title)
+#: C/evolution.xml:2842(title)
 msgid "Mailing List"
 msgstr "Lista de correo"
 
-#: C/evolution.xml:2823(para) C/evolution.xml:3068(para)
+#: C/evolution.xml:2843(para) C/evolution.xml:3088(para)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -7018,11 +7021,11 @@ msgstr ""
 "redistribuciones de correo. El correo proveniente de  servidores de listas "
 "que no establezca adecuadamente la cabecera X-BeenThere no será filtrado."
 
-#: C/evolution.xml:2826(title)
+#: C/evolution.xml:2846(title)
 msgid "Regex Match:"
 msgstr "Coincide con la expresión regular:"
 
-#: C/evolution.xml:2827(para)
+#: C/evolution.xml:2847(para)
 msgid ""
 "If you know your way around a <link linkend=\"regular-expression\">regex</"
 "link>, or regular expression, this option allows you to search for complex "
@@ -7040,11 +7043,11 @@ msgstr ""
 "cómo usar las expresiones regulares examine la página del manual del comando "
 "grep."
 
-#: C/evolution.xml:2830(title)
+#: C/evolution.xml:2850(title)
 msgid "Source Account:"
 msgstr "Cuenta de orígen:"
 
-#: C/evolution.xml:2831(para)
+#: C/evolution.xml:2851(para)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
@@ -7052,11 +7055,11 @@ msgstr ""
 "Filtros de mensajes de acuerdo con el servidor de las que las recibió. Esto "
 "es útil cuando tiene múltiples cuentas de correo POP."
 
-#: C/evolution.xml:2834(title) C/evolution.xml:2918(title)
+#: C/evolution.xml:2854(title) C/evolution.xml:2938(title)
 msgid "Pipe to Program:"
 msgstr "Encauzar al programa:"
 
-#: C/evolution.xml:2835(para)
+#: C/evolution.xml:2855(para)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
@@ -7067,60 +7070,53 @@ msgstr ""
 "deben devolver un entero. Generalmente esto se suele usar para añadir un "
 "filtro de correo spam."
 
-#: C/evolution.xml:2838(title)
+#: C/evolution.xml:2858(title)
 msgid "Junk Test:"
 msgstr "Detección de spam:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2839(para)
+#: C/evolution.xml:2859(para)
 msgid "Filters based on the results of the junk mail test."
 msgstr "Filtros basados en los resultados de las pruebas de spam."
 
-#: C/evolution.xml:2842(title)
+#: C/evolution.xml:2862(title)
 msgid "Select the Criteria for the Condition:"
 msgstr "Seleccione el Criterio para la Condición:"
 
-#: C/evolution.xml:2843(para)
-msgid ""
-"If you want multiple criteria for this filter, click Add Criterion and "
-"repeat step 4."
+#: C/evolution.xml:2863(para)
+msgid "If you want multiple criteria for this filter, click Add and repeat step 4."
 msgstr ""
-"Seleccione el criterio de la condición. si quiere utilizar múltiples "
-"criterios pulse en Añadir criterio y repita el paso 4."
+"Si quiere utilizar múltiples criterios para este filtro, pulse Añadir y "
+"repita el paso 4."
 
-#: C/evolution.xml:2846(title)
+#: C/evolution.xml:2866(title)
 msgid "Select the Actions for the Filter in the Then Section:"
 msgstr "Seleccione las Acciones para el filtro en la sección Entonces:"
 
-#: C/evolution.xml:2847(para)
+#: C/evolution.xml:2867(para)
 msgid "Select any of the following options."
 msgstr "Seleccione cualqueira de la siguientes opciones."
 
-#: C/evolution.xml:2852(title)
+#: C/evolution.xml:2872(title)
 msgid "Move to Folder:"
 msgstr "Mover a la carpeta:"
 
-#: C/evolution.xml:2853(para)
-msgid ""
-"Moves the message into a folder you specify. Click Here to select the "
-"destination folder."
-msgstr ""
-"Mueve el mensaje a una carpeta que especifique. Pulse Aquí para seleccionar "
-"la carpeta destino."
+#: C/evolution.xml:2873(para)
+msgid "Moves the message into a folder you specify."
+msgstr "Mueve el mensaje dentro de la carpeta que especifique."
 
-#: C/evolution.xml:2858(title)
+#: C/evolution.xml:2878(title)
 msgid "Copy to Folder:"
 msgstr "Copar a la carpeta:"
 
-#: C/evolution.xml:2859(para)
-msgid ""
-"Puts a copy of the message into a folder you specify. Click Here to select "
-"the destination folder."
+#: C/evolution.xml:2879(para)
+#, fuzzy
+msgid "Puts a copy of the message into a folder you specify."
 msgstr ""
 "Pone una copia del mensaje en la carpeta que especifique. Pulse Aquí para "
 "seleccionar la carpeta destino."
 
-#: C/evolution.xml:2865(para)
+#: C/evolution.xml:2885(para)
 msgid ""
 "Marks the message for deletion. The message can be undeleted until you "
 "expunge or empty the trash."
@@ -7128,43 +7124,46 @@ msgstr ""
 "Marca el mensaje para borrarlo. Sigue siendo posible recuperar el mensaje de "
 "nuevo, al menos hasta que seleccione Purgar el correo."
 
-#: C/evolution.xml:2870(title)
+#: C/evolution.xml:2890(title)
 msgid "Stop Processing:"
 msgstr "Parar de procesar:"
 
-#: C/evolution.xml:2871(para)
-msgid "Select this if you want to have all other filters ignore this message."
+#: C/evolution.xml:2891(para)
+#, fuzzy
+msgid ""
+"Select this if you want to all other filters ignore this message. Note that "
+"only filters listed after this particular rule will be ignored."
 msgstr "Especifique si desea que todos los demás filtros pasen por alto este mensaje."
 
-#: C/evolution.xml:2876(title)
+#: C/evolution.xml:2896(title)
 msgid "Assign Color:"
 msgstr "Asignar color:"
 
-#: C/evolution.xml:2877(para)
+#: C/evolution.xml:2897(para)
 msgid "Marks the message with a color of your choice."
 msgstr "Marca el mensaje con un color de su elección."
 
-#: C/evolution.xml:2882(title)
+#: C/evolution.xml:2902(title)
 msgid "Assign Score:"
 msgstr "Asignar puntuación:"
 
-#: C/evolution.xml:2883(para)
+#: C/evolution.xml:2903(para)
 msgid "Assigns the message a numeric score."
 msgstr "Asigna al mensaje una puntuación numérica."
 
-#: C/evolution.xml:2888(title)
+#: C/evolution.xml:2908(title)
 msgid "Adjust Score:"
 msgstr "Ajustar puntuación:"
 
-#: C/evolution.xml:2889(para)
+#: C/evolution.xml:2909(para)
 msgid "Changes the numeric score by the amount you set."
 msgstr "Cambia la puntuación numérica por la cantidad que establezca."
 
-#: C/evolution.xml:2894(title)
+#: C/evolution.xml:2914(title)
 msgid "Set Status:"
 msgstr "Poner estado:"
 
-#: C/evolution.xml:2895(para)
+#: C/evolution.xml:2915(para)
 msgid ""
 "Sets the status of the message. The status can be Replied To, Draft, "
 "Important, Read, or Junk."
@@ -7172,11 +7171,11 @@ msgstr ""
 "Establece el estado del mensaje. El estado puede ser Respondió a, Borrador, "
 "Importante, Leído, o SPAM."
 
-#: C/evolution.xml:2900(title)
+#: C/evolution.xml:2920(title)
 msgid "Unset Status:"
 msgstr "Quitar estado:"
 
-#: C/evolution.xml:2901(para)
+#: C/evolution.xml:2921(para)
 msgid ""
 "If the message has a status value, unsets it. If a status value is not set, "
 "it does nothing."
@@ -7184,26 +7183,27 @@ msgstr ""
 "Si el mensaje tiene un estado, lo elimina. Si no tiene establecido un "
 "estado, no hace nada."
 
-#: C/evolution.xml:2906(title)
+#: C/evolution.xml:2926(title)
 msgid "Beep:"
 msgstr "Pitar:"
 
-#: C/evolution.xml:2907(para)
+#: C/evolution.xml:2927(para)
 msgid "Makes the system beep."
 msgstr "Hace que el sistema pite."
 
-#: C/evolution.xml:2912(title)
+#: C/evolution.xml:2932(title)
 msgid "Play Sound:"
 msgstr "Reproducir un sonido:"
 
-#: C/evolution.xml:2913(para)
+#: C/evolution.xml:2933(para)
 msgid "Select a sound file for Evolution to play."
 msgstr "Seleccione un archivo de sonido para que Evolution lo reproduzca."
 
-#: C/evolution.xml:2919(para)
+#: C/evolution.xml:2939(para)
+#, fuzzy
 msgid ""
 "Sends the message to a program of your choice. No return value is expected. "
-"This feature can be used to create automatic Web postings from e-mail "
+"This feature can be used to create automatic Web postings from email "
 "messages or to perform additional message post processing not supported by "
 "Evolution."
 msgstr ""
@@ -7212,33 +7212,37 @@ msgstr ""
 "desde mensajes de correo o para realizar procesados posteriores adicionales "
 "que no estén soportados por Evolution."
 
-#: C/evolution.xml:2924(title)
+#: C/evolution.xml:2944(title)
 msgid "Run Program:"
 msgstr "Ejecutar programa:"
 
-#: C/evolution.xml:2925(para)
+#: C/evolution.xml:2945(para)
 msgid "Evolution runs an application."
 msgstr "Evolution ejecutar una aplicación."
 
-#: C/evolution.xml:2931(para)
-msgid "Click Add Action if you need multiple actions and click OK."
+#: C/evolution.xml:2951(para)
+#, fuzzy
+msgid "Click Add if you need multiple actions and click OK."
 msgstr "Pulse Añadir si necesita añadir múltiples acciones y después pulse Aceptar."
 
-#: C/evolution.xml:2937(para)
+#: C/evolution.xml:2957(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
 msgstr ""
 "Existe un atajo sencillo para los filtros rápidos o creación de carpetas de "
 "búsqueda:"
 
-#: C/evolution.xml:2940(para)
-msgid "Right-click the message in the e-mail list."
-msgstr "Pulse sobre el mensaje en la lista de mensajes."
+#: C/evolution.xml:2960(para)
+msgid "Right-click the message in the message list."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el mensaje en la lista de "
+"mensajes."
 
-#: C/evolution.xml:2943(para)
-msgid "Select one of the items under the Create Rule from the Message submenu."
+#: C/evolution.xml:2963(para)
+#, fuzzy
+msgid "Select one of the items under the Create Rule From Message submenu."
 msgstr "Seleccione uno de los elementos bajo Crear regla del submenú Mensaje."
 
-#: C/evolution.xml:2944(para)
+#: C/evolution.xml:2964(para)
 msgid ""
 "Creating a rule based on a message opens the filter creation tool with some "
 "of the information about the message already filled in for your convenience."
@@ -7246,7 +7250,7 @@ msgstr ""
 "Crear una regla basada en un mensaje abre la herramienta de creación de "
 "filtros con alguna de la información acerca del mensaje ya introducida."
 
-#: C/evolution.xml:2947(para)
+#: C/evolution.xml:2967(para)
 msgid ""
 "If you have several filters that match a single message, they are all "
 "applied to the message in order, unless one of the filters has the Stop "
@@ -7258,7 +7262,7 @@ msgstr ""
 "usa esta acción en un filtro, el mensaje afectado no volverá a ser procesado "
 "por ningún otro filtro."
 
-#: C/evolution.xml:2948(para)
+#: C/evolution.xml:2968(para)
 msgid ""
 "When you first open the Filters dialog box, you are shown the list of "
 "filters sorted in the order in which they will be applied. You can move them "
@@ -7268,31 +7272,32 @@ msgstr ""
 "por el orden de aplicación de los mismos. Puede moverlos arriba y abajo, "
 "modificando así su prioridad pulsando los botones Arriba y Abajo."
 
-#: C/evolution.xml:2952(title)
+#: C/evolution.xml:2972(title)
 msgid "Editing Filters"
 msgstr "Editar de filtros"
 
-#: C/evolution.xml:2958(para)
+#: C/evolution.xml:2978(para)
 msgid "Select the filter to edit, then click Edit."
 msgstr "Seleccione el filtro a editar, después puse Editar."
 
-#: C/evolution.xml:2961(para)
+#: C/evolution.xml:2981(para)
 msgid "Make the desired corrections, then click OK twice."
 msgstr "Haga las correcciones que desee, después pulse Aceptar dos veces."
 
-#: C/evolution.xml:2967(title)
+#: C/evolution.xml:2987(title)
 msgid "Deleting Filters"
 msgstr "Borrar filtros"
 
-#: C/evolution.xml:2973(para)
+#: C/evolution.xml:2993(para)
 msgid "Select the filter to remove, then click Remove."
 msgstr "Seleccione el filtro a eliminar, después pulse Quitar."
 
-#: C/evolution.xml:2984(para)
+#: C/evolution.xml:3004(para)
+#, fuzzy
 msgid ""
 "If filters aren't flexible enough, or you find yourself performing the same "
 "search again and again, consider a search folder. Search folders are an "
-"advanced way of viewing your e-mail messages within Evolution. If you get a "
+"advanced way of viewing your email messages within Evolution. If you get a "
 "lot of mail or often forget where you put messages, search folders can help "
 "you keep things organized."
 msgstr ""
@@ -7303,7 +7308,7 @@ msgstr ""
 "búsqueda ayudan a controlar la situación cuando recibe una gran cantidad de "
 "correo, o cuando olvida con frecuencia a dónde mueve los mensajes."
 
-#: C/evolution.xml:2985(para)
+#: C/evolution.xml:3005(para)
 msgid ""
 "A search folder is really a hybrid of all the other organizational tools: it "
 "looks like a folder, it acts like a search, and you set it up like a filter. "
@@ -7320,7 +7325,7 @@ msgstr ""
 "diferentes. Los mensajes incluidos son identificados al vuelo mediante un "
 "conjunto de criterios elegidos de antemano."
 
-#: C/evolution.xml:2986(para)
+#: C/evolution.xml:3006(para)
 msgid ""
 "As messages that meet the search folder criteria arrive or are deleted, "
 "Evolution automatically adjusts the search folder contents. When you delete "
@@ -7333,7 +7338,7 @@ msgstr ""
 "donde existe realmente, así como de cualquier carpeta de búsqueda con la que "
 "es posible consultarlo."
 
-#: C/evolution.xml:2987(para)
+#: C/evolution.xml:3007(para)
 msgid ""
 "The Unmatched Search Folder is the opposite of other search folders: it "
 "displays all messages that do not appear in other search folders."
@@ -7342,9 +7347,10 @@ msgstr ""
 "carpetas de búsqueda: contiene todos los mensajes que no cumplen los "
 "criterios satisfechos por las demás carpetas de búsqueda."
 
-#: C/evolution.xml:2988(para)
+#: C/evolution.xml:3008(para)
+#, fuzzy
 msgid ""
-"If you use remote e-mail storage like IMAP or Microsoft Exchange, and have "
+"If you use remote email storage like IMAP or Microsoft Exchange, and have "
 "created search folders to search through them, the Unmatched Search Folder "
 "also searches the remote folders. If you do not create any search folders "
 "that search remote mail stores, the Unmatched Search Folder does not search "
@@ -7356,10 +7362,11 @@ msgstr ""
 "no crea ninguna carpeta de búsqueda que busque en almacenes de correo "
 "remotos, la carpeta de búsqueda no coincidente tampoco los buscará."
 
-#: C/evolution.xml:2989(para)
+#: C/evolution.xml:3009(para)
+#, fuzzy
 msgid ""
 "As an example of using folders, searches, and search folders, consider the "
-"following: To organize his mailbox, Jim sets up a search folder for e-mail "
+"following: To organize his mailbox, Jim sets up a search folder for email "
 "from his friend and co-worker Anna. He has another search folder for "
 "messages that have novell.com in the address and Evolution in the subject "
 "line, so he can keep a record of what people from work send him about "
@@ -7382,11 +7389,11 @@ msgstr ""
 "quote>, como también en la carpeta de búsqueda <quote>Debate interno acerca "
 "de Evolution</quote>."
 
-#: C/evolution.xml:2992(title)
+#: C/evolution.xml:3012(title)
 msgid "Creating A Search Folder"
 msgstr "Crear una carpeta de búsqueda"
 
-#: C/evolution.xml:2995(para)
+#: C/evolution.xml:3015(para)
 msgid ""
 "Click Message &gt; Create Rule, then select a search folder based on "
 "Subject, Sender, Recipient, or Mailing List."
@@ -7394,13 +7401,13 @@ msgstr ""
 "Pulse Mensaje &gt; Crear regla, después seleccione una carpeta de búsqueda "
 "basada en el Asunto, Remitente, Destinatario o Lista de correo."
 
-#: C/evolution.xml:2997(para)
+#: C/evolution.xml:3017(para)
 msgid "Select Search menu &gt; Create Search Folder From Search."
 msgstr ""
 "Seleccione el menú Buscar &gt; Crear una carpeta de búsqueda desde la "
 "búsqueda."
 
-#: C/evolution.xml:2999(para)
+#: C/evolution.xml:3019(para)
 msgid ""
 "Perform this operation from the search results. Create a search folder from "
 "search is enabled only when you already have performed a search."
@@ -7409,17 +7416,17 @@ msgstr ""
 "búsqueda desde la búsqueda está activado sólo si ya ha realizado una "
 "búsqueda."
 
-#: C/evolution.xml:3002(para)
+#: C/evolution.xml:3022(para)
 msgid "Select Edit &gt; Search Folder"
 msgstr "Seleccione Editar &gt; Carpeta de búsqueda"
 
-#: C/evolution.xml:3010(para)
+#: C/evolution.xml:3030(para)
 msgid "Type the name of the search folder in the Search name field."
 msgstr ""
 "Escriba el nombre de la carpeta de búsqueda en el campo Nombre de la "
 "búsqueda."
 
-#: C/evolution.xml:3013(para)
+#: C/evolution.xml:3033(para)
 msgid ""
 "Select your search criteria. For each criterion, you must first select which "
 "of the following parts of the message you want the search to examine. The "
@@ -7430,19 +7437,19 @@ msgstr ""
 "similares a los de los filtros."
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:3016(para)
+#: C/evolution.xml:3036(para)
 msgid "Sender's address."
 msgstr "La dirección del remitente."
 
-#: C/evolution.xml:3019(title)
+#: C/evolution.xml:3039(title)
 msgid "Recipients:"
 msgstr "Destinatarios:"
 
-#: C/evolution.xml:3031(title)
-msgid "Expression:(For programmers only)"
-msgstr "Expresión: (sólo para programadores)"
+#: C/evolution.xml:3051(title)
+msgid "Expression (For programmers only):"
+msgstr "Expresión (sólo para programadores):"
 
-#: C/evolution.xml:3032(para)
+#: C/evolution.xml:3052(para)
 msgid ""
 "Match a message according to an expression you write in the Scheme language "
 "used to define filters in Evolution."
@@ -7450,42 +7457,31 @@ msgstr ""
 "Busca un mensaje que coincida con una expresión escrita en lenguaje Scheme, "
 "utilizado para definir filtros en Evolution."
 
-#: C/evolution.xml:3044(para)
-msgid ""
-"Messages can have labels of Important, Work, Personal, To Do, or Later. You "
-"can set labels with other filters or manually."
-msgstr ""
-"Los mensajes pueden tener las etiquetas Importante, Trabajo, personal, "
-"Tareas pendientes o Más tarde. Puede establecer etiquetas con otros filtros "
-"o manualmente."
-
-#: C/evolution.xml:3059(title)
+#: C/evolution.xml:3079(title)
 msgid "Follow Up:"
 msgstr "Seguimiento:"
 
-#: C/evolution.xml:3067(title)
+#: C/evolution.xml:3087(title)
 msgid "Mailing List:"
 msgstr "Lista de correo:"
 
-#: C/evolution.xml:3071(title)
+#: C/evolution.xml:3091(title)
 msgid "Match all:"
 msgstr "Coincidir con todo:"
 
-#: C/evolution.xml:3072(para)
+#: C/evolution.xml:3092(para)
 msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Comprueba si el mensaje coincide con todos los criterios listados."
 
-#: C/evolution.xml:3076(para)
-msgid "Select the folders where this search folder will search. Your options are:"
-msgstr ""
-"Seleccione las carpetas donde esta carpeta de búsqueda buscará. Sus opciones "
-"son:"
+#: C/evolution.xml:3096(para)
+msgid "Select which folders will be used for the search folder. Your options are:"
+msgstr "Seleccione qué carpetas usará la carpeta de búsqueda. Sus opciones son:"
 
-#: C/evolution.xml:3078(title)
+#: C/evolution.xml:3098(title)
 msgid "All local folders:"
 msgstr "Todas las carpetas locales:"
 
-#: C/evolution.xml:3079(para)
+#: C/evolution.xml:3099(para)
 msgid ""
 "Uses all local folders for the search folder source in addition to "
 "individual folders that are selected."
@@ -7493,11 +7489,11 @@ msgstr ""
 "Usa todas las carpetas locales para la fuente de la carpeta de búsqueda, "
 "además de las carpetas individuales seleccionadas."
 
-#: C/evolution.xml:3082(title)
+#: C/evolution.xml:3102(title)
 msgid "All active remote folders:"
 msgstr "Todas las carpetas remotas activas:"
 
-#: C/evolution.xml:3083(para)
+#: C/evolution.xml:3103(para)
 msgid ""
 "Remote folders are considered active if you are connected to the server; you "
 "must be connected to your mail server for the search folder to include any "
@@ -7509,11 +7505,11 @@ msgstr ""
 "para poder incluir cualquier mensaje de dicho origen además de las carpetas "
 "individuales seleccionadas."
 
-#: C/evolution.xml:3086(title)
+#: C/evolution.xml:3106(title)
 msgid "All local and active remote folders:"
 msgstr "Todas las carpetas locales y remotas activas:"
 
-#: C/evolution.xml:3087(para)
+#: C/evolution.xml:3107(para)
 msgid ""
 "Uses all local and active remote folders for the search folder source in "
 "addition to individual folders that are selected."
@@ -7521,27 +7517,27 @@ msgstr ""
 "Usa todas las carpetas activas remotas y locales para la fuente de la "
 "carpeta de búsqueda, además de las carpetas individuales seleccionadas."
 
-#: C/evolution.xml:3090(title)
+#: C/evolution.xml:3110(title)
 msgid "Specific folders only:"
 msgstr "Únicamente carpetas especificadas:"
 
-#: C/evolution.xml:3091(para)
+#: C/evolution.xml:3111(para)
 msgid "Uses individual folders for the search folder source."
 msgstr "Usa carpetas individuales para la fuente de carpeta de búsqueda."
 
-#: C/evolution.xml:3093(para)
+#: C/evolution.xml:3113(para)
 msgid "If you select Specific folders only,"
 msgstr "Si selecciona Únicamente carpetas especificadas,"
 
-#: C/evolution.xml:3096(para)
+#: C/evolution.xml:3116(para)
 msgid "click Add button to open the Select folder window."
 msgstr "pulse el botón Añadir para abrir la ventana Seleccionar carpeta."
 
-#: C/evolution.xml:3103(para)
+#: C/evolution.xml:3123(para)
 msgid "Select the folder and press Add button."
 msgstr "Seleccione la carpeta y pulse el botón Añadir."
 
-#: C/evolution.xml:3106(para)
+#: C/evolution.xml:3126(para)
 msgid ""
 "You can view the folder added to the list in the entry box at the bottom of "
 "the New Search Folder window."
@@ -7549,9 +7545,10 @@ msgstr ""
 "Puede ver la carpeta añadida a la lista de carpetas en la caja de texto de "
 "la parte inferior de la ventana Carpeta de búsqueda nueva."
 
-#: C/evolution.xml:3117(para)
+#: C/evolution.xml:3137(para)
+#, fuzzy
 msgid ""
-"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/ "
+"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
 "or Bogofilter with trainable Bayesian filters to perform the spam check. "
 "When the software detects mail that appears to be junk mail, it will flag it "
 "and hide it from your view. Messages that are flagged as junk mail are "
@@ -7563,12 +7560,13 @@ msgstr ""
 "marcará y ocultará a su vista. Los mensajes marcados como correo basura sólo "
 "se muestran en la carpeta SPAM."
 
-#: C/evolution.xml:3118(para)
+#: C/evolution.xml:3138(para)
+#, fuzzy
 msgid ""
 "The junk mail filter can learn which kinds of mail are legitimate and which "
 "are not if you train it. When you first start using junk mail blocking, "
 "check the Junk folder to be sure that legitimate mail doesn't get flagged as "
-"junk mail. If good mail, is incorrectly flagged, remove it from the Junk "
+"junk mail. If good mail is incorrectly flagged, remove it from the Junk "
 "folder by right-clicking it and selecting Mark as Not Junk or press Shift"
 "+Ctrl+J. If Evolution misses junk mail, right-click the message, then click "
 "Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize "
@@ -7585,7 +7583,7 @@ msgstr ""
 "reconocer mensajes similares para el futuro y se hace más preciso a medida "
 "que pasa el tiempo."
 
-#: C/evolution.xml:3119(para)
+#: C/evolution.xml:3139(para)
 msgid ""
 "Every filter needs to learn at the least 100 spam and 100 ham to start "
 "working. For that, you must mark each message manually by clicking the "
@@ -7598,18 +7596,23 @@ msgstr ""
 "aprenda que es correo válido. El botón <emphasis>SPAM</emphasis> aprende qué "
 "mensajes son SPAM."
 
-#: C/evolution.xml:3120(para)
+#: C/evolution.xml:3140(para)
 msgid ""
 "To change your junk mail filtering preferences, click Edit &gt; Preferences, "
-"then click Mail Preferences. For more information on this see, <link linkend="
-"\"mail-prefs-junk\">Junk Mail Preferences</link>."
+"then click Mail Preferences."
 msgstr ""
-"Para cambiar las preferencias de sus filtros de correo basura, pulse Editar "
-"&gt; Preferencias, después pulse Opciones de correo. Para obtener más "
-"información acerca de esto, consulte <link linkend=\"mail-prefs-junk"
-"\">Preferencias de spam</link>."
+"Para cambiar sus preferencias de filtrado de correo basura, pulse Editar "
+"&gt; Preferencias, después pulse Opciones de correo."
 
-#: C/evolution.xml:3121(para)
+#: C/evolution.xml:3141(para) C/evolution.xml:5665(para)
+msgid ""
+"For additional information on junk content, see <link linkend=\"mail-prefs-"
+"junk\">Junk Mail Preferences</link>."
+msgstr ""
+"Para información adicional acerca del correo basura, vea <link linkend="
+"\"mail-prefs-junk\">Preferencias de spam</link>."
+
+#: C/evolution.xml:3142(para)
 msgid ""
 "For additional junk mail settings, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -7617,12 +7620,13 @@ msgstr ""
 "Para ver ajustes de correo basura adicionales, consulte <link linkend=\"more-"
 "mail-options\">Opciones de recepción de correo</link>."
 
-#: C/evolution.xml:3123(para)
+#: C/evolution.xml:3144(para)
+#, fuzzy
 msgid ""
 "SpamAssassin is an application that scan through the mail box to find junk "
-"mails. Evolution uses SpamAssassin as the default spam-filtering "
-"application. For more information, see<ulink url=\"http://spamassassin."
-"apache.org/\"> The Apache SpamAssassin Project</ulink>."
+"mail. Evolution uses SpamAssassin as the default spam-filtering application. "
+"For more information, see<ulink url=\"http://spamassassin.apache.org/\"> The "
+"Apache SpamAssassin Project</ulink>."
 msgstr ""
 "SpamAssasin es una aplicación que busca a través del buzón para encontrar "
 "correo basura. Evolution usa SpamAssasin como la aplicación predeterminada "
@@ -7630,7 +7634,7 @@ msgstr ""
 "\"http://spamassassin.apache.org/\">El proyecto SpamAssasin de Apache</"
 "ulink>."
 
-#: C/evolution.xml:3124(para)
+#: C/evolution.xml:3145(para)
 msgid ""
 "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) "
 "by a statistical analysis of the message's header and content (body). It is "
@@ -7645,7 +7649,7 @@ msgstr ""
 "consulte <ulink url=\"http://bogofilter.sourceforge.net/\">el sitio de "
 "Bogofilter</ulink>."
 
-#: C/evolution.xml:3131(para)
+#: C/evolution.xml:3152(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "contacts tool to organize any amount of contact information, share addresses "
@@ -7656,32 +7660,33 @@ msgstr ""
 "información sobre contactos, compartir direcciones a través de una red y "
 "ahorrar tiempo con las tareas cotidianas."
 
-#: C/evolution.xml:3134(link) C/evolution.xml:3151(title)
+#: C/evolution.xml:3155(link) C/evolution.xml:3172(title)
 msgid "Contacts and Cards"
 msgstr "Contactos y tarjetas"
 
-#: C/evolution.xml:3137(link) C/evolution.xml:3246(title)
+#: C/evolution.xml:3158(link) C/evolution.xml:3264(title)
 msgid "Searching for Contacts"
 msgstr "Búsqueda de contactos"
 
-#: C/evolution.xml:3140(link) C/evolution.xml:3397(title)
+#: C/evolution.xml:3161(link) C/evolution.xml:3415(title)
 msgid "Organizing your Contacts"
 msgstr "Organizar sus contactos"
 
-#: C/evolution.xml:3143(link) C/evolution.xml:3513(title)
+#: C/evolution.xml:3164(link) C/evolution.xml:3531(title)
 msgid "LDAP: Shared Address Books on a Network"
 msgstr "LDAP: libretas de direcciones compartidas en una red"
 
-#: C/evolution.xml:3146(link) C/evolution.xml:3536(title)
+#: C/evolution.xml:3167(link) C/evolution.xml:3554(title)
 msgid "Send Me a Card: Adding New Cards Quickly"
 msgstr "Envíeme una tarjeta: Cómo añadir tarjetas rápidamente"
 
-#: C/evolution.xml:3152(para)
+#: C/evolution.xml:3173(para)
+#, fuzzy
 msgid ""
 "Contacts are the individuals you have chosen to add to your address book so "
-"you can keep track of information about them and send e-mail to them. In "
-"Evolution, an individual contact is called a card.For more information on "
-"organizing your contact list see <link linkend=\"usage-contact-organize"
+"you can keep track of information about them and send email to them. In "
+"Evolution, an individual contact is called a card. For more information on "
+"organizing your contacts see <link linkend=\"usage-contact-organize"
 "\">Organizing your Contacts</link>. To learn about configuring the contacts "
 "tool, refer <link linkend=\"config-prefs-contact\">Contact Management</link>."
 msgstr ""
@@ -7693,11 +7698,11 @@ msgstr ""
 "sus contactos</link>. Para aprender a configurar la herramienta de contactos "
 "vea <link linkend=\"config-prefs-contact\">Gestión de contactos</link>."
 
-#: C/evolution.xml:3155(title)
+#: C/evolution.xml:3176(title)
 msgid "The Contact Editor"
 msgstr "El editor de contactos"
 
-#: C/evolution.xml:3156(para)
+#: C/evolution.xml:3177(para)
 msgid ""
 "If you want to add or change cards, use the contact editor. You can edit "
 "email address, telephone numbers, mailer addresses and all other contact "
@@ -7708,23 +7713,23 @@ msgstr ""
 "mensajería instantánea y el resto de la información que ha introducido para "
 "un contacto en particular."
 
-#: C/evolution.xml:3157(para)
+#: C/evolution.xml:3178(para)
 msgid "The contact editor window has three tabs:"
 msgstr "La ventana del editor de contactos tiene tres solapas:"
 
-#: C/evolution.xml:3159(title)
-msgid "Contacts:"
-msgstr "Contactos:"
+#: C/evolution.xml:3180(title)
+msgid "Contact:"
+msgstr "Contacto:"
 
-#: C/evolution.xml:3160(para)
+#: C/evolution.xml:3181(para)
 msgid "Contains basic contact information."
 msgstr "Contiene la información básica del contacto."
 
-#: C/evolution.xml:3163(title)
+#: C/evolution.xml:3184(title)
 msgid "Personal Information:"
 msgstr "Información personal:"
 
-#: C/evolution.xml:3164(para)
+#: C/evolution.xml:3185(para)
 msgid ""
 "Contains a more specific description of the person, including URLs for "
 "calendar and free/busy information."
@@ -7732,36 +7737,30 @@ msgstr ""
 "Contiene una descripción más específica de la persona, incluyendo URL para "
 "el calendario e información de disponibilidad."
 
-#: C/evolution.xml:3167(title)
+#: C/evolution.xml:3188(title)
 msgid "Mailing Address:"
 msgstr "Dirección de correo:"
 
-#: C/evolution.xml:3168(para)
+#: C/evolution.xml:3189(para)
 msgid "Contains the individual's mailing address."
 msgstr "Contiene las direcciones de correo individuales."
 
-#: C/evolution.xml:3170(para)
+#: C/evolution.xml:3191(para)
+#, fuzzy
 msgid ""
-"You can also use Action Menu to find Forward Contact, which opens a new "
-"message with the card already attached, and Send Message to Contact, which "
-"opens a new message to the contact's e-mail address."
+"You can also the Forward Contact menu item in the Action menu, which opens a "
+"new message with the card already attached, and Send Message to Contact, "
+"which opens a new message to the contact's email address."
 msgstr ""
 "También puede usar el menú Acciones para Reenviar un contacto, lo que abrirá "
 "un nuevo mensaje con la tarjeta adjuntada, y Enviar mensaje al contacto, que "
 "abrirá un nuevo mensaje con la dirección de correo-e del contacto."
 
-#: C/evolution.xml:3171(para)
+#: C/evolution.xml:3192(para)
+#, fuzzy
 msgid ""
-"From the Contact Editor toolbar, you can save and close, print, close, or "
-"delete the contact."
-msgstr ""
-"Desde la barra de herramientas del Editor de contactos puede guardar y "
-"cerrar, imprimir, cerrar o borrar el contacto."
-
-#: C/evolution.xml:3172(para)
-msgid ""
-"You can add card from within an e-mail message or calendar appointment. In "
-"an open e-mail, right-click any e-mail address or message, and click Add to "
+"You can add a card from within an email message or calendar appointment. In "
+"an open email, right-click any email address or message, and click Add to "
 "Address Book or select Add Sender to Address Book from the Message menu."
 msgstr ""
 "Puede añadir tarjetas a partir de un mensaje de correo-e o de una cita del "
@@ -7769,7 +7768,7 @@ msgstr ""
 "dirección o mensaje de correo electrónico, y elija en el menú Añadir "
 "remitente a la libreta de direcciones."
 
-#: C/evolution.xml:3173(para)
+#: C/evolution.xml:3193(para)
 msgid ""
 "Most of the items in the contact editor simply display the information you "
 "enter, but some of them have additional features:"
@@ -7778,20 +7777,21 @@ msgstr ""
 "la información que haya introducido, pero algunos de ellos tienen "
 "características adicionales:"
 
-#: C/evolution.xml:3175(title)
+#: C/evolution.xml:3195(title)
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: C/evolution.xml:3176(para)
+#: C/evolution.xml:3196(para)
+#, fuzzy
 msgid ""
 "Specify the name of your contact here. You can type a name into the Full "
 "Name field, but you can also click the Full Name button to bring up a small "
 "dialog box with text boxes for first and last names, titles like <quote>Mr.</"
 "quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</"
 "quote> The Full Name field also interacts with the File Under box to help "
-"you organize your contacts and to handle multi-word surnames.To see how it "
-"works, type a name in the Full Name field. As an example, we'll use Miguel "
-"de Icaza. You'll notice that the File Under field also fills in, but in "
+"you organize your contacts and to handle multi-word surnames. To see how it "
+"works, type a name in the Full Name field. As an example, we will use Miguel "
+"de Icaza. You will notice that the File Under field also fills in, but in "
 "reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts "
 "editor would have correctly guessed that the entry should be filed under "
 "<quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</"
@@ -7813,11 +7813,11 @@ msgstr ""
 "<quote>de Icaza</quote> tiene dos palabras y para ordenarlo correctamente "
 "debe introducir de Icaza, Miguel en el campo Archivar como."
 
-#: C/evolution.xml:3179(title)
+#: C/evolution.xml:3199(title)
 msgid "Where:"
 msgstr "Dónde:"
 
-#: C/evolution.xml:3180(para)
+#: C/evolution.xml:3200(para)
 msgid ""
 "Select one of your address books as the location for this contact. You might "
 "not be able to write to all available address books, especially those on a "
@@ -7827,11 +7827,11 @@ msgstr ""
 "contacto. Quizá no pueda escribir en todas las libretas de direcciones, "
 "especialmente en aquellas de una red."
 
-#: C/evolution.xml:3183(title)
+#: C/evolution.xml:3203(title)
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: C/evolution.xml:3184(para)
+#: C/evolution.xml:3204(para)
 msgid ""
 "Click the Categories button to select categories for this card. If you "
 "assign contact categories, you can then search for contacts using those "
@@ -7844,11 +7844,11 @@ msgstr ""
 "contactos, vea <link linkend=\"usage-contact-organize\">Organizar sus "
 "contactos</link>."
 
-#: C/evolution.xml:3187(title)
+#: C/evolution.xml:3207(title)
 msgid "Free/Busy and Calendar URLs:"
 msgstr "URL de Disponibilidad y Calendario:"
 
-#: C/evolution.xml:3188(para)
+#: C/evolution.xml:3208(para)
 msgid ""
 "Click the Personal Information tab to enter Web addresses for the contact. "
 "If the contact publishes Free/Busy or calendar data online, using a server "
@@ -7862,75 +7862,67 @@ msgstr ""
 "direcciones para esos servidores aquí. Después de hacerlo, puede comprobar "
 "sus horarios cuando cree citas con el Calendario."
 
-#: C/evolution.xml:3193(title)
+#: C/evolution.xml:3213(title)
 msgid "Creating and Editing Contacts"
 msgstr "Crear y editar contactos"
 
-#: C/evolution.xml:3194(para)
+#: C/evolution.xml:3214(para)
 msgid "Follow the steps given below to create a new card."
 msgstr "Siga los pasos dados debajo para crear una nueva tarjeta."
 
-#: C/evolution.xml:3197(para)
-msgid "Click the down arrow key next to the New button in the toolbar"
-msgstr ""
-"Pulse el botón de flecha abajo junto al botón Nuevo en la barra de "
-"herramientas."
+#: C/evolution.xml:3217(para)
+msgid "Click File &gt; New &gt; Contact."
+msgstr "Pulse Archivo &gt; Nuevo &gt; Contacto."
 
-#: C/evolution.xml:3200(para)
-msgid ""
-"Select Contacts from the drop-down list or press Shift+Ctrl+C to appear "
-"Contact Editor."
-msgstr ""
-"Seleccione Contactos de la lista desplegable o pulse Mayús+Ctrl+C para "
-"mostrar el Editor de contactos."
-
-#: C/evolution.xml:3203(para)
+#: C/evolution.xml:3220(para)
 msgid "Enter the contact information to the entry boxes provided."
 msgstr "Introduzca la información del contacto en las cajas de texto proporcionadas."
 
-#: C/evolution.xml:3209(para)
+#: C/evolution.xml:3226(para)
 msgid "If you want to change a card that already exists,"
 msgstr "Si quiere modificar una tarjeta que ya existe,"
 
-#: C/evolution.xml:3212(para)
-msgid "Press Contact tool from the Switcher to appear the Contact list."
+#: C/evolution.xml:3229(para)
+msgid ""
+"Go to the Contacts window by selecting View &gt; Window &gt; Contacts from "
+"the menubar."
 msgstr ""
-"Pulse la herramienta Contactos del Selector para mostrar la lista de "
-"Contactos."
+"Vaya a la ventana de Contactos seleccionando Ver &gt; Ventana &gt; Contactos "
+"desde la barra de menú."
 
-#: C/evolution.xml:3215(para)
+#: C/evolution.xml:3232(para)
 msgid "Double click on the card you want to edit."
 msgstr "Pulse dos veces en la tarjeta que quiera editar."
 
-#: C/evolution.xml:3218(para)
-msgid "Edit from the Contact Editor window."
-msgstr "Edite desde la ventana del editor de contactos."
+#: C/evolution.xml:3235(para) C/evolution.xml:3255(para)
+msgid "Edit the information in the Contact Editor window."
+msgstr "Edite la información en la ventana del editor de contactos."
 
-#: C/evolution.xml:3224(para)
-msgid "You can also edit the contact information from the message list."
-msgstr "También puede editar la información del contacto desde la lista de mensajes."
+#: C/evolution.xml:3241(para)
+msgid "You can also edit the contact information from the preview pane."
+msgstr ""
+"También puede editar la información del contacto desde el panel de vista "
+"previa."
 
-#: C/evolution.xml:3227(para)
-msgid "Right click on the address from Message Header"
+#: C/evolution.xml:3244(para)
+msgid "Right click on the address from Message Header."
 msgstr "Pulse con el botón derecho en la dirección desde Cabeceras del mensaje."
 
-#: C/evolution.xml:3230(para)
-msgid "Select Add to Address Book to appear Contact Quick-Add window"
+#: C/evolution.xml:3247(para)
+msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
 msgstr ""
 "Seleccione Añadir a la libreta de direcciones para mostrar la ventana Añadir "
-"contacto rápido"
+"contacto rápido."
 
-#: C/evolution.xml:3235(para)
-msgid "Press Edit Full tab at the bottom left to appear Contact Editor window"
+#: C/evolution.xml:3252(para)
+msgid ""
+"Press the Edit Full button at the bottom left to bring up the Contact Editor "
+"window."
 msgstr ""
 "Pulse la solapa Editar todo en la parte inferior izquierda para mostrar la "
-"ventana del Editor de contactos"
-
-#: C/evolution.xml:3238(para)
-msgid "Edit the required information from Contact Editor and press OK."
-msgstr "Edite la información necesaria en el editor de contactos y pulse Aceptar."
+"ventana del Editor de contactos."
 
-#: C/evolution.xml:3249(para)
+#: C/evolution.xml:3267(para)
 msgid ""
 "Evolution enables you to find the contact address quickly by using "
 "Customized Search. To find the contact address you are looking for, use the "
@@ -7940,35 +7932,28 @@ msgstr ""
 "Búsqueda personalizada. Para buscar la dirección del contacto que está "
 "buscando, use el siguiente procedimiento:"
 
-#: C/evolution.xml:3253(para)
-msgid ""
-"Click <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/> "
-"to expand the drop-down list."
-msgstr ""
-"Pulse <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/> "
-"para expandir la lista desplegable."
-
-#: C/evolution.xml:3256(para)
+#: C/evolution.xml:3274(para) C/evolution.xml:4145(para)
+#: C/evolution.xml:4461(para) C/evolution.xml:4697(para)
 msgid "Specify the search criteria from any of the following:"
 msgstr "Especifique el criterio de búsqueda entre cualquiera de los siguientes:"
 
-#: C/evolution.xml:3259(para)
+#: C/evolution.xml:3277(para)
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: C/evolution.xml:3262(para)
+#: C/evolution.xml:3280(para)
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
-#: C/evolution.xml:3265(para)
+#: C/evolution.xml:3283(para)
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: C/evolution.xml:3270(para)
+#: C/evolution.xml:3288(para)
 msgid "Press Enter to begin the search"
 msgstr "Pulse Intro para iniciar la búsqueda"
 
-#: C/evolution.xml:3273(para)
+#: C/evolution.xml:3291(para)
 msgid ""
 "For a more complex search, select Search Advanced and select criteria that "
 "describe your desired contact:"
@@ -7976,31 +7961,19 @@ msgstr ""
 "Para una búsqueda más compleja, seleccione Búsqueda avanzada y seleccione el "
 "criterio que describe el contacto que desea:"
 
-#: C/evolution.xml:3276(para)
+#: C/evolution.xml:3294(para)
 msgid "Name the rule in the Rule Name field."
 msgstr "Escriba un nombre para la regla en el campo Nombre de la regla."
 
-#: C/evolution.xml:3279(para)
+#: C/evolution.xml:3297(para)
 msgid "Set up your criteria in the Find items field."
 msgstr "Configure el criterio en el campo Buscar elementos."
 
-#: C/evolution.xml:3282(para)
+#: C/evolution.xml:3300(para)
 msgid "Select Add to add additional criteria."
 msgstr "Seleccione Añadir para añadir el criterio adicional."
 
-#: C/evolution.xml:3285(para)
-msgid "Click Search."
-msgstr "Pulse Buscar."
-
-#: C/evolution.xml:3288(para)
-msgid ""
-"To show all your contacts, Click Clear in the search bar or search with an "
-"empty query."
-msgstr ""
-"Para mostrar todos los contactos pulse Limpiar en la barra de búsqueda o "
-"busque con una cadena vacía."
-
-#: C/evolution.xml:3291(para)
+#: C/evolution.xml:3309(para)
 msgid ""
 "Displays all the contacts that match the built-in criteria you have selected "
 "from the drop-down list at the top left side, just above the Display pane."
@@ -8009,174 +7982,169 @@ msgstr ""
 "seleccionado de la lista desplegable en la parte izquierda, justo encima del "
 "panel de visualización."
 
-#: C/evolution.xml:3293(para)
+#: C/evolution.xml:3311(para)
 msgid "To perform quick search, use the following procedure:"
 msgstr "Para realizar una búsqueda rápida, use el siguiente procedimiento:"
 
-#: C/evolution.xml:3296(para)
-msgid "Click show to expand the drop-down list."
-msgstr "Pulse mostrar para expandir la lista desplegable."
-
-#: C/evolution.xml:3299(para)
-msgid "Select the search criteria from any of the following:"
-msgstr "Seleccione el criterio de búsqueda de cualquiera de los siguientes:"
-
-#: C/evolution.xml:3302(para) C/evolution.xml:4191(para)
-#: C/evolution.xml:4540(para) C/evolution.xml:4735(para)
+#: C/evolution.xml:3320(para) C/evolution.xml:4213(para)
+#: C/evolution.xml:4564(para) C/evolution.xml:4759(para)
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: C/evolution.xml:3305(para) C/evolution.xml:4194(para)
-#: C/evolution.xml:4543(para) C/evolution.xml:4738(para)
+#: C/evolution.xml:3323(para) C/evolution.xml:4216(para)
+#: C/evolution.xml:4567(para) C/evolution.xml:4762(para)
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: C/evolution.xml:3308(para) C/evolution.xml:4197(para)
-#: C/evolution.xml:4546(para) C/evolution.xml:4741(para)
+#: C/evolution.xml:3326(para) C/evolution.xml:4219(para)
+#: C/evolution.xml:4570(para) C/evolution.xml:4765(para)
 msgid "Business"
 msgstr "Trabajo"
 
-#: C/evolution.xml:3311(para) C/evolution.xml:4200(para)
-#: C/evolution.xml:4549(para) C/evolution.xml:4744(para)
+#: C/evolution.xml:3329(para) C/evolution.xml:4222(para)
+#: C/evolution.xml:4573(para) C/evolution.xml:4768(para)
 msgid "Competition"
 msgstr "Autocompletado"
 
-#: C/evolution.xml:3314(para) C/evolution.xml:4747(para)
+#: C/evolution.xml:3332(para) C/evolution.xml:4771(para)
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: C/evolution.xml:3317(para) C/evolution.xml:4206(para)
-#: C/evolution.xml:4555(para) C/evolution.xml:4750(para)
+#: C/evolution.xml:3335(para) C/evolution.xml:4228(para)
+#: C/evolution.xml:4579(para) C/evolution.xml:4774(para)
 msgid "Gifts"
 msgstr "Regalos"
 
-#: C/evolution.xml:3320(para) C/evolution.xml:4209(para)
-#: C/evolution.xml:4558(para) C/evolution.xml:4753(para)
+#: C/evolution.xml:3338(para) C/evolution.xml:4231(para)
+#: C/evolution.xml:4582(para) C/evolution.xml:4777(para)
 msgid "Goals/Objectives"
 msgstr "Metas/Objetivos"
 
-#: C/evolution.xml:3323(para)
+#: C/evolution.xml:3341(para) C/evolution.xml:4234(para)
 msgid "Holiday"
 msgstr "Fiesta"
 
-#: C/evolution.xml:3326(para) C/evolution.xml:4215(para)
-#: C/evolution.xml:4564(para) C/evolution.xml:4759(para)
+#: C/evolution.xml:3344(para) C/evolution.xml:4237(para)
+#: C/evolution.xml:4588(para) C/evolution.xml:4783(para)
 msgid "Holiday Cards"
 msgstr "Tarjetas de vacaciones"
 
-#: C/evolution.xml:3329(para)
+#: C/evolution.xml:3347(para)
 msgid "Hot Contacts"
 msgstr "Contactos"
 
-#: C/evolution.xml:3332(para) C/evolution.xml:4218(para)
-#: C/evolution.xml:4567(para) C/evolution.xml:4762(para)
+#: C/evolution.xml:3350(para) C/evolution.xml:4240(para)
+#: C/evolution.xml:4591(para) C/evolution.xml:4786(para)
 msgid "Ideas"
 msgstr "Ideas"
 
-#: C/evolution.xml:3335(para) C/evolution.xml:4221(para)
-#: C/evolution.xml:4570(para) C/evolution.xml:4765(para)
+#: C/evolution.xml:3353(para) C/evolution.xml:4243(para)
+#: C/evolution.xml:4594(para) C/evolution.xml:4789(para)
 msgid "International"
 msgstr "Internacional"
 
-#: C/evolution.xml:3338(para)
+#: C/evolution.xml:3356(para) C/evolution.xml:4246(para)
 msgid "Key Customer"
 msgstr "Cliente clave"
 
-#: C/evolution.xml:3341(para) C/evolution.xml:4227(para)
-#: C/evolution.xml:4576(para) C/evolution.xml:4771(para)
+#: C/evolution.xml:3359(para) C/evolution.xml:4249(para)
+#: C/evolution.xml:4600(para) C/evolution.xml:4795(para)
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: C/evolution.xml:3347(para) C/evolution.xml:4233(para)
-#: C/evolution.xml:4582(para) C/evolution.xml:4777(para)
+#: C/evolution.xml:3365(para) C/evolution.xml:4255(para)
+#: C/evolution.xml:4606(para) C/evolution.xml:4801(para)
 msgid "Phone Calls"
 msgstr "Llamadas de teléfono"
 
-#: C/evolution.xml:3353(para) C/evolution.xml:4239(para)
-#: C/evolution.xml:4588(para) C/evolution.xml:4783(para)
+#: C/evolution.xml:3371(para) C/evolution.xml:4261(para)
+#: C/evolution.xml:4612(para) C/evolution.xml:4807(para)
 msgid "Strategies"
 msgstr "Estrategias"
 
-#: C/evolution.xml:3356(para) C/evolution.xml:4242(para)
-#: C/evolution.xml:4591(para) C/evolution.xml:4786(para)
+#: C/evolution.xml:3374(para) C/evolution.xml:4264(para)
+#: C/evolution.xml:4615(para) C/evolution.xml:4810(para)
 msgid "Suppliers"
 msgstr "Proveedores"
 
-#: C/evolution.xml:3359(para)
-msgid "Time &amp;Expenses"
+#: C/evolution.xml:3377(para) C/evolution.xml:4267(para)
+#: C/evolution.xml:4618(para) C/evolution.xml:4813(para)
+msgid "Time &amp; Expenses"
 msgstr "Tiempo y gastos"
 
-#: C/evolution.xml:3362(para) C/evolution.xml:4248(para)
-#: C/evolution.xml:4597(para) C/evolution.xml:4792(para)
+#: C/evolution.xml:3380(para) C/evolution.xml:4270(para)
+#: C/evolution.xml:4621(para) C/evolution.xml:4816(para)
 msgid "VIP"
 msgstr "VIP"
 
-#: C/evolution.xml:3365(para) C/evolution.xml:4251(para)
-#: C/evolution.xml:4600(para) C/evolution.xml:4795(para)
+#: C/evolution.xml:3383(para) C/evolution.xml:4273(para)
+#: C/evolution.xml:4624(para) C/evolution.xml:4819(para)
 msgid "Waiting"
 msgstr "Esperando"
 
-#: C/evolution.xml:3368(para)
-msgid "Weather:Cloudy"
+#: C/evolution.xml:3386(para)
+msgid "Weather: Cloudy"
 msgstr "Meteorología: Nuboso"
 
-#: C/evolution.xml:3371(para)
-msgid "Weather:Fog"
+#: C/evolution.xml:3389(para)
+msgid "Weather: Fog"
 msgstr "Meteorología: Niebla"
 
-#: C/evolution.xml:3374(para)
-msgid "Weather:Partly Cloudy"
+#: C/evolution.xml:3392(para)
+msgid "Weather: Partly Cloudy"
 msgstr "Meteorología: Parcialmente nuboso"
 
-#: C/evolution.xml:3377(para)
-msgid "Weather:Rain"
+#: C/evolution.xml:3395(para)
+msgid "Weather: Rain"
 msgstr "Meteorología: Lluvia"
 
-#: C/evolution.xml:3380(para)
-msgid "Weather:Snow"
+#: C/evolution.xml:3398(para)
+msgid "Weather: Snow"
 msgstr "Meteorología: Nieve"
 
-#: C/evolution.xml:3383(para)
-msgid "Weather:Sunny"
+#: C/evolution.xml:3401(para)
+msgid "Weather: Sunny"
 msgstr "Meteorología: Soleado"
 
-#: C/evolution.xml:3386(para)
-msgid "Weather:Thunderstorms"
+#: C/evolution.xml:3404(para)
+msgid "Weather: Thunderstorms"
 msgstr "Meteorología: Tormenta"
 
-#: C/evolution.xml:3391(para)
+#: C/evolution.xml:3409(para)
 msgid "Evolution displays the desired contacts."
 msgstr "Evolution muestra los contactos deseados."
 
-#: C/evolution.xml:3398(para)
+#: C/evolution.xml:3416(para)
+#, fuzzy
 msgid ""
-"Evolution allows you to organize your contact list. You can create several "
-"individual address books, or contact groups. Within a given address book, "
-"you can have several categories of contacts."
+"Evolution allows you to organize your contacts. You can create several "
+"individual address books, or contact lists. Within a given address book, you "
+"can have several categories of contacts."
 msgstr ""
 "Evolution le permite organizar su lista de contactos. Puede crear varias "
 "libretas de direcciones individuales o grupos de contactos. Dentro de una "
 "libreta de direcciones dada puede tener varias categorías para los contactos."
 
-#: C/evolution.xml:3401(link) C/evolution.xml:3415(title)
+#: C/evolution.xml:3419(link) C/evolution.xml:3433(title)
 msgid "Contacts Groups"
 msgstr "Grupos de contactos"
 
-#: C/evolution.xml:3404(link) C/evolution.xml:3437(title)
+#: C/evolution.xml:3422(link) C/evolution.xml:3455(title)
 msgid "Creating a List of Contacts"
 msgstr "Crear una lista de contactos"
 
-#: C/evolution.xml:3407(link) C/evolution.xml:3469(title)
+#: C/evolution.xml:3425(link) C/evolution.xml:3487(title)
 msgid "Grouping with Categories"
 msgstr "Agrupación por categorías"
 
-#: C/evolution.xml:3410(link) C/evolution.xml:3530(title)
+#: C/evolution.xml:3428(link) C/evolution.xml:3548(title)
 msgid "Configuring Evolution to use LDAP"
 msgstr "Configuración de Evolution para utilizar LDAP"
 
-#: C/evolution.xml:3416(para)
+#: C/evolution.xml:3434(para)
+#, fuzzy
 msgid ""
-"Contacts Groups are nothing but Address Books.The simplest way to organize "
+"Contacts Groups are nothing but Address Books. The simplest way to organize "
 "contacts is to create additional address books. You can create a new one by "
 "clicking File &gt; New &gt; Address Book. For contacts groups on your "
 "computer, you only need to provide a name. For contacts on the network, you "
@@ -8190,21 +8158,24 @@ msgstr ""
 "proporcionar un nombre. Para los contactos en la red debe proporcionar más "
 "información acerca del servidor de contactos al que está intentando acceder."
 
-#: C/evolution.xml:3417(para)
+#: C/evolution.xml:3435(para)
+#, fuzzy
 msgid ""
 "To move a card from one group to another, just drag it from the main display "
-"of contacts. You cannot change the contents of most network contact groups."
+"of contacts and drop it to a different group. You cannot change the contents "
+"of most network contact groups."
 msgstr ""
 "Para mover una tarjeta de un grupo a otro, simplemente arrástrela de la "
 "vista general de contactos. No puede modificar el contenido de la mayoría de "
 "los contactos de red."
 
-#: C/evolution.xml:3419(para)
+#: C/evolution.xml:3437(para)
+#, fuzzy
 msgid ""
 "Contacts groups are not the same as contact lists. A contact group is like a "
 "folder or address book full of contacts. A contact list is a single contact "
-"that contains other contacts, and is most often used to e-mail several "
-"people at once."
+"that contains other contacts, and is most often used to email several people "
+"at once."
 msgstr ""
 "Los grupos de contactos no son lo mismo que una lista de contactos. Un grupo "
 "de contactos es como una carpeta o libreta de direcciones llena de "
@@ -8212,11 +8183,11 @@ msgstr ""
 "contactos y generalmente se usa para enviar correos electrónicos a varias "
 "personas a la vez."
 
-#: C/evolution.xml:3424(title)
+#: C/evolution.xml:3442(title)
 msgid "Importing Contacts"
 msgstr "Importar contactos"
 
-#: C/evolution.xml:3425(para)
+#: C/evolution.xml:3443(para)
 msgid ""
 "You can import contacts from other contact management tools with the Import "
 "tool."
@@ -8224,11 +8195,11 @@ msgstr ""
 "Puede importar contactos desde otra herramienta de gestión de contactos con "
 "la herramienta Importar."
 
-#: C/evolution.xml:3430(para)
+#: C/evolution.xml:3448(para)
 msgid "Mail yourself a contact as vCard attachment."
 msgstr "Envíese a si mismo un contacto como un adjunto vCard."
 
-#: C/evolution.xml:3431(para)
+#: C/evolution.xml:3449(para)
 msgid ""
 "Currently VCF and LDIF are supported. CSV and TAB format files are supported "
 "from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
@@ -8236,13 +8207,14 @@ msgstr ""
 "Actualmente se soportan VCF y LDIF. Los formatos CSV y TAB están soportados "
 "desde Miscrosoft Outlook, Thunderbird, Mozilla  y Evolution."
 
-#: C/evolution.xml:3438(para)
+#: C/evolution.xml:3456(para)
+#, fuzzy
 msgid ""
 "A contact list is a set of contacts with a single nickname that you create. "
-"When you send e-mail to the nickname, it is sent to every member of the "
-"list. This differs from a network mailing list in that it exists only on "
-"your computer as a convenience to you, rather than as an actual e-mail "
-"address managed by a mailing list application on a server."
+"When you send email to the nickname, it is sent to every member of the list. "
+"This differs from a network mailing list in that it exists only on your "
+"computer as a convenience to you, rather than as an actual email address "
+"managed by a mailing list application on a server."
 msgstr ""
 "Una lista de contactos es un juego de contactos que cree con un solo apodo. "
 "Cuando envíe correos electrónicos al apodo, se envía a cada miembro de la "
@@ -8250,11 +8222,12 @@ msgstr ""
 "para su conveniencia, en lugar de ser una dirección de correo real "
 "gestionada por una aplicación para listas de correo en un servidor."
 
-#: C/evolution.xml:3439(para)
+#: C/evolution.xml:3457(para)
+#, fuzzy
 msgid ""
 "For example, you could create one card for each family member, then add "
 "those cards to a contact list called <quote>Family.</quote> Then, instead of "
-"entering each person's e-mail address individually, you can send e-mail to "
+"entering each person's email address individually, you can send email to "
 "<quote>Family</quote> and the message would go to all of them."
 msgstr ""
 "Por ejemplo, puede crear una tarjeta para cada miembro de su familia, "
@@ -8263,46 +8236,49 @@ msgstr ""
 "correo electrónico de cada persona individualmente, puede enviar un correo "
 "electrónico a <quote>Familia</quote> y el mensaje se enviará a todos ellos."
 
-#: C/evolution.xml:3440(para)
+#: C/evolution.xml:3458(para)
 msgid "To create a list of contacts:"
 msgstr "Para crear una lista de contactos:"
 
-#: C/evolution.xml:3443(para)
+#: C/evolution.xml:3461(para)
 msgid "Open the list creation dialog box by clicking the New List button."
 msgstr ""
 "Abra el cuadro de diálogo de creación de listas pulsando el botón Nueva "
 "lista."
 
-#: C/evolution.xml:3445(para)
+#: C/evolution.xml:3463(para)
 msgid "Click File &gt; New &gt; Contact List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de contactos."
 
-#: C/evolution.xml:3448(para)
+#: C/evolution.xml:3466(para)
 msgid "Specify a name for the list."
 msgstr "Especifique un nombre para la lista."
 
-#: C/evolution.xml:3451(para)
-msgid "Specify the names or e-mail addresses of contacts."
+#: C/evolution.xml:3469(para)
+#, fuzzy
+msgid "Specify the names or email addresses of contacts."
 msgstr "Especifique los nombres o direcciones de correo-e de los contactos."
 
-#: C/evolution.xml:3453(para)
+#: C/evolution.xml:3471(para)
 msgid "Drag contacts from the main window into the list."
 msgstr "Arrastre los contactos desde la ventana principal hasta la lista."
 
-#: C/evolution.xml:3456(para)
+#: C/evolution.xml:3474(para)
+#, fuzzy
 msgid ""
-"Choose whether you want to hide the e-mail addresses when you send a message "
+"Choose whether you want to hide the email addresses when you send a message "
 "to the list."
 msgstr ""
 "Elija si quiere ocultar las direcciones de los correos-e cuando envíe un "
 "mensaje a la lista."
 
-#: C/evolution.xml:3457(para)
+#: C/evolution.xml:3475(para)
+#, fuzzy
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
 "addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
 "feature discussed in <link linkend=\"usage-mail-getnsend-send-to-types"
-"\">Specifying Additional Recipients for E-Mail</link>."
+"\">Specifying Additional Recipients for Email</link>."
 msgstr ""
 "A no ser que sea una lista muy pequeña, es recomendable que oculte las "
 "direcciones. Este funcionamiento es similar al de la característica "
@@ -8310,24 +8286,26 @@ msgstr ""
 "to-types\">Especificar destinatarios adicioneles para correo electrónico</"
 "link>."
 
-#: C/evolution.xml:3460(para)
+#: C/evolution.xml:3478(para)
 msgid "When you are finished, click OK."
 msgstr "Cuando termine, pulse Aceptar."
 
-#: C/evolution.xml:3463(para)
+#: C/evolution.xml:3481(para)
+#, fuzzy
 msgid ""
 "The list appears as a contact card, which you can use as you would any other "
-"card, including mailing the list to another person and sending e-mail to the "
+"card, including mailing the list to another person and sending email to the "
 "list."
 msgstr ""
 "La lista aparece como una tarjeta de contacto que puede utilizar como las "
 "demás, incluyendo la posibilidad de enviar la lista a otra persona y la de "
 "enviar un mensaje a la lista."
 
-#: C/evolution.xml:3464(para)
+#: C/evolution.xml:3482(para)
+#, fuzzy
 msgid ""
-"To mail the list, open a new e-mail and type the name you chose for the "
-"list. Evolution addresses the message to the entire list when you send the "
+"To mail the list, open a new email and type the name you chose for the list. "
+"Evolution addresses the message to the entire list when you send the "
 "message. You can also right-click the list's address card in the contacts "
 "tool and select Send Message to List."
 msgstr ""
@@ -8337,18 +8315,18 @@ msgstr ""
 "tarjeta correspondiente en la libreta de direcciones, y seleccionar Enviar "
 "un mensaje a la lista."
 
-#: C/evolution.xml:3465(para)
+#: C/evolution.xml:3483(para)
 msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
 msgstr "Evolution no puede almacenar listas de contactos en servidores Exchange."
 
-#: C/evolution.xml:3470(para)
+#: C/evolution.xml:3488(para)
+#, fuzzy
 msgid ""
 "Another way to group cards is to mark them as belonging to different "
 "categories. You can mark a card as being in several categories or no "
 "category at all. For example, you put a friend's card in the "
-"<guilabel>Business</guilabel> category because he works with you, the "
-"<guilabel>Friends</guilabel> category because he's a friend, and the "
-"<guilabel>Frequent</guilabel> category because you call him often."
+"<guilabel>Business</guilabel> category because he works with you and the "
+"<guilabel>Friends</guilabel> category because he's a friend."
 msgstr ""
 "Otro método para agrupar tarjetas consiste en marcarlas como pertenecientes "
 "a diferentes categorías. Por tanto, puede asociar una tarjeta con numerosas "
@@ -8357,25 +8335,26 @@ msgstr ""
 "categoría <guilabel>Amigos</guilabel> porque es un amigo y en la categoría "
 "<guilabel>Frecuentes</guilabel> porque lo llama frecuentemente."
 
-#: C/evolution.xml:3471(para)
+#: C/evolution.xml:3489(para)
 msgid "To mark a card as belonging to a category,"
 msgstr "Para marcar una tarjeta como perteneciente a una categoría,"
 
-#: C/evolution.xml:3474(para)
+#: C/evolution.xml:3492(para)
 msgid "Double click the card to appear the Contact Editor window"
 msgstr ""
 "Pulse dos veces sobre la tarjeta para que aparezca la ventana del Editor de "
 "contactos"
 
-#: C/evolution.xml:3477(para)
+#: C/evolution.xml:3495(para)
 msgid "Click the Categories button at the left."
 msgstr "Pulse el botón Categorías de la izquierda."
 
-#: C/evolution.xml:3478(para)
-msgid "You can view the Categories dialogue box as given below."
+#: C/evolution.xml:3496(para)
+#, fuzzy
+msgid "You can view the Categories dialog box as given below."
 msgstr "Puede ver el cuadro de diálogo de Categorías tal y como se ve debajo."
 
-#: C/evolution.xml:3490(para)
+#: C/evolution.xml:3508(para)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
@@ -8383,44 +8362,42 @@ msgstr ""
 "Seleccione la categoría de la lista. Puede seleccionar tantas categorías "
 "como desee."
 
-#: C/evolution.xml:3493(para)
+#: C/evolution.xml:3511(para)
+#, fuzzy
 msgid ""
 "If the master list of categories doesn't suit you, you can add your own "
-"categories. To add new category,"
+"categories. To add a new category,"
 msgstr ""
 "Si la lista maestra de categorías no se ajusta a sus necesidades, puede "
 "añadir sus propias categorías. Para añadir una nueva categoría,"
 
-#: C/evolution.xml:3496(para)
-msgid "Enter the new category in the entry box at the top"
+#: C/evolution.xml:3514(para)
+#, fuzzy
+msgid "Enter the new category in the entry box at the top."
 msgstr "Introduzca la nueva categoría en la caja de entrada de la parte superior."
 
-#: C/evolution.xml:3500(para)
+#: C/evolution.xml:3518(para)
+#, fuzzy
 msgid ""
 "You can view the category name appeared in the field next to Categories "
-"button in the Contact Editor"
+"button in the Contact Editor."
 msgstr ""
 "Puede ver que el nombre de la categoría aparece en el campo junto al botón "
 "Categorías en el Editor de contactos"
 
-#: C/evolution.xml:3503(para)
-msgid "Press OK at the right bottom of the Contact Editor window."
-msgstr ""
-"Pulse Aceptar en la parte inferior derecha de la ventana del Editor de "
-"contactos."
-
-#: C/evolution.xml:3507(para)
+#: C/evolution.xml:3525(para)
+#, fuzzy
 msgid ""
 "You can edit or set the color and icon for each categories available under "
 "categories list. To achieve that click Edit button at the bottom of the "
-"Categories window. Press delete button to delete the items from the list."
+"Categories window. Press the Delete button to delete the items from the list."
 msgstr ""
 "Puede editar o establecer el color e icono para cada categoría disponible "
 "bajo la lista de categorías. Para ello pulse el botón Editar en la parte "
 "inferior de la ventana de Categorías. Pulse el botón Borrar para borrar "
 "elementos de la lista."
 
-#: C/evolution.xml:3514(para)
+#: C/evolution.xml:3532(para)
 msgid ""
 "The <link linkend=\"ldap\">LDAP</link> protocol was created to let users "
 "share contact information over a network by sharing access to a central "
@@ -8436,13 +8413,14 @@ msgstr ""
 "libreta LDAP las direcciones de todos sus empleados o los contactos de "
 "clientes."
 
-#: C/evolution.xml:3515(para)
+#: C/evolution.xml:3533(para)
+#, fuzzy
 msgid ""
-"To learn how to add a remote LDAP directory to your available contact "
-"folders, see <link linkend=\"config-prefs-contact\">Contact Management</"
-"link>. Remote groups of contacts appear under the On LDAP Servers item in "
-"the switcher. They work like a local folder of contact cards, with the "
-"following exceptions:"
+"To learn how to add a remote LDAP directory to your available address books, "
+"see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote "
+"groups of contacts appear under the On LDAP Servers item in the switcher. "
+"They work like a local folder of contact cards, with the following "
+"exceptions:"
 msgstr ""
 "Para obtener información acerca de cómo añadir un directorio remoto dentro "
 "de sus carpetas de contactos disponibles, consulte <link linkend=\"config-"
@@ -8450,19 +8428,20 @@ msgstr ""
 "aparecen bajo los servidores LDAP a los que está conectado. Funciona como "
 "una carpeta de tarjetas locales, con las siguientes excepciones:"
 
-#: C/evolution.xml:3518(para)
+#: C/evolution.xml:3536(para)
+#, fuzzy
 msgid ""
 "Network folders are only available when you are connected to the network. If "
 "you use a laptop or have a modem connection, you might want to copy or cache "
 "some of the network directory. You do this by dragging and dropping your "
-"desired contacts into the local contacts list."
+"desired contacts into the local address books."
 msgstr ""
 "Las carpetas de red sólo están disponibles cuando se conecta a la red. Si "
 "utiliza un equipo portátil o una conexión telefónica, conviene hacer una "
 "copia del directorio de red, o colocar éste en caché. Para ello, arrastre "
 "los contactos deseados dentro de la lista de contactos local."
 
-#: C/evolution.xml:3519(para)
+#: C/evolution.xml:3537(para)
 msgid ""
 "You can also mark the network folder for offline usage. To mark the folder, "
 "right-click the folder, then click Properties. Select Copy Folder Content "
@@ -8473,7 +8452,7 @@ msgstr ""
 "Propiedades. Seleccione Copiar el contenido de la carpeta localmente para "
 "operación desconectada."
 
-#: C/evolution.xml:3522(para)
+#: C/evolution.xml:3540(para)
 msgid ""
 "To prevent excess network traffic, Evolution does not normally load data "
 "from the LDAP server upon opening."
@@ -8481,7 +8460,7 @@ msgstr ""
 "Para prevenir exceso de tráfico en la red, Evolution no descarga los datos "
 "del servidor LDAP de una forma normal al iniciarse."
 
-#: C/evolution.xml:3525(para)
+#: C/evolution.xml:3543(para)
 msgid ""
 "Depending on your server settings, you might not be able to edit all the "
 "fields in a contact stored on an LDAP server. Some servers prohibit some or "
@@ -8494,7 +8473,7 @@ msgstr ""
 "la que Evolution proporciona. Compruebe con su administrador de su sistema "
 "si necesita una configuración diferente."
 
-#: C/evolution.xml:3531(para)
+#: C/evolution.xml:3549(para)
 msgid ""
 "For information about setting up Evolution to use LDAP, refer to <link "
 "linkend=\"config-prefs-contact\">Contact Management</link>."
@@ -8502,13 +8481,14 @@ msgstr ""
 "Para obtener más información acerca de cómo configurar Evolution para usar "
 "LDAP, vea <link linkend=\"config-prefs-contact\">Gestión de contactos</link>."
 
-#: C/evolution.xml:3537(para)
+#: C/evolution.xml:3555(para)
+#, fuzzy
 msgid ""
 "When you get information about a person in the mail or in a calendar entry, "
-"you can add it to an address card. To do so, right-click any e-mail address "
-"or e-mail message, and click Add to Address Book on the menu that appears. "
-"If the sender already exists, the Editor tab opens and you can edit the "
-"detail. Evolution can also add cards from a hand-held device during HotSync* "
+"you can add it to an address card. To do so, right-click any email address "
+"or email message, and click Add to Address Book on the menu that appears. If "
+"the sender already exists, the Editor tab opens and you can edit the detail. "
+"Evolution can also add cards from a hand-held device during HotSync* "
 "operation. For more information, see <link linkend=\"config-sync"
 "\">Synchronizing Your Handheld Device</link>."
 msgstr ""
@@ -8522,7 +8502,7 @@ msgstr ""
 "más información consulte <link linkend=\"config-sync\">Sincronización de "
 "Evolution con dispositivos portátiles</link>."
 
-#: C/evolution.xml:3543(para)
+#: C/evolution.xml:3561(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "Calendar to manage your schedule alone or in conjunction with peers. To "
@@ -8535,51 +8515,52 @@ msgstr ""
 "linkend=\"importing-mail\">Importar un solo archivo</link>, que describe la "
 "herramienta de importación."
 
-#: C/evolution.xml:3546(link) C/evolution.xml:3578(title)
+#: C/evolution.xml:3564(link) C/evolution.xml:3596(title)
 msgid "Ways of Looking at your Calendar"
 msgstr "Opciones de la vista de calendario"
 
-#: C/evolution.xml:3549(link) C/evolution.xml:3736(title)
+#: C/evolution.xml:3567(link) C/evolution.xml:3754(title)
 msgid "Scheduling With the Evolution Calendar"
 msgstr "Planificación con el calendario de Evolution"
 
-#: C/evolution.xml:3552(link) C/evolution.xml:4112(title)
+#: C/evolution.xml:3570(link) C/evolution.xml:4134(title)
 msgid "Searching for Calendar Items"
 msgstr "Buscar elementos del calendario"
 
-#: C/evolution.xml:3555(link) C/evolution.xml:4260(title)
+#: C/evolution.xml:3573(link) C/evolution.xml:4282(title)
 msgid "Printing Displayed Items"
 msgstr "Imprimir los elementos mostrados"
 
-#: C/evolution.xml:3558(link) C/evolution.xml:4265(title)
+#: C/evolution.xml:3576(link) C/evolution.xml:4287(title)
 msgid "Deleting Old Appointments and Meetings"
 msgstr "Borrar citas y reuniones antiguas"
 
-#: C/evolution.xml:3561(link) C/evolution.xml:4270(title)
+#: C/evolution.xml:3579(link) C/evolution.xml:4292(title)
 msgid "Delegating Meetings"
 msgstr "Eliminar reuniones"
 
-#: C/evolution.xml:3564(link) C/evolution.xml:4290(title)
+#: C/evolution.xml:3582(link) C/evolution.xml:4312(title)
 msgid "Multiple Calendars, Web Calendars, and CalDAV"
 msgstr "Múltiples calendarios, calendarios web y CalDAV"
 
-#: C/evolution.xml:3567(link) C/evolution.xml:4297(title)
+#: C/evolution.xml:3585(link) C/evolution.xml:4319(title)
 msgid "The Task List"
 msgstr "La Lista de tareas"
 
-#: C/evolution.xml:3570(link) C/evolution.xml:4610(title)
+#: C/evolution.xml:3588(link) C/evolution.xml:4634(title)
 msgid "Memos"
 msgstr "Notas"
 
-#: C/evolution.xml:3573(link) C/evolution.xml:4805(title)
+#: C/evolution.xml:3591(link) C/evolution.xml:4829(title)
 msgid "Configuring Time Zones"
 msgstr "Configurar la zona horaria"
 
-#: C/evolution.xml:3579(para)
+#: C/evolution.xml:3597(para)
+#, fuzzy
 msgid ""
 "In Evolution, you can keep multiple calendars and overlay them one over the "
 "next. For example, you might have a schedule of events for work, one for "
-"home, and one for your favorite sports team. The switcher lists those "
+"home, and one for your favorite sports team. The side bar lists those "
 "calendars, and you can select or deselect the boxes next to them to show and "
 "hide the appointments in your calendar view. By hiding and showing different "
 "sets of appointments, you can be sure to avoid conflicts, while keeping a "
@@ -8593,11 +8574,11 @@ msgstr ""
 "diferentes juegos de citas, puede asegurarse de evitar conflictos, "
 "reduciendo la carga en la vista."
 
-#: C/evolution.xml:3580(para)
+#: C/evolution.xml:3598(para)
 msgid "Appointments for each calendar appear as a different color."
 msgstr "Las citas para cada calendario aparecen con un color diferente."
 
-#: C/evolution.xml:3581(para)
+#: C/evolution.xml:3599(para)
 msgid ""
 "The toolbar offers you five different buttons that can show you different "
 "views of your calendar."
@@ -8605,76 +8586,77 @@ msgstr ""
 "La barra de herramientas le ofrece cinco botones diferentes que le pueden "
 "mostrar distintas vistas de su calendario."
 
-#: C/evolution.xml:3589(para)
+#: C/evolution.xml:3607(para)
 msgid "Calendar View"
 msgstr "Vista del calendario"
 
-#: C/evolution.xml:3592(para)
+#: C/evolution.xml:3610(para)
 msgid "Shortcut Keys"
 msgstr "Atajos de teclado"
 
-#: C/evolution.xml:3599(para)
+#: C/evolution.xml:3617(para)
 msgid "Day"
 msgstr "Día"
 
-#: C/evolution.xml:3602(para)
+#: C/evolution.xml:3620(para)
 msgid "control+y"
 msgstr "control+y"
 
-#: C/evolution.xml:3607(para)
+#: C/evolution.xml:3625(para)
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: C/evolution.xml:3610(para)
+#: C/evolution.xml:3628(para)
 msgid "control+j"
 msgstr "control+j"
 
-#: C/evolution.xml:3615(para)
+#: C/evolution.xml:3633(para)
 msgid "Week"
 msgstr "Semana"
 
-#: C/evolution.xml:3618(para)
+#: C/evolution.xml:3636(para)
 msgid "control+k"
 msgstr "control+k"
 
-#: C/evolution.xml:3623(para)
+#: C/evolution.xml:3641(para)
 msgid "Month"
 msgstr "Mes"
 
-#: C/evolution.xml:3626(para)
+#: C/evolution.xml:3644(para)
 msgid "control+m"
 msgstr "control+m"
 
-#: C/evolution.xml:3631(para)
+#: C/evolution.xml:3649(para)
 msgid "List"
 msgstr "Lista"
 
-#: C/evolution.xml:3634(para)
+#: C/evolution.xml:3652(para)
 msgid "control+l"
 msgstr "control+l"
 
-#: C/evolution.xml:3640(para)
+#: C/evolution.xml:3658(para)
+#, fuzzy
 msgid ""
-"You can also select an arbitrary range of days in the small calendar just "
-"above the switcher at the left. To do this, select the days that you want to "
-"view in your calendar."
+"You can also select an arbitrary range of days in the small calendar in the "
+"side bar. To do this, select the days that you want to view in your calendar."
 msgstr ""
 "Puede elegir cualquier rango de días en el pequeño calendario encima del "
 "selector a la izquierda. Para ello seleccione los días que quiere ver en el "
 "calendario."
 
-#: C/evolution.xml:3642(para)
+#: C/evolution.xml:3660(para)
+#, fuzzy
 msgid ""
-"The Prev and Next buttons move you forward and back in your calendar pages. "
-"If you are using a week or month view, you can move by week or month. To "
-"return to today's listing, click the Today button in the toolbar."
+"The Previous and Next buttons move you forward and back in your calendar "
+"pages. If you are using a week or month view, you can move by week or month. "
+"To return to today's listing, click the Today button in the toolbar."
 msgstr ""
 "Los botones Volver y Avanzar sirven para desplazarse adelante y atrás por "
 "las páginas del calendario. Si está usando la vista de semana o mes, puede "
 "desplazarse una semana o un mes. Para volver al día de hoy pulse en Ir a hoy "
 "en la barra de tareas."
 
-#: C/evolution.xml:3643(para)
+#: C/evolution.xml:3661(para)
 msgid ""
 "To visit calendar entries for a specific date, click Go To and select the "
 "date in the dialog box that appears."
@@ -8682,11 +8664,11 @@ msgstr ""
 "Para visitar las entradas del calendario para una fecha específica, pulse en "
 "Ir a para abrir un cuadro de diálogo donde elegir la fecha."
 
-#: C/evolution.xml:3646(title)
+#: C/evolution.xml:3664(title)
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: C/evolution.xml:3647(para)
+#: C/evolution.xml:3665(para)
 msgid ""
 "Evolution allows you to edit the label of your calendar, assign color, and "
 "copy content for offline use. To set your calendar properties"
@@ -8695,33 +8677,37 @@ msgstr ""
 "copiar los contenidos para su uso desconectado. Para establecer las "
 "propiedades de su calendario"
 
-#: C/evolution.xml:3650(para)
-msgid "Select the calendar from the folder view at the left."
+#: C/evolution.xml:3668(para)
+#, fuzzy
+msgid "Select the calendar from the side bar at the left."
 msgstr "Seleccione el calendario desde la vista de carpetas en la izquierda."
 
-#: C/evolution.xml:3653(para)
-msgid "Right click."
-msgstr "Pulse con el botón derecho."
+#: C/evolution.xml:3671(para)
+#, fuzzy
+msgid "Right click on the calendar."
+msgstr "Pulse con el botón derecho sobre uno de los mensajes."
 
-#: C/evolution.xml:3656(para)
-msgid "Select Properties to open Calendar Properties dialogue box."
+#: C/evolution.xml:3674(para)
+#, fuzzy
+msgid "Select Properties to open Calendar Properties dialog box."
 msgstr ""
 "Seleccione Propiedades para abrir el cuadro de diálogo Propiedades del "
 "calendario."
 
-#: C/evolution.xml:3668(para)
+#: C/evolution.xml:3686(para)
 msgid "Edit the label from Name field."
 msgstr "Edite la etiqueta desde el campo Nombre."
 
-#: C/evolution.xml:3671(para)
-msgid "To assign a color for the calendar, click the Color tab."
+#: C/evolution.xml:3689(para)
+#, fuzzy
+msgid "To assign a color for the calendar, click the Color button."
 msgstr "Para establecer el color para el calendario, pulse sobre la solapa Color."
 
-#: C/evolution.xml:3674(para)
+#: C/evolution.xml:3692(para)
 msgid "Select the color and click OK."
 msgstr "Seleccione el color y pulse Aceptar."
 
-#: C/evolution.xml:3677(para)
+#: C/evolution.xml:3695(para)
 msgid ""
 "To mark your calendar content for offline use, click Copy calendar contents "
 "locally for offline operations."
@@ -8729,7 +8715,7 @@ msgstr ""
 "Para marcar el contenido de su calendario para un uso desconectado, pulse "
 "Copiar el contenido del calendario localmente para trabajar desconectado."
 
-#: C/evolution.xml:3679(para)
+#: C/evolution.xml:3697(para)
 msgid ""
 "Right click on the calendar at the left and select Mark Calendar for offline "
 "use. For more information on working offline refer <link linkend=\"usage-"
@@ -8740,7 +8726,7 @@ msgstr ""
 "acerca de trabajar desconectado, vea <link linkend=\"usage-mail-getnsend-"
 "offline\">Trabar desconectado</link>."
 
-#: C/evolution.xml:3681(para)
+#: C/evolution.xml:3699(para)
 msgid ""
 "To export or share or to store a calendar locally in iCal format, right "
 "click on the calendar in the calendar view at the left and select Save to "
@@ -8750,7 +8736,7 @@ msgstr ""
 "iCal, pulse con el botón derecho sobre el calendario en la vista de "
 "calendario a la izquierda y seleccione Guardar al disco."
 
-#: C/evolution.xml:3683(para)
+#: C/evolution.xml:3701(para)
 msgid ""
 "Click Mark as default folder if you want to mark this folder as your default "
 "calendar folder."
@@ -8758,11 +8744,11 @@ msgstr ""
 "Pulse Marcar como carpeta predeterminada si quiere marcar esta carpeta como "
 "su carpeta predeterminada para los calendarios."
 
-#: C/evolution.xml:3687(title)
+#: C/evolution.xml:3705(title)
 msgid "Google Calendar"
 msgstr "Google Calendar"
 
-#: C/evolution.xml:3688(para)
+#: C/evolution.xml:3706(para)
 msgid ""
 "Evolution allows you to access your Google calendar. You can view the Google "
 "calendar offline or create, modify, and delete the calendar items online."
@@ -8771,45 +8757,45 @@ msgstr ""
 "calendario de Google cuando esté desconectado o crear, modificar y borrar "
 "elementos del calendario cuando esté conectado."
 
-#: C/evolution.xml:3689(para)
+#: C/evolution.xml:3707(para)
 msgid "To integrate the Google calendar to Evolution:"
 msgstr "Para integrar el calendario de Google en Evolution:"
 
-#: C/evolution.xml:3692(para)
+#: C/evolution.xml:3710(para)
 msgid "Click New, then select Calendar to open the New Calendar dialog."
 msgstr ""
 "Pulse Nuevo, después seleccione Calendario para abrir el diálogo Calendario "
 "nuevo."
 
-#: C/evolution.xml:3695(para)
+#: C/evolution.xml:3713(para)
 msgid "Select Google from the Type drop-down list."
 msgstr "Seleccione Google de la lista desplegable de tipos."
 
-#: C/evolution.xml:3700(para)
+#: C/evolution.xml:3718(para)
 msgid "Specify the following:"
 msgstr "Especifique lo siguiente:"
 
-#: C/evolution.xml:3704(title)
+#: C/evolution.xml:3722(title)
 msgid "Name:"
 msgstr "Nombre:"
 
-#: C/evolution.xml:3705(para)
+#: C/evolution.xml:3723(para)
 msgid "Specify a name for the Google calendar"
 msgstr "Especifique un nombre para el calendario en Google"
 
-#: C/evolution.xml:3710(title)
+#: C/evolution.xml:3728(title)
 msgid "Username:"
 msgstr "Usuario:"
 
-#: C/evolution.xml:3711(para)
+#: C/evolution.xml:3729(para)
 msgid "Specify your username for your Google account"
 msgstr "Especifique su nombre de usuario para su cuenta en Google"
 
-#: C/evolution.xml:3717(para)
+#: C/evolution.xml:3735(para)
 msgid "Set the time to automatically refresh the calendar."
 msgstr "Establezca el tiempo para refrescar el calendario automáticamente."
 
-#: C/evolution.xml:3720(para)
+#: C/evolution.xml:3738(para)
 msgid ""
 "Select Use SSL to enable SSL for communication between Evolution and the "
 "Google server."
@@ -8817,7 +8803,7 @@ msgstr ""
 "Seleccione Usar SSL para activar SSL para la comunicación entre Evolution y "
 "el servidor de Google."
 
-#: C/evolution.xml:3723(para)
+#: C/evolution.xml:3741(para)
 msgid ""
 "If you want to set a color label for the calendar, click the Color tab, "
 "select the desired color, then click OK."
@@ -8825,7 +8811,7 @@ msgstr ""
 "Si quiere establecer un color para una etiqueta del calendario, pulse la "
 "solapa Color y seleccione el color que desee y pulse Aceptar."
 
-#: C/evolution.xml:3726(para)
+#: C/evolution.xml:3744(para)
 msgid ""
 "If you want to view the calendar items offline, select Copy calendar content "
 "locally for offline operation check box."
@@ -8834,17 +8820,13 @@ msgstr ""
 "seleccione la casilla de verificación Copiar el contenido del calendario "
 "localmente para trabajar desconectado."
 
-#: C/evolution.xml:3727(para)
+#: C/evolution.xml:3745(para)
 msgid "If you select this option, you cannot modify or create the calendar items."
 msgstr ""
 "Si selecciona esta opción, no podrá modificar o crear elementos en el "
 "calendario."
 
-#: C/evolution.xml:3730(para)
-msgid "Click OK to save your modifications."
-msgstr "Pulse Aceptar para guardar sus modificaciones."
-
-#: C/evolution.xml:3737(para)
+#: C/evolution.xml:3755(para)
 msgid ""
 "There are two types of events you can schedule with Evolution: appointments "
 "and meetings. An appointment is an event you schedule for yourself only, and "
@@ -8858,102 +8840,107 @@ msgstr ""
 "También puede usar la búsqueda de Disponibilidad para las reuniones y "
 "determinar la disponibilidad de los participantes."
 
-#: C/evolution.xml:3740(link) C/evolution.xml:3763(title)
+#: C/evolution.xml:3758(link) C/evolution.xml:3781(title)
 msgid "Appointments"
 msgstr "Citas"
 
-#: C/evolution.xml:3743(link) C/evolution.xml:3936(title)
+#: C/evolution.xml:3761(link) C/evolution.xml:3953(title)
 msgid "Sending a Meeting Invitation"
 msgstr "Enviar una invitación para reunión"
 
-#: C/evolution.xml:3746(link) C/evolution.xml:4020(title)
+#: C/evolution.xml:3764(link) C/evolution.xml:4042(title)
 msgid "Accepting and Replying to a Meeting Request"
 msgstr "Aceptar y responder a solicitudes de reuniones"
 
-#: C/evolution.xml:3749(link) C/evolution.xml:4038(title)
+#: C/evolution.xml:3767(link) C/evolution.xml:4060(title)
 msgid "Reading Responses to Meeting Requests"
 msgstr "Leer respuestas a solicitudes de reunión"
 
-#: C/evolution.xml:3752(link) C/evolution.xml:4043(title)
+#: C/evolution.xml:3770(link) C/evolution.xml:4065(title)
 msgid "Using the Free/Busy View"
 msgstr "Uso de la característica de disponibilidad"
 
-#: C/evolution.xml:3755(link) C/evolution.xml:4072(title)
+#: C/evolution.xml:3773(link) C/evolution.xml:4094(title)
 msgid "Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Publicar la información de Disponibilidad de calendario sin un servidor "
 "Groupware"
 
-#: C/evolution.xml:3758(link) C/evolution.xml:4105(title)
+#: C/evolution.xml:3776(link) C/evolution.xml:4127(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Acceder a datos de Disponibilidad sin un servidor Groupware"
 
-#: C/evolution.xml:3764(para)
+#: C/evolution.xml:3782(para)
 msgid "In Evolution, an appointment is an event you schedule for yourself."
 msgstr "En Evolution, una cita es un acontecimiento que programa para si mismo."
 
-#: C/evolution.xml:3767(link) C/evolution.xml:3781(title)
+#: C/evolution.xml:3785(link) C/evolution.xml:3799(title)
 msgid "Creating Appointments"
 msgstr "Crear de citas"
 
-#: C/evolution.xml:3770(link) C/evolution.xml:3867(title)
-#: C/evolution.xml:5338(title)
+#: C/evolution.xml:3788(link) C/evolution.xml:3887(title)
+#: C/evolution.xml:5317(title)
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: C/evolution.xml:3773(link) C/evolution.xml:3906(title)
+#: C/evolution.xml:3791(link) C/evolution.xml:3923(title)
 msgid "Classifications"
 msgstr "Clasificaciones"
 
-#: C/evolution.xml:3776(link) C/evolution.xml:3929(title)
+#: C/evolution.xml:3794(link) C/evolution.xml:3946(title)
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: C/evolution.xml:3784(para)
+#: C/evolution.xml:3802(para)
 msgid "Click File &gt; New &gt; Appointment."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Cita."
 
-#: C/evolution.xml:3786(para)
-msgid "Click Calendars on the Switcher, then click New &gt; Appointment."
-msgstr "Pulse el Calendario en el Selector, después pulse Nuevo &gt; Cita."
+#: C/evolution.xml:3804(para)
+msgid "Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
+msgstr ""
+"Pulse el Calendario en el Selector, después pulse Archivo &gt; Nuevo &gt; "
+"Cita."
 
-#: C/evolution.xml:3788(para)
+#: C/evolution.xml:3806(para)
+#, fuzzy
 msgid ""
 "Double-click in a blank space on the calendar view to open an Appointment "
-"dialogue box. The appointment is created for that particular time on the "
-"calendar view against which you have double clicked on."
+"dialog box. The particular time on the calendar view against which you have "
+"double clicked on will be suggested for the new appointment."
 msgstr ""
 "Pulse dos veces en un espacio vacío en la vista de calendario para abrir el "
 "cuadro de diálogo Cita. Se creará la cita para esa hora en particular en la "
 "vista del calendario sobre la que haya pulsado dos veces."
 
-#: C/evolution.xml:3790(para)
+#: C/evolution.xml:3808(para)
 msgid "Select the required duration on the calender view and enter the summary."
 msgstr ""
 "Seleccione la duración requerida en la vista del calendario y escriba el "
 "resumen."
 
-#: C/evolution.xml:3793(para)
-msgid ""
-"Select a calendar in the Calendar drop-down list. Type a brief summary of "
-"the appointment in the Summary field."
-msgstr ""
-"Seleccione un calendario en la lista desplegable de Calendario. Escriba un "
-"pequeño resumen de la cita en el campo Resumen."
+#: C/evolution.xml:3811(para) C/evolution.xml:3966(para)
+msgid "Select a calendar in the Calendar drop-down list."
+msgstr "Seleccione un calendario en la lista desplegable de Calendario."
 
-#: C/evolution.xml:3798(para)
-msgid "Type a location for the appointment in the Location field."
-msgstr "Escriba un lugar para la cita en el campo Lugar."
+#: C/evolution.xml:3812(para) C/evolution.xml:3823(para)
+#: C/evolution.xml:3981(para) C/evolution.xml:4364(para)
+#: C/evolution.xml:4418(para) C/evolution.xml:4650(para)
+#: C/evolution.xml:5716(para)
+#, fuzzy
+msgid "Enter a brief summary in the Summary field."
+msgstr "Escriba un breve resumen para la tarea en el campo Resumen."
 
-#: C/evolution.xml:3801(para)
-msgid "Select the date, time and set the duration"
-msgstr "Seleccione la fecha y hora y establezca la duración."
+#: C/evolution.xml:3817(para) C/evolution.xml:3984(para)
+#, fuzzy
+msgid "(Optional) Type a location in the Location field."
+msgstr "(Opcional) escriba una categoría en el campo Categoría."
 
-#: C/evolution.xml:3804(para)
-msgid "Enter a brief summary of the appointment in the description field."
-msgstr "Escriba un pequeño resumen sobre la cita en el campo de descripción."
+#: C/evolution.xml:3820(para)
+#, fuzzy
+msgid "Select the date and time."
+msgstr "Seleccione la anchura, tamaño y el alineamiento."
 
-#: C/evolution.xml:3807(para)
+#: C/evolution.xml:3826(para) C/evolution.xml:3987(para)
 msgid ""
 "To select this appointment as an all day event, click Options &gt; All Day "
 "Event."
@@ -8961,96 +8948,110 @@ msgstr ""
 "Para seleccionar esta cita como un Acontecimiento para todo el día, pulse "
 "Opciones &gt; Acontecimiento para todo el día."
 
-#: C/evolution.xml:3809(para)
+#: C/evolution.xml:3828(para) C/evolution.xml:3989(para)
 msgid "Click the All Day Event button on the toolbar."
 msgstr "Pulse el botón Acontecimiento para todo el día de la barra de herramientas."
 
-#: C/evolution.xml:3812(para)
-msgid "If the event is an all day event, specify a starting and ending date."
+#: C/evolution.xml:3831(para) C/evolution.xml:3992(para)
+msgid "If the event is an all day event, specify a starting date and an ending date."
 msgstr ""
-"Si el acontecimiento es un acontecimiento para todo el día, especifique una "
-"fecha de comienzo y final."
+"Si el acontecimiento es un acontecimiento para todo el día, especifique la "
+"fecha de comienzo y la fecha de finalización."
 
-#: C/evolution.xml:3815(para)
-msgid "If the event is not an all day event, specify a starting and ending time."
+#: C/evolution.xml:3834(para) C/evolution.xml:3995(para)
+msgid ""
+"If the event is not an all day event, specify a starting time and an ending "
+"time."
 msgstr ""
 "Si el acontecimiento no es un acontecimiento para todo el día, especifique "
-"una hora de comienzo y final."
+"una hora de comienzo y una hora de finalización."
 
-#: C/evolution.xml:3818(para)
+#: C/evolution.xml:3837(para) C/evolution.xml:3998(para)
 msgid "Select For to specify the duration."
 msgstr "Seleccione Durante para especificar la duración."
 
-#: C/evolution.xml:3820(para)
+#: C/evolution.xml:3839(para) C/evolution.xml:4000(para)
 msgid "Select Until to specify the ending time of the event."
 msgstr "Seleccione Hasta para especificar la hora de finalización del acontecimiento."
 
-#: C/evolution.xml:3823(para) C/evolution.xml:3982(para)
-#: C/evolution.xml:4350(para) C/evolution.xml:4401(para)
+#: C/evolution.xml:3842(para) C/evolution.xml:4003(para)
+#: C/evolution.xml:4373(para) C/evolution.xml:4424(para)
 msgid "Type the time zone information in the Time Zone field."
 msgstr "Escriba la información de zona horaria en el campo Zona horaria."
 
-#: C/evolution.xml:3825(para) C/evolution.xml:3984(para)
-#: C/evolution.xml:4352(para) C/evolution.xml:4403(para)
+#: C/evolution.xml:3844(para) C/evolution.xml:4005(para)
+#: C/evolution.xml:4375(para) C/evolution.xml:4426(para)
 msgid "Click the globe to customize the time zone."
 msgstr "Pulse el globo terráqueo para personalizar la zona horaria."
 
-#: C/evolution.xml:3826(para) C/evolution.xml:3985(para)
-#: C/evolution.xml:4353(para) C/evolution.xml:4404(para)
+#: C/evolution.xml:3845(para) C/evolution.xml:4006(para)
+#: C/evolution.xml:4376(para) C/evolution.xml:4427(para)
 msgid "To hide or show the Time Zone field, click View &gt; Time Zone."
 msgstr "Para ocultar o mostrar el campo Zona horaria, pulse Ver &gt; Zona horaria."
 
-#: C/evolution.xml:3829(para)
+#: C/evolution.xml:3848(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
 msgstr ""
 "Para mostrar la hora como ocupada, pulse Opciones &gt; Mostrar hora como "
 "ocupada."
 
-#: C/evolution.xml:3832(para)
-msgid ""
-"(Optional) Type a category in the Categories field. To show or hide the "
-"Categories field, click View &gt; Categories."
-msgstr ""
-"(Opcional) escriba una categoría en el campo Categorías. Para mostrar u "
-"ocultar el campo Categorías, pulse Ver &gt; Categorías."
+#: C/evolution.xml:3851(para) C/evolution.xml:3929(para)
+#: C/evolution.xml:4379(para) C/evolution.xml:4430(para)
+#: C/evolution.xml:4646(para)
+msgid "(Optional) Type a category in the Categories field."
+msgstr "(Opcional) escriba una categoría en el campo Categoría."
 
-#: C/evolution.xml:3833(para)
-msgid ""
-"For more information on categories, see <link linkend=\"bxmtbjb"
-"\">Classifications</link>."
-msgstr ""
-"Para obtener más información acerca de las categorías vea <link linkend="
-"\"bxmtbjb\">Clasificaciones</link>."
+#: C/evolution.xml:3852(para) C/evolution.xml:3935(para)
+#: C/evolution.xml:4380(para) C/evolution.xml:4431(para)
+msgid "To show or hide the Categories field, click View &gt; Categories."
+msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
 
-#: C/evolution.xml:3836(para)
-msgid "Type a description in the Description field."
+#: C/evolution.xml:3855(para) C/evolution.xml:4383(para)
+#: C/evolution.xml:4434(para) C/evolution.xml:4656(para)
+#: C/evolution.xml:5725(para)
+#, fuzzy
+msgid "(Optional) Enter a description in the Description field."
 msgstr "Escriba una descripción en el campo Descripción."
 
-#: C/evolution.xml:3839(para)
-msgid "To select an alarm for this appointment, click Alarm on the toolbar."
+#: C/evolution.xml:3858(para) C/evolution.xml:3913(para)
+#: C/evolution.xml:4009(para)
+#, fuzzy
+msgid ""
+"To create an alarm for this appointment, click Alarms on the toolbar, or "
+"click Options &gt; Alarms."
 msgstr ""
-"Para seleccionar una alerta para esta cita, pulse Alerta en la barra de "
-"herramientas."
+"Cuando cree una cita, pulse Alertas en la barra de herramientas o pulse "
+"Opciones &gt; Alertas."
 
-#: C/evolution.xml:3840(para)
+#: C/evolution.xml:3859(para) C/evolution.xml:3916(para)
+#: C/evolution.xml:4010(para)
+msgid "Select Customize to add or remove customized alarms for the event."
+msgstr ""
+"Seleccione Personalizar para añadir o eliminar alertas personalizadas para "
+"el acontecimiento."
+
+#: C/evolution.xml:3860(para) C/evolution.xml:4011(para)
 msgid ""
-"If you select an alarm, specify when and how you want the alarm to notify. "
 "For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
 "link>."
 msgstr ""
-"Si selecciona una alerta, especifique cuando y cómo quiere que la alerta se "
-"notifique. Para obtener más información acerca de Recordatorios, vea <link "
-"linkend=\"bshly4v\">Recordatorios</link>."
+"Para obtener más información acerca de los recordatorios, vea <link linkend="
+"\"bshly4v\">Recordatorios</link>."
 
-#: C/evolution.xml:3843(para) C/evolution.xml:3992(para)
+#: C/evolution.xml:3863(para) C/evolution.xml:4014(para)
+#: C/evolution.xml:4392(para) C/evolution.xml:4437(para)
+#: C/evolution.xml:4659(para)
+#, fuzzy
 msgid ""
-"(Optional) To add an attachment to the appointment, drag and drop the "
-"attachment into the attachment bar."
+"(Optional) To add an attachment, drag and drop the attachment into the "
+"attachment bar."
 msgstr ""
-"(Opcional) para añadir un adjunto a la cita, arrastre y suelte el adjunto en "
-"la barra de adjuntos."
+"(Opcional) para añadir un adjunto a la tarea, arrastre y suelte el adjunto "
+"en la barra de adjuntos."
 
-#: C/evolution.xml:3845(para) C/evolution.xml:3994(para)
+#: C/evolution.xml:3865(para) C/evolution.xml:4016(para)
+#: C/evolution.xml:4394(para) C/evolution.xml:4439(para)
+#: C/evolution.xml:4661(para)
 msgid ""
 "Click the Attach button on the toolbar, or click Insert &gt; Attachment and "
 "then browse to the attachment."
@@ -9058,7 +9059,7 @@ msgstr ""
 "Pulse el botón Adjuntar en la barra de herramientas, o pulse Insertar &gt; "
 "Adjunto y después examine para seleccionar el adjunto."
 
-#: C/evolution.xml:3848(para) C/evolution.xml:3997(para)
+#: C/evolution.xml:3868(para) C/evolution.xml:4019(para)
 msgid ""
 "(Optional) Select a classification (Public, Private, or Confidential) by "
 "clicking &gt; Options &gt; Classifications."
@@ -9066,11 +9067,11 @@ msgstr ""
 "(Opcional) seleccione una clasificación (Pública, Privada o Confidencial) "
 "pulsando Opciones &gt; Clasificaciones."
 
-#: C/evolution.xml:3851(para) C/evolution.xml:4000(para)
+#: C/evolution.xml:3871(para) C/evolution.xml:4022(para)
 msgid "(Optional) Click the Recurrence button on the toolbar."
 msgstr "(Opcional) pulse el botón Repetición en la barra de herramientas."
 
-#: C/evolution.xml:3853(para) C/evolution.xml:4002(para)
+#: C/evolution.xml:3873(para) C/evolution.xml:4024(para)
 msgid ""
 "Click Options &gt; Recurrence, and specify whether you want the appointment "
 "to recur and how often."
@@ -9078,11 +9079,11 @@ msgstr ""
 "Pulse Opciones &gt; Repetición, y especifique cuando y con qué frecuencia "
 "quiere que se repita la cita."
 
-#: C/evolution.xml:3858(title)
+#: C/evolution.xml:3878(title)
 msgid "All Day Event"
 msgstr "Acontecimiento para todo el día"
 
-#: C/evolution.xml:3859(para)
+#: C/evolution.xml:3879(para)
 msgid ""
 "An All Day event appears at the top of a day's appointment list, in the "
 "header under the date, rather than inside. That makes it easy to have "
@@ -9101,7 +9102,7 @@ msgstr ""
 "solaparse. Cuando eso ocurre se muestran con múltiples columnas en la vista "
 "del día del calendario."
 
-#: C/evolution.xml:3860(para)
+#: C/evolution.xml:3880(para)
 msgid ""
 "If you create calendar appointments that overlap, Evolution displays them "
 "side by side in your calendar."
@@ -9109,7 +9110,7 @@ msgstr ""
 "Si crea citas que se solapan, Evolution las mostrará lado a lado en el "
 "calendario."
 
-#: C/evolution.xml:3868(para)
+#: C/evolution.xml:3888(para)
 msgid ""
 "You can have several Reminders for individual appointments, any time prior "
 "to the appointment you schedule. You can have one reminder of each of the "
@@ -9119,27 +9120,27 @@ msgstr ""
 "antelación a la cita que ha planificado. Puede tener un recordatorio de cada "
 "uno de los siguientes tipos:"
 
-#: C/evolution.xml:3872(title)
+#: C/evolution.xml:3892(title)
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: C/evolution.xml:3873(para)
+#: C/evolution.xml:3893(para)
 msgid "A notification pops up on your screen to remind you of your appointment."
 msgstr "Se abrirá una ventana emergente en su pantalla para recordarle su cita."
 
-#: C/evolution.xml:3878(title)
+#: C/evolution.xml:3898(title)
 msgid "Audio:"
 msgstr "Sonido:"
 
-#: C/evolution.xml:3879(para)
+#: C/evolution.xml:3899(para)
 msgid "Your computer delivers a sound alarm."
 msgstr "Su sistema emitirça un sonido como alerta."
 
-#: C/evolution.xml:3884(title)
+#: C/evolution.xml:3904(title)
 msgid "Program:"
 msgstr "Ejecutar un programa:"
 
-#: C/evolution.xml:3885(para)
+#: C/evolution.xml:3905(para)
 msgid ""
 "You can run a program as a reminder. You can enter its name in the text "
 "field, or find it with the Browse button."
@@ -9147,7 +9148,7 @@ msgstr ""
 "Puede ejecutar un programa como recordatorio. Debe introducir el nombre en "
 "el campo de texto o buscarlo con el botón Explorar."
 
-#: C/evolution.xml:3889(para)
+#: C/evolution.xml:3909(para)
 msgid ""
 "Apart from the above notifications, the Evolution alarm icon blinks in the "
 "notification area. To pause the alarm or view the event, click the "
@@ -9157,35 +9158,18 @@ msgstr ""
 "parpadea en el área de notificación. Para pausar la alerta o ver el "
 "acontecimiento, pulse en el icono de notificación."
 
-#: C/evolution.xml:3890(para)
+#: C/evolution.xml:3910(para)
 msgid "To create a reminder:"
 msgstr "Crear un recordatorio:"
 
-#: C/evolution.xml:3893(para)
-msgid ""
-"When creating an appointment, click Alarms on the toolbar, or click Options "
-"&gt; Alarms."
-msgstr ""
-"Cuando cree una cita, pulse Alertas en la barra de herramientas o pulse "
-"Opciones &gt; Alertas."
-
-#: C/evolution.xml:3896(para)
-msgid "Select the alarm for the event."
-msgstr "Seleccione la alerta para el acontecimiento."
-
-#: C/evolution.xml:3899(para)
-msgid "Select Customize to add or remove customized alarms for the event."
-msgstr ""
-"Seleccione Personalizar para añadir o eliminar alertas personalizadas para "
-"el acontecimiento."
-
-#: C/evolution.xml:3902(para)
+#: C/evolution.xml:3919(para)
+#, fuzzy
 msgid ""
 "If you have stored reminders in a local calendar, they work from the moment "
 "you log in. However, for reminders stored on any remote server like "
-"GroupWise Exchange which requires authentication, you must run Evolution at "
-"least once after logging in. No matter where the reminders are stored, you "
-"can quit Evolution and still be reminded of an upcoming appointment."
+"GroupWise or Exchange which requires authentication, you must run Evolution "
+"at least once after logging in. No matter where the reminders are stored, "
+"you can quit Evolution and still be reminded of an upcoming appointment."
 msgstr ""
 "Si ha almacenado recordatorios en el calendario local, tendrán efecto desde "
 "el momento en el que inicie su sesión en el sistema. Sin embargo, para "
@@ -9195,7 +9179,7 @@ msgstr ""
 "puede salir de Evolution y aún podrá recibir los recordatorios de las citas "
 "próximas."
 
-#: C/evolution.xml:3907(para)
+#: C/evolution.xml:3924(para)
 msgid ""
 "If you are using a calendar on a Novell <trademark class=\"registered"
 "\">GroupWise</trademark> or Microsoft Exchange server, select a "
@@ -9215,7 +9199,7 @@ msgstr ""
 "del servidor; compruebe con el administrador de su sistema o ajuste su "
 "configuración de delegación."
 
-#: C/evolution.xml:3908(para)
+#: C/evolution.xml:3925(para)
 msgid ""
 "If you are using a Novell GroupWise or Microsoft Exchange server, other "
 "people on the server can check your schedule to see if you are available at "
@@ -9230,15 +9214,11 @@ msgstr ""
 "la caja Libre en la selección Mostrar hora como. Generalmente las citas se "
 "muestran como Ocupado."
 
-#: C/evolution.xml:3909(para)
+#: C/evolution.xml:3926(para)
 msgid "You can categorize appointments in the same way you can categorize contacts."
 msgstr "Puede categorizar las citas de la misma manera que categoriza contactos."
 
-#: C/evolution.xml:3912(para)
-msgid "Type a category in the Categories field."
-msgstr "Escriba una categoría en el campo Categoría."
-
-#: C/evolution.xml:3915(para)
+#: C/evolution.xml:3932(para)
 msgid ""
 "Select the check box next to each category that matches the appointment you "
 "are creating."
@@ -9246,12 +9226,7 @@ msgstr ""
 "Seleccione la casilla de verificación junto a cada categoría que coincida "
 "con la cita que está creando."
 
-#: C/evolution.xml:3918(para) C/evolution.xml:4408(para)
-#: C/evolution.xml:4623(para)
-msgid "To show or hide Categories field, click View &gt; Categories."
-msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
-
-#: C/evolution.xml:3922(para)
+#: C/evolution.xml:3939(para)
 msgid ""
 "You can add a new category to your category list by clicking Edit Master "
 "Category List, then click Click Here To Add A Category."
@@ -9260,7 +9235,7 @@ msgstr ""
 "lista maestra de categorías y a continuación en Pulse aquí para añadir una "
 "categoría."
 
-#: C/evolution.xml:3924(para)
+#: C/evolution.xml:3941(para)
 msgid ""
 "After you have selected your categories, click OK to assign these categories "
 "to the appointment. The categories you selected are now listed in the text "
@@ -9270,19 +9245,20 @@ msgstr ""
 "cita. Las categorías seleccionadas se muestran en un cuadro de texto a la "
 "derecha del botón Categorías."
 
-#: C/evolution.xml:3925(para)
+#: C/evolution.xml:3942(para)
+#, fuzzy
 msgid ""
 "Appointments with categories appear with icons in the calendar display, and "
 "you can also search for appointments by category. To display only the "
-"appointments in a particular category, select Category Is in the search bar "
-"at the top of the calendar, and select a category."
+"appointments in a particular category, select the corresponding category in "
+"the search bar at the top of the calendar."
 msgstr ""
 "Las citas con categorías aparecen con iconos en la vista de calendario y "
 "también puede buscar las citas por categorías. Para mostrar sólo las citas "
 "de una categoría en particular, seleccione Categoría es en la barra de "
 "búsqueda en la parte superior del calendario y seleccione una categoría."
 
-#: C/evolution.xml:3930(para)
+#: C/evolution.xml:3947(para)
 msgid ""
 "The Recurrence tool button lets you describe repetition in appointments "
 "ranging from once every day up to once every 100 years. You can then choose "
@@ -9301,10 +9277,11 @@ msgstr ""
 "de junio de 2008</quote> o <quote>de cada mes el primer viernes en 12 "
 "ocasiones</quote>."
 
-#: C/evolution.xml:3931(para)
+#: C/evolution.xml:3948(para)
+#, fuzzy
 msgid ""
-"After you have finished settings, click the disk icon in the toolbar to save "
-"and close the appointment editor window. If you want, you can alter an "
+"After you have finished settings, click the Save button in the toolbar to "
+"save and close the appointment editor window. If you want, you can alter an "
 "appointment summary in the calendar view by clicking it and typing. You can "
 "change other settings by right-clicking the appointment then choosing Open, "
 "or double-clicking the appointment."
@@ -9316,7 +9293,7 @@ msgstr ""
 "pulsando con el botón derecho sobre la cita y después eligiendo Abrir o "
 "pulsando dos veces sobre la cita."
 
-#: C/evolution.xml:3937(para)
+#: C/evolution.xml:3954(para)
 msgid ""
 "A meeting is an event you schedule for multiple people. Evolution can be "
 "used to schedule group meetings and help you manage responses to meeting "
@@ -9326,27 +9303,29 @@ msgstr ""
 "Evolution sirve para organizar reuniones de grupos y ayudarle a gestionar "
 "las respuestas a las solicitudes de reunión."
 
-#: C/evolution.xml:3938(para)
+#: C/evolution.xml:3955(para)
+#, fuzzy
 msgid ""
 "When you create a meeting or group appointment, you can specify the "
 "attendees in several categories, such as <quote>chair</quote> or "
-"<quote>required.</quote> When you save the meeting listing, each attendee is "
-"sent an e-mail with the meeting information, which also gives them the "
-"option to respond."
+"<quote>required</quote>. When you save the meeting listing, each attendee is "
+"sent an email with the meeting information, which also gives them the option "
+"to respond."
 msgstr ""
 "Al crear una reunión o una cita en grupo puede especificar a los asistentes "
 "en varias categorías como <quote>presidencia</quote> o <quote>participante "
 "requerido</quote>. Cuando guarde su lista, cada invitado recibirá un mensaje "
 "con los datos de la cita y tendrán la opción de responder."
 
-#: C/evolution.xml:3939(para)
+#: C/evolution.xml:3956(para)
+#, fuzzy
 msgid ""
 "If you don't need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
-"and select Forward as iCalendar. This opens a new e-mail message with the "
+"and select Forward as iCalendar. This opens a new email message with the "
 "event notification attached as an announcement. Recipients can add the event "
-"to their calendars with one click, but it won't automatically send you e-"
-"mail about whether they plan to attend."
+"to their calendars with one click, but it won't automatically send you email "
+"about whether they plan to attend."
 msgstr ""
 "Si no necesita recibir confirmaciones de asistencia al planificar un "
 "acontecimiento y sólo necesita anunciarlo, pulse con el botón derecho sobre "
@@ -9355,43 +9334,41 @@ msgstr ""
 "destinatarios podrán incluir el acontecimiento en sus calendarios con una "
 "pulsación, pero no le enviarán respuesta acerca de si asistirán o no."
 
-#: C/evolution.xml:3940(para)
+#: C/evolution.xml:3957(para)
 msgid "To schedule a meeting:"
 msgstr "Para planificar una reunión:"
 
-#: C/evolution.xml:3943(para) C/evolution.xml:4048(para)
+#: C/evolution.xml:3960(para) C/evolution.xml:4070(para)
 msgid "Click File &gt; New &gt; Meeting."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Reunión."
 
-#: C/evolution.xml:3946(para) C/evolution.xml:4386(para)
+#: C/evolution.xml:3963(para) C/evolution.xml:4409(para)
+#, fuzzy
 msgid ""
-"If you have multiple e-mail accounts, select the one to use by selecting an "
+"If you have multiple email accounts, select the one to use by selecting an "
 "item in the Organizer field."
 msgstr ""
 "Si tiene múltiples cuentas de correo, seleccione la que quiere usar "
 "seleccionando un elemento en el campo Organizador."
 
-#: C/evolution.xml:3949(para)
-msgid "Select a calendar in the Calendar drop-down list."
-msgstr "Seleccione un calendario en la lista desplegable de Calendario."
-
-#: C/evolution.xml:3952(para) C/evolution.xml:4051(para)
-msgid "Click Add to add the e-mail addresses of people you want to invite."
+#: C/evolution.xml:3969(para) C/evolution.xml:4073(para)
+#, fuzzy
+msgid "Click Add to add the email addresses of people you want to invite."
 msgstr ""
 "Pulse añadir para añadir las direcciones de correo-e de las personas a las "
 "que quiere invitar."
 
-#: C/evolution.xml:3955(para)
+#: C/evolution.xml:3972(para)
 msgid "To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 "Para quitar un participante de la lista, seleccione un participante y pulse "
 "Quitar."
 
-#: C/evolution.xml:3958(para)
+#: C/evolution.xml:3975(para)
 msgid "To edit a field, select the field and click Edit."
 msgstr "Para editar un campo, seleccione el campo y pulse Editar."
 
-#: C/evolution.xml:3961(para)
+#: C/evolution.xml:3978(para)
 msgid ""
 "Click View on the menu bar to show or hide the Type, Role, Status, and RSVP "
 "fields."
@@ -9399,62 +9376,7 @@ msgstr ""
 "Pulse Ver en la barra de menú para ver u ocultar los campos Tipo, Rol, "
 "Estado y RSVP."
 
-#: C/evolution.xml:3964(para)
-msgid "Type summary of the meeting in the Summary field."
-msgstr "Escriba un resumen de la reunión en el campo Resumen."
-
-#: C/evolution.xml:3967(para)
-msgid "Type a location for the meeting in the Location field."
-msgstr "Escriba un lugar par ala reunión en el campo Lugar."
-
-#: C/evolution.xml:3970(para)
-msgid ""
-"To select this meeting as an all day event, click the All Day Event button "
-"on the toolbar."
-msgstr ""
-"Para seleccionar esta reunión como un acontecimiento para todo el día, pulse "
-"el botón Acontecimiento para todo el día en la barra de herramientas."
-
-#: C/evolution.xml:3973(para)
-msgid "If the event is an all day event, specify a starting date and an ending date."
-msgstr ""
-"Si el acontecimiento es un acontecimiento para todo el día, especifique la "
-"fecha de comienzo y la fecha de finalización."
-
-#: C/evolution.xml:3976(para)
-msgid ""
-"If the event is not an all day event, specify a starting time and an ending "
-"time."
-msgstr ""
-"Si el acontecimiento no es un acontecimiento para todo el día, especifique "
-"una hora de comienzo y una hora de finalización."
-
-#: C/evolution.xml:3979(para)
-msgid ""
-"Select For to specify the duration or select Until to specify the ending "
-"time of the event."
-msgstr ""
-"Seleccione «durante» para especificar la duración o seleccione «hasta» para "
-"especificar la hora de finalización del acontecimiento."
-
-#: C/evolution.xml:3988(para)
-msgid ""
-"(Optional) To set an alarm for this meeting, click Alarms on the toolbar, "
-"then specify when and how you want to the alarm to notify you."
-msgstr ""
-"(Opcional) para establecer una alerta para esta reunión, pulse Alertas en la "
-"barra de herramientas, después especifique cuándo y cómo quiere que la "
-"alerta se le notifique."
-
-#: C/evolution.xml:3989(para)
-msgid ""
-"For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
-"link>."
-msgstr ""
-"Para obtener más información acerca de los recordatorios, vea <link linkend="
-"\"bshly4v\">Recordatorios</link>."
-
-#: C/evolution.xml:4005(para)
+#: C/evolution.xml:4027(para)
 msgid ""
 "To query free/busy information for the attendees, click the Free/Busy button "
 "on the toolbar."
@@ -9462,28 +9384,31 @@ msgstr ""
 "Para preguntar la información de Disponibilidad de los asistentes, pulse el "
 "botón Disponibilidad en la barra de herramientas."
 
-#: C/evolution.xml:4007(para)
+#: C/evolution.xml:4029(para)
 msgid "Click Options &gt; Free/Busy."
 msgstr "Pulse Opciones &gt; Disponibilidad."
 
-#: C/evolution.xml:4010(para)
+#: C/evolution.xml:4032(para)
 msgid "Click Save to save the meeting."
 msgstr "Pulse Guardar para guardar la reunión."
 
-#: C/evolution.xml:4013(para)
-msgid "An e-mail is sent out to all the recipients, inviting them to your event."
+#: C/evolution.xml:4035(para)
+#, fuzzy
+msgid "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 "Se enviará un correo-e a todos los destinatarios, invitándoles a su "
 "acontecimiento."
 
-#: C/evolution.xml:4015(para)
+#: C/evolution.xml:4037(para)
+#, fuzzy
 msgid ""
-"A meeting can have only one organizer, and only the organizer can add "
-"participants. You can designate yourself the organizer of the meeting, but "
-"if you are not the original organizer, you can create confusion in the "
-"scheduling process. If you want to invite additional people to a meeting "
-"without changing the organizer, it is best to forward the first organizer's "
-"message to the additional participants."
+"In Evolution, a meeting can have only one organizer, and only the organizer "
+"can add participants to that meeting. Though it is possible to change the "
+"organizer of a meeting, this is not recommended as a means to invite "
+"additional participants to meetings. If you want to invite additional people "
+"to a meeting and are not that meeting's organizer, it is recommended that "
+"you forward the invitation message you received from the original meeting "
+"organiser to additional participants."
 msgstr ""
 "Una reunión sólo puede tener un organizador, y sólo el organizador puede "
 "añadir participantes. Puede designarse a si mismo como organizador de la "
@@ -9492,7 +9417,7 @@ msgstr ""
 "organizador, lo mejor es reenviar el mensaje original del organizador a los "
 "nuevos invitados."
 
-#: C/evolution.xml:4021(para)
+#: C/evolution.xml:4043(para)
 msgid ""
 "Meeting requests are sent as iCal attachments. To view or respond to one, "
 "click the attachment icon and view it inline in the mail window. All the "
@@ -9505,27 +9430,28 @@ msgstr ""
 "fechas. Después puede elegir cómo responder a la invitación. Sus opciones "
 "son:"
 
-#: C/evolution.xml:4024(para)
+#: C/evolution.xml:4046(para)
 msgid "Accept"
 msgstr "Aceptar"
 
-#: C/evolution.xml:4027(para)
+#: C/evolution.xml:4049(para)
 msgid "Tentatively Accept"
 msgstr "Aceptado provisionalmente"
 
-#: C/evolution.xml:4030(para)
+#: C/evolution.xml:4052(para)
 msgid "Decline"
 msgstr "Rehusar"
 
-#: C/evolution.xml:4033(para)
+#: C/evolution.xml:4055(para)
+#, fuzzy
 msgid ""
-"Click OK to send an e-mail to the organizer with your answer. The event is "
+"Click OK to send an email to the organizer with your answer. The event is "
 "also added to your calendar if you accept."
 msgstr ""
 "Pulse Aceptar para enviar un correo-e con su respuesta al organizador. Si "
 "acepta el acontecimiento también se añadirá a su calendario."
 
-#: C/evolution.xml:4034(para)
+#: C/evolution.xml:4056(para)
 msgid ""
 "After you add the meeting to your calendar, you can make changes to the "
 "information, but if the original organizer sends out another update, your "
@@ -9535,18 +9461,18 @@ msgstr ""
 "a la información, pero si el organizador original envía otra actualización, "
 "sus cambios se sobreescribirán."
 
-#: C/evolution.xml:4039(para)
+#: C/evolution.xml:4061(para)
+#, fuzzy
 msgid ""
 "When you get a reply to a meeting invitation you sent, you can view it "
-"inline by clicking the attachment and selecting View Inline. At the bottom, "
-"you can click OK to update your attendee list."
+"inline by clicking the attachment and selecting View Inline."
 msgstr ""
 "Cuando reciba una respuesta a su invitación de reunión, podrá verla incluida "
 "dentro del mensaje. Pulse con el botón derecho sobre el adjunto y elija Ver "
 "incluido. En la parte inferior, puede pulsar Aceptar para actualizar su "
 "lista de asistentes."
 
-#: C/evolution.xml:4044(para)
+#: C/evolution.xml:4066(para)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -9567,22 +9493,23 @@ msgstr ""
 "todavía puede usar los acontecimientos iCal en forma de invitaciones para "
 "coordinar las agendas con otras personas."
 
-#: C/evolution.xml:4045(para)
+#: C/evolution.xml:4067(para)
 msgid "To access the free/busy view:"
 msgstr "Para acceder a la vista de disponibilidad:"
 
-#: C/evolution.xml:4054(para)
+#: C/evolution.xml:4076(para)
 msgid "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
 msgstr ""
 "Pulse el botón Disponibilidad en la barra de herramientas o pulse Opciones "
 "&gt; Disponibilidad."
 
-#: C/evolution.xml:4059(para)
+#: C/evolution.xml:4081(para)
+#, fuzzy
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
 "the Autopick buttons to choose a time automatically, then click Save and "
 "Close. Attendees on an Exchange server have the appointment updated "
-"automatically; others receive e-mail notification of any change in plans."
+"automatically; others receive email notification of any change in plans."
 msgstr ""
 "Para ajustar la hora de reunión, arrastre los bordes de la reunión o pulse "
 "en Autoseleccionar para hacer una elección automática, después pulse Guardar "
@@ -9590,21 +9517,21 @@ msgstr ""
 "actualizados automáticamente, el resto recibirá una notificación por correo "
 "electrónico de cualquier cambio en los planes."
 
-#: C/evolution.xml:4063(title)
+#: C/evolution.xml:4085(title)
 msgid "Attendee List:"
 msgstr "Lista de asistentes:"
 
-#: C/evolution.xml:4064(para)
+#: C/evolution.xml:4086(para)
 msgid "The Attendee List shows the people who have been invited to the appointment."
 msgstr ""
 "La Lista de asistentes muestra a las personas que han sido invitadas a la "
 "reunión."
 
-#: C/evolution.xml:4067(title)
+#: C/evolution.xml:4089(title)
 msgid "Schedule Grid:"
 msgstr "Cuadrícula de planificación:"
 
-#: C/evolution.xml:4068(para)
+#: C/evolution.xml:4090(para)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -9623,7 +9550,7 @@ msgstr ""
 "un URL y ha indtroducido ese URL en la tarjeta del contacto usando el editor "
 "de contactos."
 
-#: C/evolution.xml:4073(para)
+#: C/evolution.xml:4095(para)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV, FTP server, "
 "or remote machine through secure shell or other Web server with HTTP PUT "
@@ -9635,15 +9562,15 @@ msgstr ""
 "web con soporte HTTP PUT. Compruebe con el administrador de su sistema si no "
 "está seguro de disponer de esta funcionalidad."
 
-#: C/evolution.xml:4074(para)
+#: C/evolution.xml:4096(para)
 msgid "To set up Calendar or Free/Busy publishing:"
 msgstr "Para establecer la disponibilidad de publicación de un Calendario:"
 
-#: C/evolution.xml:4077(para) C/evolution.xml:4809(para)
+#: C/evolution.xml:4099(para) C/evolution.xml:4833(para)
 msgid "Click Edit &gt; Preferences, then click Calendar and Tasks."
 msgstr "Pulse Editar &gt; Preferencias, después pulse Calendario y tareas."
 
-#: C/evolution.xml:4080(para)
+#: C/evolution.xml:4102(para)
 msgid ""
 "Click the Calendar Publishing tab, click Add, then select the information "
 "you want to publish."
@@ -9651,23 +9578,23 @@ msgstr ""
 "Pulse en la solapa Publicación de calendarios, pulse Añadir, después "
 "seleccione la información que quiere publicar."
 
-#: C/evolution.xml:4083(para)
+#: C/evolution.xml:4105(para)
 msgid "Select the frequency with which you want to upload data."
 msgstr "Seleccione la frecuencia con la que quiere subir datos."
 
-#: C/evolution.xml:4086(para)
+#: C/evolution.xml:4108(para)
 msgid "Select the calendars you want to display data for."
 msgstr "Seleccione los calendarios para los que quiere mostrar los datos."
 
-#: C/evolution.xml:4089(para)
+#: C/evolution.xml:4111(para)
 msgid "Specify the publishing location for the upload server."
 msgstr "Especifique la ubicación para publicar en el servidor de subidas."
 
-#: C/evolution.xml:4092(para)
+#: C/evolution.xml:4114(para)
 msgid "Type your username and password."
 msgstr "Escriba su nombre de usuario y contraseña."
 
-#: C/evolution.xml:4098(para)
+#: C/evolution.xml:4120(para)
 msgid ""
 "To immediately publish calendar information, go to the Calendar tool and "
 "click Actions &gt; Publish Calendar Information."
@@ -9676,15 +9603,14 @@ msgstr ""
 "herramienta del Calendario y pulse Acciones &gt; Publicar información del "
 "calendario."
 
-#: C/evolution.xml:4100(para)
-msgid ""
-"Evolution allows you to specify a template to use when posting to the Free/"
-"Busy server."
+#: C/evolution.xml:4122(para) C/evolution.xml:6682(para)
+#, fuzzy
+msgid "You can specify a template to use when posting to the Free/Busy server."
 msgstr ""
 "Evolution le permite especificar una plantilla para usar cuando publique "
 "contra el servidor de disponibilidad."
 
-#: C/evolution.xml:4106(para)
+#: C/evolution.xml:4128(para)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their Web calendar, "
 "you can enter it as part of the contact information in the Contacts tool. "
@@ -9697,7 +9623,7 @@ msgstr ""
 "reunión con ellos, Evolution comprueba los horarios y los muestra en los "
 "datos de Disponibilidad."
 
-#: C/evolution.xml:4113(para)
+#: C/evolution.xml:4135(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Calendar items."
@@ -9705,7 +9631,7 @@ msgstr ""
 "Puede usar una búsqueda personalizada, una búsqueda avanzada o una búsqueda "
 "rápida para buscar elementos del Calendario."
 
-#: C/evolution.xml:4116(para)
+#: C/evolution.xml:4138(para)
 msgid ""
 "Evolution enables you to find the Calendar items by using a Customized "
 "Search."
@@ -9713,79 +9639,56 @@ msgstr ""
 "Evolution le permite buscar los elementos del Calendario usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4120(para) C/evolution.xml:4435(para)
-#: C/evolution.xml:4670(para)
-msgid ""
-"Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"stock_search.png\"/> to expand the drop-down list"
-msgstr ""
-"Pulse el botón de búsqueda <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"stock_search.png\"/> para expandir la dista desplegable"
-
-#: C/evolution.xml:4123(para) C/evolution.xml:4438(para)
-#: C/evolution.xml:4673(para)
-msgid "Select the search type:"
-msgstr "Seleccione el tipo de búsqueda:"
-
-#: C/evolution.xml:4126(para) C/evolution.xml:4441(para)
-#: C/evolution.xml:4676(para)
+#: C/evolution.xml:4148(para) C/evolution.xml:4464(para)
+#: C/evolution.xml:4700(para)
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: C/evolution.xml:4129(para) C/evolution.xml:4444(para)
-#: C/evolution.xml:4679(para)
+#: C/evolution.xml:4151(para) C/evolution.xml:4467(para)
+#: C/evolution.xml:4703(para)
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: C/evolution.xml:4132(para) C/evolution.xml:4447(para)
-#: C/evolution.xml:4682(para)
+#: C/evolution.xml:4154(para) C/evolution.xml:4470(para)
+#: C/evolution.xml:4706(para)
 msgid "Any field Contains"
 msgstr "Cualquier campo contiene"
 
-#: C/evolution.xml:4137(para) C/evolution.xml:4687(para)
+#: C/evolution.xml:4159(para) C/evolution.xml:4711(para)
 msgid "Evolution displays the desired Calendar items."
 msgstr "Evolution muestra los elementos del Calendario deseados."
 
-#: C/evolution.xml:4142(para) C/evolution.xml:4692(para)
-msgid "You can perform an advanced search based on any of the search types."
-msgstr ""
-"Puede realizar una búsqueda avanzada basada en cualquiera de los tipos de "
-"búsqueda."
-
-#: C/evolution.xml:4146(para) C/evolution.xml:4696(para)
-msgid "Select the desired search type from the drop-down list."
-msgstr "Seleccione la opción de búsqueda que desea de la lista desplegable."
-
-#: C/evolution.xml:4149(para) C/evolution.xml:4461(para)
-#: C/evolution.xml:4699(para)
+#: C/evolution.xml:4171(para) C/evolution.xml:4485(para)
+#: C/evolution.xml:4723(para)
 msgid "Select Advanced Search to open Advanced Search dialog box."
 msgstr ""
 "Seleccione Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda "
 "avanzada."
 
-#: C/evolution.xml:4150(para) C/evolution.xml:4462(para)
-#: C/evolution.xml:4700(para)
+#: C/evolution.xml:4172(para) C/evolution.xml:4486(para)
+#: C/evolution.xml:4724(para)
 msgid "Search name field displays the search type you have selected."
 msgstr ""
 "El campo de búsqueda de nombre muestra el tipo de búsqueda que ha "
 "seleccionado."
 
-#: C/evolution.xml:4155(para) C/evolution.xml:4467(para)
-#: C/evolution.xml:4705(para)
+#: C/evolution.xml:4177(para) C/evolution.xml:4491(para)
+#: C/evolution.xml:4729(para)
 msgid "Click Add to add rules."
 msgstr "Pulse Añadir para añadir reglas."
 
-#: C/evolution.xml:4158(para) C/evolution.xml:4470(para)
+#: C/evolution.xml:4180(para) C/evolution.xml:4494(para)
+#: C/evolution.xml:4732(para)
 msgid "Select the criteria, and then type a search entry in the given field."
 msgstr ""
 "Seleccione el criterio y después escriba una entrada de búsqueda en el campo "
 "proporcionado."
 
-#: C/evolution.xml:4164(para) C/evolution.xml:4714(para)
+#: C/evolution.xml:4186(para) C/evolution.xml:4738(para)
 msgid "Click Save to save your search results."
 msgstr "Pulse Guardar para guardar los resultados."
 
-#: C/evolution.xml:4169(para)
+#: C/evolution.xml:4191(para)
 msgid ""
 "Displays all the Calendar items that match the criteria that you have "
 "selected from the drop-down list in the Search bar."
@@ -9793,66 +9696,45 @@ msgstr ""
 "Muestra todos los elementos del Calendario que coincidan con los criterios "
 "que haya seleccionado de la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4173(para) C/evolution.xml:4723(para)
+#: C/evolution.xml:4195(para) C/evolution.xml:4747(para)
 msgid "Click the Show drop-down list."
 msgstr "Pulse Mostrar la lista desplegable."
 
-#: C/evolution.xml:4176(para) C/evolution.xml:4516(para)
-#: C/evolution.xml:4726(para)
-msgid "Select the search criteria:"
-msgstr "Seleccione el criterio de búsqueda:"
-
-#: C/evolution.xml:4179(para) C/evolution.xml:4519(para)
-#: C/evolution.xml:4729(para)
+#: C/evolution.xml:4201(para) C/evolution.xml:4543(para)
+#: C/evolution.xml:4753(para)
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#: C/evolution.xml:4182(para) C/evolution.xml:4522(para)
-#: C/evolution.xml:4732(para)
+#: C/evolution.xml:4204(para) C/evolution.xml:4546(para)
+#: C/evolution.xml:4756(para)
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: C/evolution.xml:4185(para)
+#: C/evolution.xml:4207(para)
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: C/evolution.xml:4188(para)
+#: C/evolution.xml:4210(para)
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los próximos 7 días"
 
-#: C/evolution.xml:4203(para) C/evolution.xml:4552(para)
+#: C/evolution.xml:4225(para) C/evolution.xml:4576(para)
 msgid "Favourites"
 msgstr "Favoritos"
 
-#: C/evolution.xml:4212(para) C/evolution.xml:4561(para)
-#: C/evolution.xml:4756(para)
-msgid "Holidays"
-msgstr "Vacaciones"
-
-#: C/evolution.xml:4224(para) C/evolution.xml:4573(para)
-#: C/evolution.xml:4768(para)
-msgid "Key Customers"
-msgstr "Clientes clave"
-
-#: C/evolution.xml:4245(para) C/evolution.xml:4594(para)
-#: C/evolution.xml:4789(para)
-msgid "Time &amp; Expenses"
-msgstr "Tiempo y gastos"
-
-#: C/evolution.xml:4256(para)
+#: C/evolution.xml:4278(para)
 msgid "You can view the desired items listed in the Calendar view."
 msgstr "Puede ver los elementos deseados listados en la vista del Calendario."
 
-#: C/evolution.xml:4261(para)
-msgid ""
-"To print the displayed calendar items, click File &gt; Print or right click "
-"on the calendar item &gt; Print."
+#: C/evolution.xml:4283(para)
+#, fuzzy
+msgid "To print the displayed calendar items, click File &gt; Print."
 msgstr ""
 "Para imprimir los elementos mostrados del calendario, pulse Archivo &gt; "
 "Imprimir o pulse con el botón derecho sobre el elemento del calendario &gt; "
 "Imprimir."
 
-#: C/evolution.xml:4266(para)
+#: C/evolution.xml:4288(para)
 msgid ""
 "Keeping a list of everything you did in the past eventually slows down your "
 "calendar. To delete old events, click Actions &gt; Purge, then enter the "
@@ -9863,29 +9745,31 @@ msgstr ""
 "introduzca el número de días de acontecimientos pasados que quiere mantener. "
 "Pulse Aceptar para purgar los elementos."
 
-#: C/evolution.xml:4271(para)
+#: C/evolution.xml:4293(para)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr "Sólo los asistentes a una reunión pueden delegar una reunión."
 
-#: C/evolution.xml:4274(para)
+#: C/evolution.xml:4296(para)
 msgid "In the Calendar, right-click the meeting you want to delegate."
 msgstr ""
 "En el Calendario, pulse con el botón derecho en la reunión que quiere "
 "delegar."
 
-#: C/evolution.xml:4277(para)
-msgid "Click Delegate Meetings."
+#: C/evolution.xml:4299(para)
+#, fuzzy
+msgid "Click Delegate Meeting."
 msgstr "Pulse Delegar reunión."
 
-#: C/evolution.xml:4280(para)
+#: C/evolution.xml:4302(para)
 msgid "Select the contacts you want to delegate the meeting to."
 msgstr "Seleccione los contactos a los que quiere delegar la reunión."
 
-#: C/evolution.xml:4286(para)
-msgid "Each contact receives a copy of the meeting."
+#: C/evolution.xml:4308(para)
+#, fuzzy
+msgid "Each contact receives a copy of the meeting invitation."
 msgstr "Cada contacto recibe una copia de la reunión."
 
-#: C/evolution.xml:4291(para)
+#: C/evolution.xml:4313(para)
 msgid ""
 "To create a new calendar, click File &gt; New &gt; Calendar. If the calendar "
 "is one you plan to store locally, you need only provide a name and color. If "
@@ -9907,7 +9791,7 @@ msgstr ""
 "añadido el calendario de un equipo de deporte a su calendario, puede que no "
 "necesite actualizarlo más de una vez por semana."
 
-#: C/evolution.xml:4292(para)
+#: C/evolution.xml:4314(para)
 msgid ""
 "The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has "
 "an extensive list of shared online calendars, including national and "
@@ -9919,14 +9803,13 @@ msgstr ""
 "fiestas nacionales y religiosas, fases de la luna, deportes y "
 "acontecimientos locales y regionales."
 
-#: C/evolution.xml:4293(para)
+#: C/evolution.xml:4315(para)
+#, fuzzy
 msgid ""
-"Evolution lets you view and manage calendars on remote CalDAV servers such "
-"as <trademark class=\"registered\">Hula</trademark>. For more information "
-"about Hula, see the <ulink url=\"http://www.hula-project.org\">Hula Project "
-"Web site</ulink>. The procedure to create a CalDAV calendar source is "
-"similar to that of a remote Web calendar source. You can view and create "
-"calendar events on CalDav accounts just like other calendars on Evolution."
+"Evolution lets you view and manage calendars on remote CalDAV servers. The "
+"procedure to create a CalDAV calendar source is similar to that of a remote "
+"Web calendar source. You can view and create calendar events on CalDav "
+"accounts just like other calendars on Evolution."
 msgstr ""
 "Evolution le permite ver y gestionar calendarios en servidores remotos "
 "CalDAV tales como <trademark class=\"registered\">Hula</trademark>. Para "
@@ -9936,19 +9819,26 @@ msgstr ""
 "ver y crear acontecimientos en las cuentas CalDAV igual que en los otros "
 "calendarios de Evolution."
 
-#: C/evolution.xml:4298(para)
+#: C/evolution.xml:4320(para)
+#, fuzzy
 msgid ""
-"The Task List, located in the lower-right corner of the calendar, lets you "
-"keep a list of tasks separate from your calendar appointments. You can use "
-"the list in a larger window by clicking the Tasks button in the switcher or "
-"in the folder tree."
+"The Task List, located in the upper-right corner of the calendar, lets you "
+"keep a list of tasks separate from your calendar appointments."
 msgstr ""
 "La libreta de tareas, localizada en la esquina inferior derecha del "
 "calendario, permite mantener la lista de tareas separada de las citas del "
 "calendario. Para mostrarla en una ventana más grande, pulse el botón Tareas "
 "en el selector o en el árbol de carpetas."
 
-#: C/evolution.xml:4299(para)
+#: C/evolution.xml:4321(para)
+msgid ""
+"You can use the list in a larger window by clicking the Tasks button in the "
+"side bar."
+msgstr ""
+"Puede usar la lista en la ventana más grande pulsando el botón Tareas en la "
+"barra lateral."
+
+#: C/evolution.xml:4322(para)
 msgid ""
 "Task Lists are more easily organized in the dedicated Tasks tool. Each task "
 "list is assigned a color, and you can use the Tasks tool switcher to hide "
@@ -9962,40 +9852,41 @@ msgstr ""
 "calendario aparecen las tareas de todas las listas de tareas, coloreadas por "
 "su código de lista."
 
-#: C/evolution.xml:4302(link) C/evolution.xml:4313(title)
+#: C/evolution.xml:4325(link) C/evolution.xml:4336(title)
 msgid "Creating a New Task List"
 msgstr "Crear una nueva lista de tareas"
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:4305(link) C/evolution.xml:4332(title)
+#: C/evolution.xml:4328(link) C/evolution.xml:4355(title)
 msgid "Creating a New Task"
 msgstr "Crear una tarea nueva"
 
-#: C/evolution.xml:4308(link) C/evolution.xml:4377(title)
+#: C/evolution.xml:4331(link) C/evolution.xml:4400(title)
 msgid "Assigned Tasks"
 msgstr "Tareas asignadas"
 
-#: C/evolution.xml:4316(para)
+#: C/evolution.xml:4339(para)
 msgid "Click File &gt; New &gt; Task List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de tareas."
 
-#: C/evolution.xml:4319(para)
+#: C/evolution.xml:4342(para)
 msgid "Specify the name and color for the task list."
 msgstr "Especifique el nombre y el color para la lista de tareas."
 
-#: C/evolution.xml:4322(para)
+#: C/evolution.xml:4345(para)
 msgid "(Optional) If the task is an online list, specify the URL of the task list."
 msgstr ""
 "(Opcional) Si la tarea es una lista en línea, especifique el URL de la lista "
 "de tareas."
 
-#: C/evolution.xml:4328(para)
+#: C/evolution.xml:4351(para)
+#, fuzzy
 msgid ""
 "After you have added a task to your to-do list, its summary appears in the "
 "Summary section of the task list. To view or edit a detailed description of "
 "an item, double-click it, or right-click it and select Open. You can delete "
-"items by selecting them, then clicking Delete.The list of tasks is sorted in "
-"a similar way to the list of e-mail messages in Evolution Mail. Click once "
+"items by selecting them, then clicking Delete. The list of tasks is sorted "
+"in a similar way to the list of email messages in Evolution Mail. Click once "
 "on a message header to change the direction and type of sorting, or right-"
 "click to add or remove columns from the display."
 msgstr ""
@@ -10009,52 +9900,38 @@ msgstr ""
 "dirección y tipo de ordenación, o pulse con el botón derecho para añadir o "
 "eliminar columnas desde la pantalla."
 
-#: C/evolution.xml:4335(para)
-msgid "Click New &gt; Task."
-msgstr "Pulse Nuevo &gt; Tarea."
+#: C/evolution.xml:4358(para)
+msgid "Click File &gt; New &gt; Task."
+msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea."
 
-#: C/evolution.xml:4338(para) C/evolution.xml:4389(para)
+#: C/evolution.xml:4361(para) C/evolution.xml:4412(para)
 msgid "Select a group for the task."
 msgstr "Seleccione un grupo para la tarea."
 
-#: C/evolution.xml:4341(para)
-msgid "Type a brief summary for the task in the Summary field."
-msgstr "Escriba un breve resumen para la tarea en el campo Resumen."
-
-#: C/evolution.xml:4344(para)
-msgid "(Optional) Specify a starting date and ending date for the task"
+#: C/evolution.xml:4367(para)
+#, fuzzy
+msgid "(Optional) Specify a starting date and ending date for the task."
 msgstr ""
 "(Opcional) especifique una fecha de comienzo y una fecha de finalización "
 "para la tarea"
 
-#: C/evolution.xml:4347(para)
-msgid "(Optional) Specify a starting time and ending time for the task"
+#: C/evolution.xml:4370(para)
+#, fuzzy
+msgid "(Optional) Specify a starting time and ending time for the task."
 msgstr ""
 "(Opcional) especifique una hora de comienzo y una hora de finalización para "
 "la tarea"
 
-#: C/evolution.xml:4356(para) C/evolution.xml:4407(para)
-#: C/evolution.xml:4622(para)
-msgid "(Optional) Type a category in the Categories field."
-msgstr "(Opcional) escriba una categoría en el campo Categoría."
-
-#: C/evolution.xml:4357(para)
-msgid "To show or hide the Categories field, click View &gt; Categories."
-msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
-
-#: C/evolution.xml:4360(para) C/evolution.xml:4411(para)
-msgid "Type a description for the task."
-msgstr "Escriba una descripción para la tarea."
-
-#: C/evolution.xml:4363(para) C/evolution.xml:4419(para)
+#: C/evolution.xml:4386(para) C/evolution.xml:4442(para)
+#: C/evolution.xml:4664(para)
 msgid ""
 "(Optional) Click Options &gt; Classifications, then select a classification "
-"(as Public, Private or Confidential) for the task."
+"(as Public, Private or Confidential)."
 msgstr ""
 "(Opcional) pulse Opciones &gt; Clasificaciones, después seleccione una "
-"clasificación (como Público, Privado o Confidencial) para la tarea."
+"clasificación (como Público, Privado o Confidencial)."
 
-#: C/evolution.xml:4366(para) C/evolution.xml:4422(para)
+#: C/evolution.xml:4389(para) C/evolution.xml:4445(para)
 msgid ""
 "(Optional) To specify a status for the task, click Options &gt; Status "
 "Details."
@@ -10062,30 +9939,16 @@ msgstr ""
 "(Opcional) para especificar un estado para la tarea, pulse Opciones &gt; "
 "Detalles del estado."
 
-#: C/evolution.xml:4369(para)
-msgid ""
-"(Optional) To add an attachment to the task, drag and drop the attachment "
-"into the attachment bar."
-msgstr ""
-"(Opcional) para añadir un adjunto a la tarea, arrastre y suelte el adjunto "
-"en la barra de adjuntos."
-
-#: C/evolution.xml:4371(para) C/evolution.xml:4416(para)
-#: C/evolution.xml:4637(para)
-msgid "Click the Attach button on the toolbar, then browse to the attachment."
-msgstr ""
-"Pulse el botón Adjuntar en la barra de tareas, después examine para "
-"seleccionar el adjunto."
-
-#: C/evolution.xml:4378(para)
+#: C/evolution.xml:4401(para)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution se puede usar para asignar una tarea a varias personas."
 
-#: C/evolution.xml:4379(para)
+#: C/evolution.xml:4402(para)
+#, fuzzy
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
 "such as <quote>chair</quote> or <quote>required.</quote> When you save the "
-"task, each attendee is sent an e-mail with the task information, which also "
+"task, each attendee is sent an email with the task information, which also "
 "gives them the option to respond."
 msgstr ""
 "Al asignar una tarea puede especificar los asistentes en varias categorías, "
@@ -10094,21 +9957,22 @@ msgstr ""
 "datos de la cita y tendrán la opción de responder."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:4380(para)
+#: C/evolution.xml:4403(para)
 msgid "To assign a new task:"
 msgstr "Asignar una tarea nueva:"
 
-#: C/evolution.xml:4383(para)
+#: C/evolution.xml:4406(para)
 msgid "Click File &gt; New &gt; Assigned Task."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea asignada."
 
-#: C/evolution.xml:4392(para)
+#: C/evolution.xml:4415(para)
+#, fuzzy
 msgid ""
 "Click Add, or press Insert key, or right click and then press Add to add the "
-"e-mail addresses of people you want to assign the task.To remove an attendee "
-"from the list, select an attendee, then press Remove.To edit a field, select "
-"the field, then click Edit.Click View on the menu bar to show or hide the "
-"Type, Role, Status, and RSVP fields."
+"email addresses of people you want to assign the task. To remove an attendee "
+"from the list, select an attendee, then press Remove. To edit a field, "
+"select the field, then click Edit. Click View on the menu bar to show or "
+"hide the Type, Role, Status, and RSVP fields."
 msgstr ""
 "Pulse Añadir, pulse la tecla Insertar o pulse con el botón derecho y después "
 "pulse Añadir para añadir las direcciones de correo electrónico de las "
@@ -10117,11 +9981,7 @@ msgstr ""
 "seleccione el campo y después pulse Editar. Pulse Ver en la barra de menú "
 "para mostrar u ocultar los campos Tipo, Rol, Estado y RSVP."
 
-#: C/evolution.xml:4395(para)
-msgid "Type a brief summary of the task in the Summary field."
-msgstr "Escriba un breve sumario de la tarea en el campo Sumario."
-
-#: C/evolution.xml:4398(para)
+#: C/evolution.xml:4421(para)
 msgid ""
 "(Optional) Specify a starting date and time, and a due date and time for the "
 "task."
@@ -10129,35 +9989,21 @@ msgstr ""
 "(Opcional) especifique una fecha y hora de comienzo y una fecha y hora de "
 "caducidad para la tarea."
 
-#: C/evolution.xml:4414(para)
-msgid ""
-"(Optional) To add an attachment to the assigned task, drag and drop the "
-"attachment into the attachment bar."
-msgstr ""
-"(Opcional) para añadir un adjunto a la tarea asignada, arrastre y suelte el "
-"adjunto en la barra de adjuntos."
-
-#: C/evolution.xml:4428(title)
+#: C/evolution.xml:4451(title)
 msgid "Searching for Task Items"
 msgstr "Buscar elementos de las tareas"
 
-#: C/evolution.xml:4431(para)
+#: C/evolution.xml:4454(para)
 msgid "Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 "Evolution le permite buscar los elementos de las tareas usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4452(para)
+#: C/evolution.xml:4475(para)
 msgid "Evolution displays the desired Task items."
 msgstr "Evolution muestra los elementos de las tareas deseados."
 
-#: C/evolution.xml:4457(para)
-msgid "You can perform an advanced search based on any of the search type."
-msgstr ""
-"Puede realizar una búsqueda avanzada basada en cualquiera de los tipos de "
-"búsqueda."
-
-#: C/evolution.xml:4475(para)
+#: C/evolution.xml:4499(para)
 msgid ""
 "Displays all the task items that match the criteria that you have selected "
 "from the drop-down list at the top left side, just above the display pane."
@@ -10166,7 +10012,7 @@ msgstr ""
 "que haya seleccionado de la lista desplegable en la parte superior "
 "izquierda, justo encima del panel de visualización."
 
-#: C/evolution.xml:4477(para)
+#: C/evolution.xml:4501(para)
 msgid ""
 "This feature provides the following best quick search options. This allows "
 "you to quickly see when tasks are due, as it can become unwieldy for "
@@ -10176,19 +10022,19 @@ msgstr ""
 "permite ver rápidamente cuándo vencen las tareas, ya que puede ser "
 "interesante para planificarse si tiene muchas tareas entre manos."
 
-#: C/evolution.xml:4479(title)
+#: C/evolution.xml:4503(title)
 msgid "Any Category:"
 msgstr "Cualquier categoría:"
 
-#: C/evolution.xml:4480(para)
+#: C/evolution.xml:4504(para)
 msgid "Displays all the tasks that fall under any category."
 msgstr "Muestra todas las tareas que están bajo cualquier categoría."
 
-#: C/evolution.xml:4483(title)
+#: C/evolution.xml:4507(title)
 msgid "Unmatched:"
 msgstr "No coincidente:"
 
-#: C/evolution.xml:4484(para)
+#: C/evolution.xml:4508(para)
 msgid ""
 "Displays all the tasks that do not fall under any of the categories listed "
 "here."
@@ -10196,19 +10042,19 @@ msgstr ""
 "Muestra todas las tareas que no están bajo ninguna de las categorías aquí "
 "listadas."
 
-#: C/evolution.xml:4487(title)
+#: C/evolution.xml:4511(title)
 msgid "Next 7 Days' Tasks:"
 msgstr "Tareas de los próximos 7 días:"
 
-#: C/evolution.xml:4488(para)
+#: C/evolution.xml:4512(para)
 msgid "Displays all the active tasks that are due within the next seven days."
 msgstr "Muestra todas las tareas activas que vencerán en los próximos siete días."
 
-#: C/evolution.xml:4491(title)
+#: C/evolution.xml:4515(title)
 msgid "Active Tasks:"
 msgstr "Tareas activas:"
 
-#: C/evolution.xml:4492(para)
+#: C/evolution.xml:4516(para)
 msgid ""
 "Displays all the tasks whose due date is yet to come. This allows you to see "
 "the date due for tasks due in the future."
@@ -10216,35 +10062,36 @@ msgstr ""
 "Muestra todas las tareas cuya fecha de vencimiento está por llegar. Esto le "
 "permite ver la fecha de vencimiento de las tareas que caducan en el futuro."
 
-#: C/evolution.xml:4495(title)
+#: C/evolution.xml:4519(title)
 msgid "Over Due Tasks:"
 msgstr "Tareas vencidas:"
 
-#: C/evolution.xml:4496(para)
+#: C/evolution.xml:4520(para)
 msgid "Displays all the tasks whose end date has already passed."
 msgstr "Muestra todas las tareas cuya fecha de vencimiento ya ha pasado."
 
-#: C/evolution.xml:4499(title)
+#: C/evolution.xml:4523(title)
 msgid "Completed Tasks:"
 msgstr "Tareas completadas:"
 
-#: C/evolution.xml:4500(para)
+#: C/evolution.xml:4524(para)
 msgid "Displays the tasks whose status is 100% completed."
 msgstr "Muestra las tareas cuyo estado es 100% completado."
 
-#: C/evolution.xml:4503(title)
+#: C/evolution.xml:4527(title)
 msgid "Tasks With Attachment:"
 msgstr "Tareas con adjuntos:"
 
-#: C/evolution.xml:4504(para)
-msgid "It shows all the tasks with attachments."
+#: C/evolution.xml:4528(para)
+#, fuzzy
+msgid "Displays all the tasks with attachments."
 msgstr "Muestra todas las tareas con adjuntos."
 
-#: C/evolution.xml:4507(title)
+#: C/evolution.xml:4531(title)
 msgid "&lt;List of Categories&gt;:"
 msgstr "&lt;Lista de categorías&gt;:"
 
-#: C/evolution.xml:4508(para)
+#: C/evolution.xml:4532(para)
 msgid ""
 "Lists all the tasks that belong to a particular category such as "
 "Anniversary, Holidays, Gifts, etc."
@@ -10252,39 +10099,47 @@ msgstr ""
 "Lista todas las tareas que pertenezcan a una categoría particular tal como "
 "Aniversarios, Vacaciones, Reglados, etc."
 
-#: C/evolution.xml:4510(para)
+#: C/evolution.xml:4534(para)
 msgid "To perform quick search,"
 msgstr "Para realizar una búsqueda rápida,"
 
-#: C/evolution.xml:4513(para)
+#: C/evolution.xml:4537(para)
 msgid "Click the Show drop-down list from the Search bar."
 msgstr "Pulse sobre la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4525(para)
+#: C/evolution.xml:4549(para)
 msgid "Next 7 Days Tasks"
 msgstr "Tareas de los próximos 7 días"
 
-#: C/evolution.xml:4528(para)
+#: C/evolution.xml:4552(para)
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: C/evolution.xml:4531(para)
+#: C/evolution.xml:4555(para)
 msgid "Over Due Tasks"
 msgstr "Tareas vencidas"
 
-#: C/evolution.xml:4534(para)
+#: C/evolution.xml:4558(para)
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: C/evolution.xml:4537(para)
+#: C/evolution.xml:4561(para)
 msgid "Tasks With Attachments"
 msgstr "Tareas con adjuntos"
 
-#: C/evolution.xml:4605(para)
+#: C/evolution.xml:4585(para) C/evolution.xml:4780(para)
+msgid "Holidays"
+msgstr "Vacaciones"
+
+#: C/evolution.xml:4597(para) C/evolution.xml:4792(para)
+msgid "Key Customers"
+msgstr "Clientes clave"
+
+#: C/evolution.xml:4629(para)
 msgid "You can view the desired items listed in the Task view."
 msgstr "Puede ver los elementos deseados listados en la vista de tareas."
 
-#: C/evolution.xml:4611(para)
+#: C/evolution.xml:4635(para)
 msgid ""
 "In Evolution, the Memos component lets you create, edit, and store journal "
 "entries without dates, using the filesystem as a backend."
@@ -10292,23 +10147,24 @@ msgstr ""
 "En Evolution, el componente de Notas le permite crear, editar y almacenar "
 "entradas sin fecha de su diario, usando el sistema de archivos como «backend»."
 
-#: C/evolution.xml:4613(para)
+#: C/evolution.xml:4637(para)
 msgid "To create a new memo entry:"
 msgstr "Crear una nueva nota:"
 
-#: C/evolution.xml:4616(para)
+#: C/evolution.xml:4640(para)
 msgid "Click File &gt; New &gt; Memo."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Nota."
 
-#: C/evolution.xml:4619(para)
-msgid "Select a group in which you would create a memo entry."
-msgstr "Seleccione un grupo en el que quiera crear una nota."
+#: C/evolution.xml:4643(para) C/evolution.xml:5713(para)
+#, fuzzy
+msgid "Select the Group in which you would like to create the entry."
+msgstr "Seleccione el grupo en el que quiere crear la entrada."
 
-#: C/evolution.xml:4626(para)
-msgid "Type text for the memo in the Summary field."
-msgstr "Escriba el texto para la nota en el campo Resumen."
+#: C/evolution.xml:4647(para)
+msgid "To show or hide Categories field, click View &gt; Categories."
+msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
 
-#: C/evolution.xml:4629(para) C/evolution.xml:5738(para)
+#: C/evolution.xml:4653(para) C/evolution.xml:5719(para)
 msgid ""
 "In the Start Date field, type the date this reminder note should appear in "
 "the recipients' Calendars."
@@ -10316,57 +10172,38 @@ msgstr ""
 "En el campo Fecha de inicio escriba la fecha en la que esta nota "
 "recordatoria debería aparecer en los calendarios de los Destinatarios."
 
-#: C/evolution.xml:4632(para)
-msgid "Type text for the memo in the Memo Content field."
-msgstr "Escriba el texto para la nota en el campo Contenido de la nota."
-
-#: C/evolution.xml:4635(para)
-msgid ""
-"(Optional) To add an attachment to the memo, drag and drop the attachment "
-"into the attachment bar."
-msgstr ""
-"(Opcional) para añadir un adjunto a la nota, arrastre y suelte el adjunto en "
-"la barra de adjuntos."
-
-#: C/evolution.xml:4640(para)
-msgid ""
-"(Optional) Click Options &gt; Classifications, then select a classification "
-"(as Public, Private or Confidential) for the memo."
-msgstr ""
-"(Opcional) pulse Opciones &gt; Clasificaciones, después seleccione una "
-"clasificación (como Público, Privado o Confidencial) para la nota."
-
-#: C/evolution.xml:4645(title)
+#: C/evolution.xml:4669(title)
 msgid "The Memo List"
 msgstr "La lista de notas"
 
-#: C/evolution.xml:4646(para)
+#: C/evolution.xml:4670(para)
+#, fuzzy
 msgid ""
 "As with calendars and tasks, you can create multiple memo lists. Each memo "
-"list is assigned a color, and you can use the Memos switcher to hide and "
-"show memos."
+"list is assigned a color, and you can use the side bar to hide and show memo "
+"lists."
 msgstr ""
 "Al igual que los calendarios y las tareas, puede crear múltiples listas de "
 "notas. Cada lista de notas tendrá su color y podrá usar el selector de Notas "
 "para mostrar y ocultar las notas."
 
-#: C/evolution.xml:4647(para)
+#: C/evolution.xml:4671(para)
 msgid "To create a new memo list:"
 msgstr "Crear una nueva lista de notas:"
 
-#: C/evolution.xml:4650(para)
+#: C/evolution.xml:4674(para)
 msgid "Click File &gt; New &gt; Memo List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de notas."
 
-#: C/evolution.xml:4653(para)
-msgid "Type the group, name and color for the memo list."
-msgstr "Escriba el grupo, nombre y color para la lista de notas."
+#: C/evolution.xml:4677(para)
+msgid "Enter the type, name and color for the memo list."
+msgstr "Escriba el tipo, nombre y color para la lista de notas."
 
-#: C/evolution.xml:4662(title)
+#: C/evolution.xml:4686(title)
 msgid "Searching for Memo Items"
 msgstr "Buscar elementos de las notas"
 
-#: C/evolution.xml:4663(para)
+#: C/evolution.xml:4687(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Memo Items."
@@ -10374,19 +10211,17 @@ msgstr ""
 "Puede usar una búsqueda personalizada, una búsqueda avanzada o una búsqueda "
 "rápida para buscar elementos de las notas."
 
-#: C/evolution.xml:4666(para)
+#: C/evolution.xml:4690(para)
 msgid "Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 "Evolution le permite buscar los elementos de las notas usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4708(para)
-msgid "Select the criteria, then type a search entry in the given field."
-msgstr ""
-"Seleccione el criterio y después escriba una entrada de búsqueda en el campo "
-"proporcionado."
+#: C/evolution.xml:4720(para)
+msgid "Select the desired search type from the drop-down list."
+msgstr "Seleccione la opción de búsqueda que desea de la lista desplegable."
 
-#: C/evolution.xml:4719(para)
+#: C/evolution.xml:4743(para)
 msgid ""
 "Displays all the Memo items that match the criteria that you have selected "
 "from the Show drop-down list in the Search bar."
@@ -10394,11 +10229,11 @@ msgstr ""
 "Muestra todos los elementos de las notas que coincidan con los criterios que "
 "haya seleccionado ç de la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4798(para)
+#: C/evolution.xml:4822(para)
 msgid "You can view the desired items listed in the Memo view."
 msgstr "Puede ver los elementos deseados listados en la vista del notas."
 
-#: C/evolution.xml:4806(para)
+#: C/evolution.xml:4830(para)
 msgid ""
 "Evolution supports the use of time zones. If you share calendar files with "
 "friends or co-workers, you might need to configure your time zone."
@@ -10407,19 +10242,19 @@ msgstr ""
 "archivos de calendario con amigos o compañeros de trabajo es bastante "
 "posible que tenga que configurar su zona horaria."
 
-#: C/evolution.xml:4812(para)
+#: C/evolution.xml:4836(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
 msgstr "Pulse el icono junto al campo Zona horaria, después seleccione su ubicación."
 
-#: C/evolution.xml:4813(para)
+#: C/evolution.xml:4837(para)
 msgid "Each red dot represents a major city."
 msgstr "Cada punto rojo representa una gran ciudad."
 
-#: C/evolution.xml:4816(para)
+#: C/evolution.xml:4840(para)
 msgid "Select a city, then click OK."
 msgstr "Seleccione una ciudad, después pulse Aceptar."
 
-#: C/evolution.xml:4819(para)
+#: C/evolution.xml:4843(para)
 msgid ""
 "You can also configure time zone information specific to each appointment. "
 "To do that, simply create a new appointment and click the globe to customize "
@@ -10436,19 +10271,19 @@ msgstr ""
 "las llamadas con varias horas de diferencia. Usar las zonas horarias "
 "adecuadas en cada cita ayuda a evitar esa confusión potencial."
 
-#: C/evolution.xml:4823(title)
+#: C/evolution.xml:4847(title)
 msgid "Marcus Bains Line"
 msgstr "Línea Marcus Bains"
 
-#: C/evolution.xml:4824(para)
+#: C/evolution.xml:4848(para)
 msgid ""
 "The Marcus Bains Line is a marker to show the current date and time. This "
-"feature is now available in the Evolution calendar."
+"feature is available in the Evolution calendar."
 msgstr ""
 "La línea Marcus Bains es un marcador para mostrar la fecha y hora actuales. "
-"Esta característica ahora está disponible en el calendario de Evolution."
+"Ahora esta característica está disponible en el calendario de Evolution."
 
-#: C/evolution.xml:4830(para)
+#: C/evolution.xml:4854(para)
 msgid ""
 "<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
 "Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
@@ -10459,28 +10294,28 @@ msgstr ""
 "2000 y 2003. Al igual que Evolution, es software libre y está licenciado "
 "bajo la GPL."
 
-#: C/evolution.xml:4833(link) C/evolution.xml:4853(title)
+#: C/evolution.xml:4857(link) C/evolution.xml:4877(title)
 msgid "Evolution Exchange Features"
 msgstr "Características de Evolution Exchange"
 
-#: C/evolution.xml:4836(link) C/evolution.xml:4955(title)
+#: C/evolution.xml:4860(link) C/evolution.xml:4979(title)
 msgid "Adding Your Exchange Account to Evolution"
 msgstr "Añadir su cuenta Exchange a Evolution"
 
-#: C/evolution.xml:4839(link) C/evolution.xml:5122(title)
+#: C/evolution.xml:4863(link) C/evolution.xml:5097(title)
 msgid "Accessing the Exchange Server"
 msgstr "Acceder al servidor Exchange"
 
-#: C/evolution.xml:4842(link) C/evolution.xml:5130(title)
+#: C/evolution.xml:4866(link) C/evolution.xml:5105(title)
 msgid "Settings Exclusive to Evolution Exchange"
 msgstr "Ajustes exclusivos de Evolution Exchange"
 
-#: C/evolution.xml:4845(link) C/evolution.xml:5153(link)
-#: C/evolution.xml:5371(title)
+#: C/evolution.xml:4869(link) C/evolution.xml:5128(link)
+#: C/evolution.xml:5350(title)
 msgid "Scheduling Meetings with Free/Busy"
 msgstr "Planificar citas según disponibilidad"
 
-#: C/evolution.xml:4849(para)
+#: C/evolution.xml:4873(para)
 msgid ""
 "Evolution Exchange works only with Exchange 2000 and later, and requires "
 "that Outlook Web Access be enabled. Each user needs a valid Microsoft "
@@ -10490,23 +10325,23 @@ msgstr ""
 "habilitar el componente Outlook Web Access. Cada usuario debe disponer de "
 "una cuenta válida en el servidor Microsoft Exchange, incluida la licencia."
 
-#: C/evolution.xml:4854(para)
+#: C/evolution.xml:4878(para)
 msgid "Evolution Exchange supports the following basic Microsoft Exchange features:"
 msgstr ""
 "Evolution Exchange soporta las siguientes características básicas de "
 "Microsoft Exchange:"
 
-#: C/evolution.xml:4857(para) C/evolution.xml:6572(link)
-#: C/evolution.xml:6583(title) C/evolution.xml:6630(link)
-#: C/evolution.xml:6644(title)
+#: C/evolution.xml:4881(para) C/evolution.xml:6538(link)
+#: C/evolution.xml:6549(title) C/evolution.xml:6597(link)
+#: C/evolution.xml:6611(title)
 msgid "General"
 msgstr "General"
 
-#: C/evolution.xml:4861(title)
+#: C/evolution.xml:4885(title)
 msgid "Remote Exchange Information Store:"
 msgstr "Almacén remoto de información de Exchange:"
 
-#: C/evolution.xml:4862(para)
+#: C/evolution.xml:4886(para)
 msgid ""
 "Allows you to access mail, address book (including the Global Address List "
 "folder), calendars, and task folders on an Exchange server from Evolution."
@@ -10515,19 +10350,19 @@ msgstr ""
 "carpeta Lista de direcciones globales), calendarios y carpetas de tareas en "
 "un servidor Exchange desde Evolution."
 
-#: C/evolution.xml:4867(title)
+#: C/evolution.xml:4891(title)
 msgid "Palm Synchronization:"
 msgstr "Sincronización con Palm:"
 
-#: C/evolution.xml:4868(para)
+#: C/evolution.xml:4892(para)
 msgid "Supported for Contacts and Calendars on Exchange."
 msgstr "Compatibilidad con los contactos y calendarios de Exchange."
 
-#: C/evolution.xml:4873(title)
+#: C/evolution.xml:4897(title)
 msgid "Password Management:"
 msgstr "Gestión de contraseñas:"
 
-#: C/evolution.xml:4874(para)
+#: C/evolution.xml:4898(para)
 msgid ""
 "Allows you to reset your password. If your password has expired, Evolution "
 "asks you to change your password at startup."
@@ -10535,15 +10370,15 @@ msgstr ""
 "Le permite borrar su contraseña. Si su contraseña ha caducado, Evolution le "
 "pregunta si quiere cambiarla durante el inicio."
 
-#: C/evolution.xml:4880(para) C/evolution.xml:5460(para)
+#: C/evolution.xml:4904(para) C/evolution.xml:5439(para)
 msgid "Mail"
 msgstr "Correo"
 
-#: C/evolution.xml:4884(title)
+#: C/evolution.xml:4908(title)
 msgid "Viewing Mail in Exchange Folders:"
 msgstr "Ver correo en carpetas Exchange:"
 
-#: C/evolution.xml:4885(para)
+#: C/evolution.xml:4909(para)
 msgid ""
 "Mail stored on the Exchange server is visible in the Mail component in "
 "Evolution."
@@ -10551,15 +10386,17 @@ msgstr ""
 "El correo almacenado en el servidor Exchange se verá en el componente de "
 "correo de Evolution."
 
-#: C/evolution.xml:4890(title)
-msgid "Sending E-mail via Exchange Protocols:"
+#: C/evolution.xml:4914(title)
+#, fuzzy
+msgid "Sending Email via Exchange Protocols:"
 msgstr "Envío de correo mediante protocolos Exchange:"
 
-#: C/evolution.xml:4891(para)
+#: C/evolution.xml:4915(para)
+#, fuzzy
 msgid ""
-"If you use the Microsoft Exchange mail transport protocol to send e-mail, "
-"make sure that the address you have entered as your e-mail address is "
-"exactly the one that the Exchange server has on file. This might be "
+"If you use the Microsoft Exchange mail transport protocol to send email, "
+"make sure that the address you have entered as your email address is exactly "
+"the one that the Exchange server has on file. This might be "
 "<quote>yourname@exchange-server.example.com</quote> rather than "
 "<quote>yourname@example.com.</quote>"
 msgstr ""
@@ -10570,24 +10407,25 @@ msgstr ""
 "<quote>sunombre@exchange-server.ejemplo.com</quote> en lugar de "
 "<quote>sunombre@ejemplo.com.</quote>."
 
-#: C/evolution.xml:4896(title)
+#: C/evolution.xml:4920(title)
 msgid "Out of Office Message:"
 msgstr "Mensaje de Estoy fuera de la oficina:"
 
-#: C/evolution.xml:4897(para)
+#: C/evolution.xml:4921(para)
+#, fuzzy
 msgid ""
 "You can set <quote>out of Office</quote> message that will automatically be "
-"sent to people who send mails to you while you are away from office."
+"sent to people who send mail to you while you are away from office."
 msgstr ""
 "Puede establecer su mensaje <quote>Estoy fuera de la oficina</quote> que se "
 "enviará automáticamente a las personas que le envíen correos mientras está "
 "fuera de la oficina."
 
-#: C/evolution.xml:4902(title)
+#: C/evolution.xml:4926(title)
 msgid "Send Options:"
 msgstr "Opciones de envío:"
 
-#: C/evolution.xml:4903(para)
+#: C/evolution.xml:4927(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message so that the "
 "recipients will know how important the message is.The priority can have one "
@@ -10603,16 +10441,16 @@ msgstr ""
 "Confidencial respectivamente. También puede activar la confirmación de envío "
 "de mensaje y de lectura de mensaje para los mensajes enviados."
 
-#: C/evolution.xml:4909(para) C/evolution.xml:5483(para)
-#: C/evolution.xml:7026(link) C/evolution.xml:7096(title)
+#: C/evolution.xml:4933(para) C/evolution.xml:5462(para)
+#: C/evolution.xml:6993(link) C/evolution.xml:7063(title)
 msgid "Calendar"
 msgstr "Calendario"
 
-#: C/evolution.xml:4913(title)
+#: C/evolution.xml:4937(title)
 msgid "Meeting Requests/Proposal:"
 msgstr "Solicitud y convocatoria de reuniones:"
 
-#: C/evolution.xml:4914(para)
+#: C/evolution.xml:4938(para)
 msgid ""
 "Allows Evolution users to schedule meetings. You can check when other users "
 "are busy according to their calendars and send the meeting requests "
@@ -10622,11 +10460,11 @@ msgstr ""
 "cuando están ocupados los otros usuarios de acuerdo con sus calendarios y "
 "enviar peticiones de reunión de forma consecuente."
 
-#: C/evolution.xml:4919(title)
+#: C/evolution.xml:4943(title)
 msgid "Adding iCalendar Meeting Requests to the Calendar:"
 msgstr "Añadir solicitudes de reuniones iCalendar al calendario:"
 
-#: C/evolution.xml:4920(para)
+#: C/evolution.xml:4944(para)
 msgid ""
 "Allows you to add the iCalendar meeting requests you receive to your "
 "Exchange calendar. Note that you need to specify the calendar from the list, "
@@ -10636,39 +10474,40 @@ msgstr ""
 "calendario Exchange. Nótese que necesita especificar el calendario de la "
 "lista, en la que quiere añadir sus horarios de reuniones."
 
-#: C/evolution.xml:4926(para) C/evolution.xml:5395(para)
-#: C/evolution.xml:5494(para)
+#: C/evolution.xml:4950(para) C/evolution.xml:5374(para)
+#: C/evolution.xml:5473(para)
 msgid "Contacts"
 msgstr "Contactos"
 
-#: C/evolution.xml:4930(title)
+#: C/evolution.xml:4954(title)
 msgid "Address Completion:"
 msgstr "Autocompletado de direcciones:"
 
-#: C/evolution.xml:4931(para)
+#: C/evolution.xml:4955(para)
 msgid "Supported for your Exchange Contacts folder."
 msgstr "Soporte para sus carpeta de contactos Exchange."
 
-#: C/evolution.xml:4936(title)
+#: C/evolution.xml:4960(title)
 msgid "Adding vCards to the Address Book:"
 msgstr "Añadir vCards a la libreta de direcciones:"
 
-#: C/evolution.xml:4937(para)
+#: C/evolution.xml:4961(para)
+#, fuzzy
 msgid ""
 "Allows you to save the vCards you receive in attachment to your Exchange "
 "address book.New Address Book entries can also be created on Exchange from "
-"received e-mail messages with a single click."
+"received email messages with a single click."
 msgstr ""
 "Le permite guardar las vCards que reciba como adjuntos a su libreta de "
 "direcciones Exchange. Las nuevas entradas para la libreta de direcciones "
 "también se pueden crear desde mensajes de correo-e recibidos con una sola "
 "pulsación."
 
-#: C/evolution.xml:4943(para)
+#: C/evolution.xml:4967(para)
 msgid "Work Offline (disconnected mode)"
 msgstr "«Trabajar desconectado» (modo desconectado)"
 
-#: C/evolution.xml:4944(para)
+#: C/evolution.xml:4968(para)
 msgid ""
 "To mark a folder for offline usage, right-click the folder, then click "
 "Properties. Click Copy Folder Content Locally for Offline Operation. For "
@@ -10680,11 +10519,11 @@ msgstr ""
 "carpeta localmente para operación desconectada. Para obtener más información "
 "vea <link linkend=\"usage-mail-getnsend-offline\">Trabar desconectado</link>."
 
-#: C/evolution.xml:4949(para)
+#: C/evolution.xml:4973(para)
 msgid "Recall Message function is not available."
 msgstr "La función Recordar mensaje no está disponible."
 
-#: C/evolution.xml:4956(para)
+#: C/evolution.xml:4980(para)
 msgid ""
 "After you have installed Evolution Exchange, you need to set up access for "
 "your Exchange account on both the Exchange server and within Evolution."
@@ -10692,35 +10531,35 @@ msgstr ""
 "Después de instalar Evolution Exchange, necesita configurar el acceso a su "
 "cuenta Exchange tanto en el servidor Exchange como en Evolution."
 
-#: C/evolution.xml:4959(link) C/evolution.xml:4976(title)
+#: C/evolution.xml:4983(link) C/evolution.xml:5000(title)
 msgid "Exchange Server Settings"
 msgstr "Configuración del servidor Exchange"
 
-#: C/evolution.xml:4962(link) C/evolution.xml:4990(title)
+#: C/evolution.xml:4986(link) C/evolution.xml:5014(title)
 msgid "Standard Configuration Tool for Evolution Exchange"
 msgstr "Herramienta de configuración estándar para Evolution Exchange"
 
-#: C/evolution.xml:4965(link) C/evolution.xml:4994(title)
+#: C/evolution.xml:4989(link) C/evolution.xml:5018(title)
 msgid "Simple Configuration Tool for Evolution Exchange"
 msgstr "Herramienta sencilla de configuración para Evolution Exchange"
 
-#: C/evolution.xml:4968(link) C/evolution.xml:5001(title)
+#: C/evolution.xml:4992(link) C/evolution.xml:5025(title)
 msgid "Creating a New Exchange Account"
 msgstr "Creación de una nueva cuenta Exchange"
 
-#: C/evolution.xml:4971(link) C/evolution.xml:5043(title)
+#: C/evolution.xml:4995(link) C/evolution.xml:5049(title)
 msgid "Configuring an Existing Account for Evolution Exchange Account"
 msgstr "Configurar una cuenta existente para utilizarla con Evolution Exchange"
 
-#: C/evolution.xml:4977(para)
+#: C/evolution.xml:5001(para)
 msgid "Check with your system administrator to ensure that:"
 msgstr "Compruebe con el administrador del sistema los puntos siguientes:"
 
-#: C/evolution.xml:4980(para)
+#: C/evolution.xml:5004(para)
 msgid "You have a valid account on the Exchange server."
 msgstr "Posee una cuenta válida en el servidor Exchange."
 
-#: C/evolution.xml:4983(para)
+#: C/evolution.xml:5007(para)
 msgid ""
 "You are permitted to access the account with WebDAV. This is the default "
 "setting for the Exchange server, so unless your system administrator has "
@@ -10730,7 +10569,7 @@ msgstr ""
 "predeterminado del servidor Exchange, y no debería sernecesario modificarlo, "
 "a menos que su administrador de sistema lo haya deshabilitado."
 
-#: C/evolution.xml:4986(para)
+#: C/evolution.xml:5010(para)
 msgid ""
 "The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
 "\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
@@ -10742,7 +10581,7 @@ msgstr ""
 "información adicional para asegurar que su servidor Exchange acepte las "
 "conexiones de Evolution."
 
-#: C/evolution.xml:4991(para)
+#: C/evolution.xml:5015(para)
 msgid ""
 "When you know that your server is ready for you to connect, you are ready to "
 "add your Exchange account to Evolution Exchange."
@@ -10750,7 +10589,7 @@ msgstr ""
 "Una vez sepa que su servidor está disponible para conectarse, está preparado "
 "para añadir su cuenta Exchange a Evolution Exchange."
 
-#: C/evolution.xml:4995(para)
+#: C/evolution.xml:5019(para)
 msgid ""
 "Evolution Exchange comes with a simple account creation tool for Exchange "
 "accounts."
@@ -10758,7 +10597,7 @@ msgstr ""
 "Evolution Exchange proporciona una herramienta de creación de cuentas simple "
 "para cuentas Exchange."
 
-#: C/evolution.xml:4996(para)
+#: C/evolution.xml:5020(para)
 msgid ""
 "If you have no accounts configured, the simple account configuration "
 "assistant starts when you start Evolution. It asks only for the Outlook Web "
@@ -10771,7 +10610,7 @@ msgstr ""
 "Evolution Exchange determinará por sí mismo el resto de la información "
 "necesaria."
 
-#: C/evolution.xml:4997(para)
+#: C/evolution.xml:5021(para)
 msgid ""
 "If the simple account configuration tool does not run automatically, you "
 "need to create an account manually. For more information on how to do this, "
@@ -10783,11 +10622,7 @@ msgstr ""
 "información acerca de ello, vea <link linkend=\"config-exchange-new-account"
 "\">Creación de una nueva cuenta Exchange</link>."
 
-#: C/evolution.xml:5004(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S"
-msgstr "Pulse Editar &gt; Preferencias o pulse Mayús+Ctrl+S"
-
-#: C/evolution.xml:5012(para)
+#: C/evolution.xml:5036(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>. Remember "
@@ -10798,13 +10633,11 @@ msgstr ""
 "seleccionar el servidor Miscrosoft Exchange como el tipo de servidor en la "
 "sección Recepción de correo."
 
-#: C/evolution.xml:5023(para)
-msgid ""
-"You may configure only Only one Microsoft Exchange account can be configured "
-"in Evolution."
+#: C/evolution.xml:5042(para)
+msgid "Only one Microsoft Exchange account can be configured in Evolution."
 msgstr "Sólo se puede configurar una cuenta de Microsoft Exchange con Evolution."
 
-#: C/evolution.xml:5044(para)
+#: C/evolution.xml:5050(para)
 msgid ""
 "Use the following procedure to configure your existing account for Evolution "
 "Exchange:"
@@ -10812,13 +10645,7 @@ msgstr ""
 "Use el siguiente procedimiento para configurar su cuenta ya existente para "
 "Evolution Exchange:"
 
-#: C/evolution.xml:5047(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S, then click Mail Accounts."
-msgstr ""
-"Pulse Editar &gt; Preferencias o pulse Mayús+Ctrl+S, después pulse Cuentas "
-"de correo."
-
-#: C/evolution.xml:5050(para)
+#: C/evolution.xml:5056(para)
 msgid ""
 "Select the account you want to convert, then click Edit to appear the "
 "Account Editor."
@@ -10826,15 +10653,16 @@ msgstr ""
 "Seleccione la cuenta que quiera convertir, después pulse Editar para que "
 "aparezca el Editor de cuentas."
 
-#: C/evolution.xml:5051(para)
+#: C/evolution.xml:5057(para)
 msgid "You can view Identity tab enabled."
 msgstr "Podrá ver la solapa Identidad activada."
 
-#: C/evolution.xml:5065(para) C/evolution.xml:5657(para)
-msgid "Change your e-mail address as needed."
+#: C/evolution.xml:5062(para) C/evolution.xml:5636(para)
+#, fuzzy
+msgid "Change your email address as needed."
 msgstr "Modifique su cuenta de correo electrónico si es necesario."
 
-#: C/evolution.xml:5068(para)
+#: C/evolution.xml:5065(para)
 msgid ""
 "Click the Receiving Mail tab, then select Microsoft Exchange as your server "
 "type."
@@ -10842,7 +10670,7 @@ msgstr ""
 "Pulse sobre la solapa Recepción de correo, después seleccione Microsoft "
 "Exchange como tipo de servidor."
 
-#: C/evolution.xml:5087(para)
+#: C/evolution.xml:5070(para)
 msgid ""
 "Type your user name, and the Outlook Web Access (OWA) URL. Click "
 "Authenticate, then enter the password at the prompt. The Exchange server "
@@ -10852,16 +10680,17 @@ msgstr ""
 "Autenticar, después introduzca la contraseña al ser preguntar. El servidor "
 "autenticará su cuenta."
 
-#: C/evolution.xml:5090(para)
-msgid "Select your authentication method."
-msgstr "Seleccione su método de autenticación."
+#: C/evolution.xml:5078(para) C/evolution.xml:5650(para)
+#, fuzzy
+msgid "Click the Receiving Options tab."
+msgstr "Pulse en la solapa de Seguridad."
 
-#: C/evolution.xml:5104(para)
+#: C/evolution.xml:5079(para)
+#, fuzzy
 msgid ""
-"Click the Receiving Options tab, then specify how often to check for new "
-"mail, your Global Catalog server name and whether to apply filters to "
-"messages in your Inbox, check for junk, set a password expiry period, and "
-"any other settings you want to include."
+"Specify how often to check for new mail, your Global Catalog server name and "
+"whether to apply filters to messages in your Inbox, check for junk, set a "
+"password expiry period, and any other settings you want to include."
 msgstr ""
 "Pulse la solapa Recepción de correo, después especifique con qué frecuencia "
 "quiere que se compruebe si hay correo nuevo, el nombre del servidor del "
@@ -10869,7 +10698,7 @@ msgstr ""
 "comprobar el correo basura, establecer una caducidad para la contraseña y "
 "cualquier otro ajuste que quiera incluir."
 
-#: C/evolution.xml:5107(para)
+#: C/evolution.xml:5082(para)
 msgid ""
 "Use the Defaults tab to define folders, send cc: or bcc: messages to certain "
 "IDs, and set options for message receipts."
@@ -10878,16 +10707,16 @@ msgstr ""
 "determinadas identidades y establecer opciones para los destinatarios de los "
 "mensajes."
 
-#: C/evolution.xml:5110(para)
+#: C/evolution.xml:5085(para)
 msgid "Use the Security tab to set PGP and s/MIME options."
 msgstr "Use la solapa Seguridad para establecer las opciones PGP y S/MIME."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:5113(para)
+#: C/evolution.xml:5088(para)
 msgid "Quit Evolution and restart it."
 msgstr "Salir de Evolution y reiniciarlo."
 
-#: C/evolution.xml:5114(para)
+#: C/evolution.xml:5089(para)
 msgid ""
 "Changes to Evolution Exchange accounts configuration are not active until "
 "you have restarted the application."
@@ -10895,7 +10724,7 @@ msgstr ""
 "Los cambios en la configuración de cuentas de Evolution Exchange no se "
 "activarán hasta después de reiniciar la aplicación."
 
-#: C/evolution.xml:5123(para)
+#: C/evolution.xml:5098(para)
 msgid ""
 "When you have installed Evolution Exchange, you can access public folders "
 "and perform certain Exchange actions like delegation and password "
@@ -10915,11 +10744,12 @@ msgstr ""
 "la de Contactos para los contactos y la herramienta de Calendario para "
 "planificar sus horarios."
 
-#: C/evolution.xml:5124(para)
+#: C/evolution.xml:5099(para)
+#, fuzzy
 msgid ""
 "If you are using both an Exchange account and a local mail account, you "
-"should be aware that whenever you save an e-mail address or appointment from "
-"an e-mail message, it is saved in your Exchange contacts list or calendar, "
+"should be aware that whenever you save an email address or appointment from "
+"an email message, it is saved in your Exchange contacts list or calendar, "
 "rather than in your local account. The same is true for synchronization with "
 "Palm OS devices; tasks, and appointments.Addresses from your Palm OS device "
 "are synchronized in the Exchange folders rather than in local folders."
@@ -10932,7 +10762,7 @@ msgstr ""
 "direcciones de su dispositivo Palm OS se sincronizarán con las carpetas "
 "correspondientes en Exchange, y no en su equipo local."
 
-#: C/evolution.xml:5125(para)
+#: C/evolution.xml:5100(para)
 msgid ""
 "To avoid unnecessary strain on the server, the Global Address List (GAL) "
 "appears empty until you search for something in it."
@@ -10940,7 +10770,7 @@ msgstr ""
 "Para evitar carga innecesaria en el servidor, la Lista de direcciones "
 "globales (GAL) aparece vacía hasta que busque algo en ella."
 
-#: C/evolution.xml:5131(para)
+#: C/evolution.xml:5106(para)
 msgid ""
 "There are some settings in Evolution that are available only with Evolution "
 "Exchange, like delegation and permission handling, creating <quote>Out of "
@@ -10951,31 +10781,31 @@ msgstr ""
 "mensajes <quote>Estoy fuera de la oficina</quote>, cambiar la contraseña y "
 "ver el tamaño de la carpeta."
 
-#: C/evolution.xml:5135(link) C/evolution.xml:5158(title)
+#: C/evolution.xml:5110(link) C/evolution.xml:5133(title)
 msgid "Send Options"
 msgstr "Opciones de envío"
 
-#: C/evolution.xml:5138(link) C/evolution.xml:5238(title)
+#: C/evolution.xml:5113(link) C/evolution.xml:5214(title)
 msgid "Access Delegation"
 msgstr "Delegación de acceso"
 
-#: C/evolution.xml:5141(link) C/evolution.xml:5242(title)
+#: C/evolution.xml:5116(link) C/evolution.xml:5218(title)
 msgid "Delegating Access to Others"
 msgstr "Delegando acceso a terceros"
 
-#: C/evolution.xml:5144(link) C/evolution.xml:5289(title)
+#: C/evolution.xml:5119(link) C/evolution.xml:5268(title)
 msgid "Subscribe to Other Users' Folders"
 msgstr "Subscribirse a la carpeta de otro usuario"
 
-#: C/evolution.xml:5147(link) C/evolution.xml:5313(title)
+#: C/evolution.xml:5122(link) C/evolution.xml:5292(title)
 msgid "Subscribe to Public Folders"
 msgstr "Suscribirse a carpetas públicas"
 
-#: C/evolution.xml:5150(link) C/evolution.xml:5343(title)
+#: C/evolution.xml:5125(link) C/evolution.xml:5322(title)
 msgid "Setting an Out of Office Message"
 msgstr "Configuración un mensaje de Estoy fuera"
 
-#: C/evolution.xml:5159(para)
+#: C/evolution.xml:5134(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message from an "
 "exchange account so that the recipients will know how important the message "
@@ -10992,11 +10822,11 @@ msgstr ""
 "confirmación de envío de mensaje y de lectura de mensaje para los mensajes "
 "enviados."
 
-#: C/evolution.xml:5162(title)
+#: C/evolution.xml:5137(title)
 msgid "Tracking Options"
 msgstr "Opciones de seguimiento"
 
-#: C/evolution.xml:5163(para)
+#: C/evolution.xml:5138(para)
 msgid ""
 "Evolution lets you track the status of an item you have sent. You can enable "
 "the Delivery Receipt request as well as Read Receipt request so that you "
@@ -11007,26 +10837,26 @@ msgstr ""
 "lectura de mensaje y así podrá saber cuándo llegó el elemento al "
 "destinatario o cuándo lo leyó."
 
-#: C/evolution.xml:5164(para)
+#: C/evolution.xml:5139(para)
 msgid "To set the importance and sensitivity of the message:"
 msgstr "Para establecer la importancia y sensibilidad del mensaje:"
 
-#: C/evolution.xml:5167(para)
+#: C/evolution.xml:5142(para)
 msgid "Open a Compose Message window."
 msgstr "Abra una ventana del editor de mensajes."
 
 # index.docbook:473, index.docbook:474
-#: C/evolution.xml:5170(para)
+#: C/evolution.xml:5145(para)
 msgid "Select the exchange account from the From field."
 msgstr "Seleccione la cuenta de Exchange del campo De."
 
-#: C/evolution.xml:5173(para)
+#: C/evolution.xml:5148(para)
 msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
 msgstr ""
 "Pulse Insertar &gt; Opciones de envío para abrir el cuadro de diálogo de "
 "Opciones de envío"
 
-#: C/evolution.xml:5178(para)
+#: C/evolution.xml:5153(para)
 msgid ""
 "Select the priority for your sent message from the given three options "
 "(Normal, High, Low)"
@@ -11034,7 +10864,7 @@ msgstr ""
 "Seleccione la prioridad para su mensaje enviado de las tres opciones "
 "proporcionadas (Normal, Alta, Baja)"
 
-#: C/evolution.xml:5181(para)
+#: C/evolution.xml:5156(para)
 msgid ""
 "Select the sensitivity for your sent message from the given four options "
 "(Normal, Personal, Private, Confidential)."
@@ -11042,11 +10872,11 @@ msgstr ""
 "Seleccione la sensibilidad para su mensaje enviado de las cuatro opciones "
 "proporcionadas (Normal, Personal, Privado, Confidencial)."
 
-#: C/evolution.xml:5185(title)
+#: C/evolution.xml:5160(title)
 msgid "Message Access Delegation:"
 msgstr "Delegación de acceso a mensajes:"
 
-#: C/evolution.xml:5186(para)
+#: C/evolution.xml:5161(para)
 msgid ""
 "Click Send as Delegate to send the message to the recipient on behalf of "
 "someone else."
@@ -11054,7 +10884,7 @@ msgstr ""
 "Pulse Enviar como delegado para enviar el mensaje al destinatario en nombre "
 "de otra persona."
 
-#: C/evolution.xml:5189(para)
+#: C/evolution.xml:5164(para)
 msgid ""
 "To send a calendar item as delegate, you should subscribe to the delegator's "
 "message and also you should have necessary rights assigned to you by the "
@@ -11064,19 +10894,21 @@ msgstr ""
 "mensaje del delgado y también debe tener asignados los permisos necesarios "
 "por el delegador."
 
-#: C/evolution.xml:5193(para)
-msgid "Click User to open Show Contacts dialogue box."
+#: C/evolution.xml:5168(para)
+#, fuzzy
+msgid "Click User to open Show Contacts dialog box."
 msgstr "Pulse Usuario para abrir el cuadro de diálogo Mostrar contactos."
 
-#: C/evolution.xml:5196(para)
+#: C/evolution.xml:5171(para)
+#, fuzzy
 msgid ""
 "Select the contact from the desired Address book and click Add, then close "
-"the dialogue box."
+"the dialog box."
 msgstr ""
 "Seleccione el contacto de la Libreta de direcciones deseada y pulse Añadir, "
 "después cierre el cuadro de diálogo."
 
-#: C/evolution.xml:5198(para)
+#: C/evolution.xml:5173(para)
 msgid ""
 "You are not permitted to send a message on behalf of more than one person at "
 "a time."
@@ -11084,18 +10916,18 @@ msgstr ""
 "No se le permite enviar un mensaje en nombre de a más de una persona a la "
 "vez."
 
-#: C/evolution.xml:5200(para)
+#: C/evolution.xml:5175(para)
 msgid ""
 "When the recipient opens the mail, he or she can also read a message that "
 "<guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;"
 "Delegate's name&gt;</guilabel> on the preview pane header bar."
 msgstr ""
 "Cuando el destinatario abre el correo puede leer el mensaje <guilabel>El "
-"mensaje lo envió &lt;Nombre del delegado&gt; en nombre "
-"de &lt;Nombre del delegador&gt;</guilabel> en la barra "
-"de cabeceras del panel de vista preliminar."
+"mensaje lo envió &lt;Nombre del delegado&gt; en nombre de &lt;Nombre del "
+"delegador&gt;</guilabel> en la barra de cabeceras del panel de vista "
+"preliminar."
 
-#: C/evolution.xml:5205(para)
+#: C/evolution.xml:5180(para)
 msgid ""
 "Select the Request a delivery receipt for this message check box to get a "
 "delivery receipt from your recipient."
@@ -11103,7 +10935,7 @@ msgstr ""
 "Seleccione la casilla de verificación Pedir una confirmación de entrega para "
 "este mensaje para obtener una confirmación de entrega de su destinatario."
 
-#: C/evolution.xml:5208(para)
+#: C/evolution.xml:5183(para)
 msgid ""
 "Select the Request a read receipt for this message to get a read receipt for "
 "the message you have sent."
@@ -11111,15 +10943,11 @@ msgstr ""
 "Seleccione Pedir una confirmación de lectura para este mensaje para obtener "
 "una confirmación de lectura para este mensaje que ha enviado."
 
-#: C/evolution.xml:5211(para)
-msgid "Click OK to confirm your selection."
-msgstr "Pulse Aceptar para confirmar su selección."
-
-#: C/evolution.xml:5217(title)
+#: C/evolution.xml:5192(title)
 msgid "Delegating Calendar Items"
 msgstr "Delegar elementos del calendario"
 
-#: C/evolution.xml:5218(para)
+#: C/evolution.xml:5193(para)
 msgid ""
 "You can send Meetings or Appointments on behalf of someone else if you have "
 "subscribed to his or her Calendar."
@@ -11127,23 +10955,23 @@ msgstr ""
 "Puede enviar Reuniones o Citas en nombre de otra persona si se ha suscrito a "
 "su calendario."
 
-#: C/evolution.xml:5221(para)
+#: C/evolution.xml:5196(para)
 msgid "Select the delegator's Calendar."
 msgstr "Seleccione el calendario del delegado."
 
-#: C/evolution.xml:5224(para)
+#: C/evolution.xml:5199(para)
 msgid "Open a new Meeting composer window."
 msgstr "Abra una ventana del editor de Reuniones."
 
-#: C/evolution.xml:5227(para)
+#: C/evolution.xml:5202(para)
 msgid "Add the recipients."
 msgstr "Añada los destinatarios."
 
-#: C/evolution.xml:5230(para)
-msgid "Fill in the information, then click Send."
-msgstr "Rellene la información, después pulse Enviar."
+#: C/evolution.xml:5205(para)
+msgid "Fill in the information."
+msgstr "Rellene la información."
 
-#: C/evolution.xml:5231(para)
+#: C/evolution.xml:5207(para)
 msgid ""
 "When the recipient receives the calendar item, a message indicates that the "
 "item was created by someone on behalf of the Delegator."
@@ -11151,7 +10979,7 @@ msgstr ""
 "Cuando el destinatario recibe el elemento del calendario, un mensaje "
 "indicará que el elemento se creó por alguien en nombre del Delegador."
 
-#: C/evolution.xml:5239(para)
+#: C/evolution.xml:5215(para)
 msgid ""
 "You can allow other people in your organization's Global Address List to "
 "access your calendar, address book, and messages, and they can let you "
@@ -11164,29 +10992,25 @@ msgstr ""
 "usuarios hacer cualquier cosa, desde consultarse mutuamente sus planes hasta "
 "gestionar completamente toda su información personal."
 
-#: C/evolution.xml:5243(para)
+#: C/evolution.xml:5219(para)
 msgid "To add someone to your list of delegates:"
 msgstr "Para añadir alguien a su lista de delegados:"
 
-#: C/evolution.xml:5246(para)
-msgid ""
-"Click Edit &gt; Preferences or press Shift+Ctrl+S, then click the Exchange "
-"Settings tab."
-msgstr ""
-"Pulse Editar &gt; Preferencias o pulse Mayús+Ctrl+S, después pulse la solpaa "
-"Configuración de Exchange."
+#: C/evolution.xml:5225(para)
+msgid "Click the Exchange Settings tab."
+msgstr "Pulse en la solapa Configuración de Exchange."
 
-#: C/evolution.xml:5249(para)
+#: C/evolution.xml:5228(para)
 msgid "Click Delegation Assistant to open the Delegates dialog box."
 msgstr ""
 "Pulse Asistente de delegaciones para abrir el cuadro de diálogo de los "
 "Delegados."
 
-#: C/evolution.xml:5254(para)
+#: C/evolution.xml:5233(para)
 msgid "Click Add, then search for a contact in the Global Address List."
 msgstr "Pulse Añadir, después busque un contacto en la Lista de direcciones global."
 
-#: C/evolution.xml:5255(para)
+#: C/evolution.xml:5234(para)
 msgid ""
 "Remember that the Global Address List (GAL) appears empty until you have "
 "searched for something in it."
@@ -11194,7 +11018,7 @@ msgstr ""
 "Recuerde que la Lista de direcciones globales (GAL) aparecerá vacía hasta "
 "que haya introducido algo para buscar."
 
-#: C/evolution.xml:5258(para)
+#: C/evolution.xml:5237(para)
 msgid ""
 "Select the delegate and click Edit to open the delegate permission dialog "
 "box."
@@ -11202,7 +11026,7 @@ msgstr ""
 "Seleccione el delegado y pulse Editar para abrir el cuadro de diálogo de "
 "permisos del delegado."
 
-#: C/evolution.xml:5263(para)
+#: C/evolution.xml:5242(para)
 msgid ""
 "Select from the following access levels for each of the four types of "
 "folders:"
@@ -11210,15 +11034,15 @@ msgstr ""
 "Seleccione uno de los siguientes niveles de acceso para cada uno de los "
 "cuatro tipos de carpetas:"
 
-#: C/evolution.xml:5266(para)
+#: C/evolution.xml:5245(para)
 msgid "Do not allow this person to access any folders of this type."
 msgstr "No permitir a esta persona acceder a ninguna carpeta de este tipo."
 
-#: C/evolution.xml:5269(title)
+#: C/evolution.xml:5248(title)
 msgid "Reviewer (read-only):"
 msgstr "Revisor (sólo lectura):"
 
-#: C/evolution.xml:5270(para)
+#: C/evolution.xml:5249(para)
 msgid ""
 "Allows the delegate to see items in this type of folder, but not create new "
 "items or edit existing items."
@@ -11226,11 +11050,11 @@ msgstr ""
 "Permite al delegado ver elementos en este tipo de carpeta pero no crear "
 "nuevos o modificar los existentes."
 
-#: C/evolution.xml:5273(title)
+#: C/evolution.xml:5252(title)
 msgid "Author (read, create):"
 msgstr "Autor (leer, crear):"
 
-#: C/evolution.xml:5274(para)
+#: C/evolution.xml:5253(para)
 msgid ""
 "The delegate can view items in your folders, and can create new items, but "
 "cannot change any existing items."
@@ -11238,15 +11062,15 @@ msgstr ""
 "El delegado puede ver elementos en sus carpetas y puede crear otros nuevos "
 "pero no puede modificar ninguno de los existentes."
 
-#: C/evolution.xml:5277(title)
+#: C/evolution.xml:5256(title)
 msgid "Editor (read, create, edit):"
 msgstr "Editor (leer, crear, editar):"
 
-#: C/evolution.xml:5278(para)
+#: C/evolution.xml:5257(para)
 msgid "The delegate can view, create, and change items in your folders."
 msgstr "El delegado puede ver, crear y cambiar elementos en sus carpetas."
 
-#: C/evolution.xml:5285(para)
+#: C/evolution.xml:5264(para)
 msgid ""
 "The delegate is notified through a separate mail that he or she is being "
 "added to your list of delegates. The mail summarizes all the rights that "
@@ -11256,27 +11080,27 @@ msgstr ""
 "añadido a su lista de delegados. El correo resume todos los permisos que se "
 "le han asignado."
 
-#: C/evolution.xml:5290(para)
+#: C/evolution.xml:5269(para)
 msgid "To access the folders delegated to you:"
 msgstr "Para acceder a las carpetas que le han sido delegadas:"
 
-#: C/evolution.xml:5293(para)
+#: C/evolution.xml:5272(para)
 msgid "Click File &gt; Subscribe to Other User's Exchange Folder."
 msgstr "Pulse Archivo &gt; Suscribirse a la carpeta Exchange de otro usuario."
 
-#: C/evolution.xml:5298(para)
+#: C/evolution.xml:5277(para)
 msgid ""
-"Specify the e-mail address of the user who has delegated to you, or click "
+"Specify the email address of the user who has delegated to you, or click "
 "User to select the user from your address book."
 msgstr ""
 "Especifique la dirección de correo-e del usuario que le haya delegado o "
 "pulse el botón Usuario para elegirlo de su libreta de direcciones."
 
-#: C/evolution.xml:5301(para)
+#: C/evolution.xml:5280(para)
 msgid "Select the folder you want to open."
 msgstr "Seleccione la carpeta que quiere abrir."
 
-#: C/evolution.xml:5307(para)
+#: C/evolution.xml:5286(para)
 msgid ""
 "Folders delegated to you appear in your folder list inside a folder labeled "
 "with the name of its owner. For example, if Martha Thompson delegates "
@@ -11289,7 +11113,7 @@ msgstr ""
 "carpeta llamada Ignacio Matamoros en el árbol de carpetas, al mismo nivel "
 "que sus carpetas locales y carpetas públicas."
 
-#: C/evolution.xml:5308(para)
+#: C/evolution.xml:5287(para)
 msgid ""
 "If the folder fails to open properly, check with the folder owner to make "
 "sure that you have been granted the correct access permissions."
@@ -11297,74 +11121,70 @@ msgstr ""
 "Si la carpeta no se abre adecuadamente, compruebe con el dueño de la carpeta "
 "que le ha concedido los permisos de acceso correctos."
 
-#: C/evolution.xml:5314(para)
+#: C/evolution.xml:5293(para)
 msgid "You can subscribe to public folders available on the Exchange server."
 msgstr "Puede suscribirse a carpetas públicas disponibles en el servidor Exchange."
 
-#: C/evolution.xml:5320(para)
+#: C/evolution.xml:5299(para)
 msgid "Select the Exchange account."
 msgstr "Seleccione la cuenta de Exchange."
 
-#: C/evolution.xml:5323(para)
+#: C/evolution.xml:5302(para)
 msgid "Check the folders you want to subscribe to."
 msgstr "Seleccione las carpetas a las que se quiere suscribir."
 
-#: C/evolution.xml:5329(para)
+#: C/evolution.xml:5308(para)
 msgid "The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 "Las carpetas a las que se ha suscrito para aparecer en la lista de carpetas "
 "a la izquierda."
 
-#: C/evolution.xml:5332(para)
+#: C/evolution.xml:5311(para)
 msgid "To view contents of a folder, click it."
 msgstr "Para ver el contenido de una carpeta, pulse sobre ella."
 
-#: C/evolution.xml:5339(para)
+#: C/evolution.xml:5318(para)
 msgid ""
 "Reminders for meetings in your Exchange calendar do not work until you have "
 "run Evolution at least once after logging in. This is different from locally "
 "stored reminders, which work from the moment you log in, regardless of "
-"whether you have run Evolution in the session.so that you can fix a "
-"convenient time for a meeting.To enable Reminder setting in your Exchange "
+"whether you have run Evolution in the session so that you can fix a "
+"convenient time for a meeting. To enable Reminder setting in your Exchange "
 "account, select <guilabel>Remember the password</guilabel> checkbox. To find "
 "more information about Reminders see<link linkend=\"bshly4v\">Reminders</"
-"link>"
+"link>."
 msgstr ""
 "Los recordatorios de reuniones en su calendario de Exchange no funcionarán "
 "hasta que ejecute Evolution al menos una vez después de iniciar la sesión. "
 "Este comportamiento difiere del de los recordatorios administrados "
 "localmente, que funcionan desde el mismo momento que inicia la sesión, "
-"independientemene de ya haya ejecutado Evolution en la sesión, de tal manera "
-"que pueda establecer una hora conveniente para una reunión. Para activar los "
-"ajustes de los recordatorios en su cuenta de Exchange, seleccione la casilla "
-"de verificación <guilabel>Recordar la contraseña</guilabel>. Para obtener "
-"más información acerca de los Recordatorios vea <link linkend=\"bshly4v"
-"\">Recordatorios</link>."
+"independientemene de si ya haya ejecutado Evolution en la sesión, de tal "
+"manera que pueda establecer una hora conveniente para una reunión. Para "
+"activar los ajustes de los recordatorios en su cuenta de Exchange, "
+"seleccione la casilla de verificación <guilabel>Recordar la contraseña</"
+"guilabel>. Para obtener más información acerca de los Recordatorios consulte "
+"<link linkend=\"bshly4v\">Recordatorios</link>."
 
-#: C/evolution.xml:5344(para)
+#: C/evolution.xml:5323(para)
 msgid ""
 "An Out of Office message is an automatic reply that you can send as a reply "
-"to messages, explaining why you aren't immediately responding to their "
-"messages. For example, if you go on vacation for a week and won't access "
-"your e-mail, you can set an automatic reply so that people know that you "
-"aren't ignoring them."
+"to messages, explaining why you are not immediately responding to their "
+"messages. For example, if you go on vacation for a week and will not access "
+"your email, you can set an automatic reply so that people know that you are "
+"not ignoring them."
 msgstr ""
 "Un mensaje Estoy fuera de la oficina es una respuesta automática que puede "
-"enviar como respuesta a los mensajes que reciba, explicando porqué no va a "
+"enviar como respuesta a los mensajes que reciba, explicando por qué no va a "
 "responder inmediatamente. Por ejemplo, si se va una semana de vacaciones sin "
 "acceso a su correo electrónico, puede establecer una respuesta automática "
 "para que la gente sepa que realmente no los está ignorando."
 
-#: C/evolution.xml:5347(para)
-msgid "Click Edit &gt; Preferences &gt; Mail Accounts."
-msgstr "Pulse Editar &gt; Preferencias &gt; Cuentas de correo."
-
 # index.docbook:473, index.docbook:474
-#: C/evolution.xml:5350(para)
+#: C/evolution.xml:5329(para)
 msgid "Select the Exchange account, then click Edit."
 msgstr "Seleccione la cuenta de Exchange, después pulse Editar."
 
-#: C/evolution.xml:5353(para)
+#: C/evolution.xml:5332(para)
 msgid ""
 "Select the Exchange Settings tab. The top option allows you to set an Out of "
 "Office message."
@@ -11372,15 +11192,15 @@ msgstr ""
 "Seleccione la solapa Configuración de Exchange. La opción superior le "
 "permitirá establecer un Mensaje para cuando esté fuera de la oficina."
 
-#: C/evolution.xml:5356(para)
+#: C/evolution.xml:5335(para)
 msgid "Click I Am Currently Out of the Office."
 msgstr "Pulse Ahora no estoy en la oficina."
 
-#: C/evolution.xml:5359(para)
+#: C/evolution.xml:5338(para)
 msgid "Type a short message in the text field."
 msgstr "Escriba un mensaje corto en el campo de texto."
 
-#: C/evolution.xml:5366(para)
+#: C/evolution.xml:5345(para)
 msgid ""
 "Your message is automatically sent to anyone who sends you mail until you "
 "return and select I Am in the office."
@@ -11388,7 +11208,7 @@ msgstr ""
 "Su mensaje se envía automáticamente a cualquiera que le envíe correo hasta "
 "que vuelva y seleccione Ahora estoy en la oficina."
 
-#: C/evolution.xml:5372(para)
+#: C/evolution.xml:5351(para)
 msgid ""
 "Evolution helps you fix a convenient time for a meeting according to the "
 "availability of the attendees.It's Free/Busy feature allows you to perform a "
@@ -11402,11 +11222,11 @@ msgstr ""
 "usuarios para saber si están ocupados según sus calendarios Exchange, y de "
 "ser así cambiar la hora de la reunión de una forma conjunta."
 
-#: C/evolution.xml:5376(para)
+#: C/evolution.xml:5355(para)
 msgid "Create a new appointment in the calendar."
 msgstr "Crear una nueva cita en el calendario."
 
-#: C/evolution.xml:5379(para)
+#: C/evolution.xml:5358(para)
 msgid ""
 "Right-click the appointment, then select Schedule Meeting to appear "
 "Evolution Meeting editor."
@@ -11414,13 +11234,13 @@ msgstr ""
 "Pulse con el botón derecho del ratón sobre la cita, después seleccione "
 "Concertar una reunión para mostrar el editor de citas de Evolution."
 
-#: C/evolution.xml:5382(para)
+#: C/evolution.xml:5361(para)
 msgid "Click the Add tab to enter the email addresses into the list."
 msgstr ""
 "Pulse sobre la solapa Añadir para introducir las direcciones de correo-e en "
 "la lista."
 
-#: C/evolution.xml:5385(para)
+#: C/evolution.xml:5364(para)
 msgid ""
 "Click the Attendees tab to select the participants from Global Address List "
 "(GAL)."
@@ -11428,17 +11248,17 @@ msgstr ""
 "Pulse la solapa Participantes para seleccionar los participantes de Listas "
 "de direcciones globales (GAL)."
 
-#: C/evolution.xml:5386(para)
+#: C/evolution.xml:5365(para)
 msgid "You can directly select the participants from the following address lists."
 msgstr ""
 "Puede seleccionar directamente a los participantes de la siguiente lista de "
 "direcciones."
 
-#: C/evolution.xml:5392(para)
+#: C/evolution.xml:5371(para)
 msgid "Global Address List"
 msgstr "Lista de direcciones global"
 
-#: C/evolution.xml:5398(para)
+#: C/evolution.xml:5377(para)
 msgid ""
 "You can also specify the category as Anniversary, Birthday, Business etc. "
 "from the drop-down list for each address list given."
@@ -11446,31 +11266,31 @@ msgstr ""
 "También puede especificar la categoría como Aniversario, Cumpleaños, "
 "Negocios etc, de la lista desplegable para cada lista de direcciones dada."
 
-#: C/evolution.xml:5401(para)
+#: C/evolution.xml:5380(para)
 msgid "Add the participants to the following categories of attendees."
 msgstr "Añada los participantes a las siguientes categorías de asistentes."
 
-#: C/evolution.xml:5404(para)
+#: C/evolution.xml:5383(para)
 msgid "Chair Persons"
 msgstr "Presidencia"
 
-#: C/evolution.xml:5407(para)
+#: C/evolution.xml:5386(para)
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: C/evolution.xml:5410(para)
+#: C/evolution.xml:5389(para)
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: C/evolution.xml:5413(para)
+#: C/evolution.xml:5392(para)
 msgid "Resources"
 msgstr "Recursos"
 
-#: C/evolution.xml:5418(para)
+#: C/evolution.xml:5397(para)
 msgid "Click Free/Busy tool at the top right corner."
 msgstr "La herramienta de Disponibilidad en la esquina superior derecha."
 
-#: C/evolution.xml:5421(para)
+#: C/evolution.xml:5400(para)
 msgid ""
 "Click Options &gt; Update Free/Busy to check participant schedules and, if "
 "possible, update the meeting in all participants' calendars"
@@ -11479,7 +11299,7 @@ msgstr ""
 "los participantes y, si es posible, actualizar la reunión en los calendarios "
 "de cada uno de los asistentes"
 
-#: C/evolution.xml:5424(para)
+#: C/evolution.xml:5403(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11497,7 +11317,7 @@ msgstr ""
 "asistentes estarán disponibles. Si el resultado no le satisface, arrastre "
 "los lados de la reunión hacia las horas que desea seleccionar."
 
-#: C/evolution.xml:5430(para)
+#: C/evolution.xml:5409(para)
 msgid ""
 "<trademark>Evolution</trademark> can access accounts on <trademark class="
 "\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
@@ -11507,35 +11327,35 @@ msgstr ""
 "<trademark class=\"registered\">Novell</trademark><trademark class="
 "\"registered\">GroupWise</trademark> 7."
 
-#: C/evolution.xml:5433(link) C/evolution.xml:5456(title)
+#: C/evolution.xml:5412(link) C/evolution.xml:5435(title)
 msgid "GroupWise Features"
 msgstr "Características de GroupWise"
 
-#: C/evolution.xml:5436(link) C/evolution.xml:5545(title)
+#: C/evolution.xml:5415(link) C/evolution.xml:5524(title)
 msgid "GroupWise Terminology vs. Evolution Terminology"
 msgstr "Terminologías GroupWise y Evolution"
 
-#: C/evolution.xml:5439(link) C/evolution.xml:5616(title)
+#: C/evolution.xml:5418(link) C/evolution.xml:5595(title)
 msgid "Adding your GroupWise Account to Evolution"
 msgstr "Añadir su cuenta GroupWise a Evolution"
 
-#: C/evolution.xml:5442(link) C/evolution.xml:5755(title)
+#: C/evolution.xml:5421(link) C/evolution.xml:5736(title)
 msgid "Scheduling Appointments with Free/Busy"
 msgstr "Planificando citas según disponibilidad"
 
-#: C/evolution.xml:5445(link) C/evolution.xml:5777(title)
+#: C/evolution.xml:5424(link) C/evolution.xml:5758(title)
 msgid "Managing Sent Items"
 msgstr "Gestionar los elementos enviados"
 
-#: C/evolution.xml:5448(link) C/evolution.xml:5957(title)
+#: C/evolution.xml:5427(link) C/evolution.xml:5939(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
 msgstr "Dar acceso a su Buzón de correo o Calendario a otros"
 
-#: C/evolution.xml:5451(link) C/evolution.xml:6127(title)
+#: C/evolution.xml:5430(link) C/evolution.xml:6110(title)
 msgid "Junk Mail Handling"
 msgstr "Gestión de correo basura"
 
-#: C/evolution.xml:5457(para)
+#: C/evolution.xml:5436(para)
 msgid ""
 "GroupWise connectivity in Evolution supports the following basic Novell "
 "GroupWise features:"
@@ -11543,23 +11363,23 @@ msgstr ""
 "La conectividad de GroupWise en Evolution soporta las siguientes "
 "características básicas de Novell GroupWise:"
 
-#: C/evolution.xml:5463(para)
+#: C/evolution.xml:5442(para)
 msgid "Viewing mail and folders stored on the GroupWise system."
 msgstr "Ver el correo y las carpetas almacenadas en el sistema GroupWise."
 
-#: C/evolution.xml:5466(para)
+#: C/evolution.xml:5445(para)
 msgid "Sending mail from you GroupWise account."
 msgstr "Enviar correo desde su cuenta GroupWise."
 
-#: C/evolution.xml:5469(para)
+#: C/evolution.xml:5448(para)
 msgid "Converting mail to a task or meeting."
 msgstr "Convertir un correo en una tarea o reunión."
 
-#: C/evolution.xml:5472(para)
+#: C/evolution.xml:5451(para)
 msgid "Tracking the status of a message."
 msgstr "Seguir el estado de un mensaje."
 
-#: C/evolution.xml:5475(para)
+#: C/evolution.xml:5454(para)
 msgid ""
 "Marking a message as junk mail adds the sender to your GroupWise junk mail "
 "list."
@@ -11567,11 +11387,11 @@ msgstr ""
 "Marcar un mensaje como correo basura añade al remitente a su lista de correo "
 "basura de GroupWise."
 
-#: C/evolution.xml:5478(para)
+#: C/evolution.xml:5457(para)
 msgid "Improved Status Tracking."
 msgstr "Seguimiento de estado mejorado."
 
-#: C/evolution.xml:5486(para)
+#: C/evolution.xml:5465(para)
 msgid ""
 "You can send and receive appointment and meeting requests. Allows Evolution "
 "users to schedule meetings and view attendee availability for other users on "
@@ -11581,7 +11401,7 @@ msgstr ""
 "usuarios de Evolution programar sus reuniones y examinar la disponibilidad "
 "de asistencia de otros usuarios en GroupWise."
 
-#: C/evolution.xml:5489(para)
+#: C/evolution.xml:5468(para)
 msgid ""
 "You can receive an iCalendar meeting request and add it to your GroupWise "
 "calendar."
@@ -11589,7 +11409,7 @@ msgstr ""
 "Puede recibir una solicitud de reunión con iCalendar y añadirla a su "
 "calendario GroupWise."
 
-#: C/evolution.xml:5497(para)
+#: C/evolution.xml:5476(para)
 msgid ""
 "Address Completion is supported for your GroupWise address books, including "
 "the System address book, the Frequent Contacts address book, and your "
@@ -11599,22 +11419,23 @@ msgstr ""
 "GruopWise, incluyendo la libreta de direcciones del sistema, los Contactos "
 "frecuentes y su libreta de direcciones personal."
 
-#: C/evolution.xml:5500(para)
+#: C/evolution.xml:5479(para)
 msgid ""
 "If you receive a card attachment and click Save in Address Book, it is saved "
 "to your Personal address book. New Address Book entries can also be added to "
-"your personal address book from received E-mail messages."
+"your personal address book from received Email messages."
 msgstr ""
 "Si recibe una tarjeta como adjunto y pulsa Guardar en la libreta de "
 "direcciones, se guardará en su libreta de direcciones personal. Las entradas "
 "de las libretas de direcciones nuevas también se pueden añadir a su libreta "
 "de direcciones personal desde mensajes de correo-e recibidos."
 
-#: C/evolution.xml:5503(para)
+#: C/evolution.xml:5482(para)
+#, fuzzy
 msgid ""
 "To create your GroupWise Frequent contacts and Personal address books, you "
 "need to access your GroupWise account once through GroupWise Java client "
-"because Evolution currently does not support creating them.The GroupWise "
+"because Evolution currently does not support creating them. The GroupWise "
 "system address book is marked for offline use by default.This boosts "
 "performance."
 msgstr ""
@@ -11624,11 +11445,11 @@ msgstr ""
 "crearlas. La libreta de direcciones del sistema de GroupWise se marca para "
 "uso desconectado de manera predeterminada. Esto acelera el rendimiento."
 
-#: C/evolution.xml:5508(para) C/evolution.xml:5580(para)
+#: C/evolution.xml:5487(para) C/evolution.xml:5559(para)
 msgid "Reminder Note"
 msgstr "Nota de recuerdo"
 
-#: C/evolution.xml:5511(para)
+#: C/evolution.xml:5490(para)
 msgid ""
 "GroupWise Reminder Note is integrated into Memo component. You can view the "
 "Reminder notes listed under Memos at the bottom right of the Calendar view "
@@ -11639,39 +11460,39 @@ msgstr ""
 "derecha de la vista del Calendario suponiendo que las ha seleccionando bajo "
 "el componente de Notas."
 
-#: C/evolution.xml:5516(para)
+#: C/evolution.xml:5495(para)
 msgid "Proxy"
 msgstr "Proxy"
 
-#: C/evolution.xml:5519(para)
+#: C/evolution.xml:5498(para)
 msgid "You can assign Proxy access to other users."
 msgstr "Puede asignar acceso proxy a otros usuarios."
 
-#: C/evolution.xml:5522(para)
+#: C/evolution.xml:5501(para)
 msgid "You can view other users' accounts through Proxy access."
 msgstr "Puede ver las cuentas de otros usuarios a través de un proxy."
 
-#: C/evolution.xml:5527(para)
+#: C/evolution.xml:5506(para)
 msgid "There are, however, some features that are not available:"
 msgstr "Sin embargo, algunas características no están disponibles:"
 
-#: C/evolution.xml:5530(para)
+#: C/evolution.xml:5509(para)
 msgid "Resending items"
 msgstr "Reenviar elementos"
 
-#: C/evolution.xml:5533(para)
+#: C/evolution.xml:5512(para)
 msgid "Retracting items"
 msgstr "Retractar elementos"
 
-#: C/evolution.xml:5536(para)
+#: C/evolution.xml:5515(para)
 msgid "Accepting appointments or meetings in offline mode"
 msgstr "Aceptar citas o reuniones en modo desconectado"
 
-#: C/evolution.xml:5539(para)
+#: C/evolution.xml:5518(para)
 msgid "Archive"
 msgstr "Archivar"
 
-#: C/evolution.xml:5546(para)
+#: C/evolution.xml:5525(para)
 msgid ""
 "GroupWise and Evolution sometimes uses different terminology for different "
 "types of items. The following table compares GroupWise terminology to "
@@ -11681,55 +11502,55 @@ msgstr ""
 "tipos de elementos. La siguiente tabla compara la terminología de GroupWise "
 "con la terminología de Evolution."
 
-#: C/evolution.xml:5554(para)
+#: C/evolution.xml:5533(para)
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: C/evolution.xml:5564(para) C/evolution.xml:5575(para)
+#: C/evolution.xml:5543(para) C/evolution.xml:5554(para)
 msgid "Appointment"
 msgstr "Cita"
 
-#: C/evolution.xml:5567(para)
+#: C/evolution.xml:5546(para)
 msgid "Meeting"
 msgstr "Reunión"
 
-#: C/evolution.xml:5572(para)
+#: C/evolution.xml:5551(para)
 msgid "Posted Appointment"
 msgstr "Cita postpuesta"
 
-#: C/evolution.xml:5583(para) C/evolution.xml:5607(para)
+#: C/evolution.xml:5562(para) C/evolution.xml:5586(para)
 msgid "None; use a task"
 msgstr "Ninguno, usar una tarea"
 
-#: C/evolution.xml:5588(para)
+#: C/evolution.xml:5567(para)
 msgid "Discussion Note"
 msgstr "Nota de discusión"
 
-#: C/evolution.xml:5591(para)
+#: C/evolution.xml:5570(para)
 msgid "None; use an assigned task"
 msgstr "Ninguno, usar una tarea asignada"
 
-#: C/evolution.xml:5596(para)
+#: C/evolution.xml:5575(para)
 msgid "Phone Message"
 msgstr "Mensajes telefónicos"
 
-#: C/evolution.xml:5599(para)
+#: C/evolution.xml:5578(para)
 msgid "None; use a message"
 msgstr "Ninguno, usar un mensaje"
 
-#: C/evolution.xml:5604(para)
+#: C/evolution.xml:5583(para)
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
-#: C/evolution.xml:5619(link) C/evolution.xml:5627(title)
+#: C/evolution.xml:5598(link) C/evolution.xml:5606(title)
 msgid "Creating a New GroupWise Account"
 msgstr "Crear una nueva cuenta GroupWise"
 
-#: C/evolution.xml:5622(link) C/evolution.xml:5642(title)
+#: C/evolution.xml:5601(link) C/evolution.xml:5621(title)
 msgid "Changing an Existing Account to Work with GroupWise"
 msgstr "Modificar una cuenta existente para trabajar con GroupWise"
 
-#: C/evolution.xml:5636(para)
+#: C/evolution.xml:5615(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>."
@@ -11737,23 +11558,23 @@ msgstr ""
 "Cree la cuenta siguiendo el procedimiento en <link linkend=\"usage-"
 "mainwindow-starting\">Inicio de Evolution por primera vez</link>."
 
-#: C/evolution.xml:5643(para)
+#: C/evolution.xml:5622(para)
 msgid ""
-"If you have an existing e-mail account, and want to convert it to use with "
+"If you have an existing email account, and want to convert it to use with "
 "GroupWise:"
 msgstr ""
 "Si ya tiene una cuenta de correo-e existente y quiere convertirla para "
 "usarla con GroupWise:"
 
-#: C/evolution.xml:5649(para)
+#: C/evolution.xml:5628(para)
 msgid "Select the account you want to convert, then click Edit."
 msgstr "Seleccione la cuenta que quiere convertir, después pulse Editar."
 
-#: C/evolution.xml:5652(para)
+#: C/evolution.xml:5631(para)
 msgid "Click the Identity tab."
 msgstr "Pulse la solapa de Identidad."
 
-#: C/evolution.xml:5660(para)
+#: C/evolution.xml:5639(para)
 msgid ""
 "Click the Receiving Email tab, then select Novell GroupWise as your server "
 "type."
@@ -11761,7 +11582,7 @@ msgstr ""
 "Pulse sobre la solapa Recepción de correo, después seleccione Novell "
 "GroupWise como el tipo de servidor."
 
-#: C/evolution.xml:5665(para)
+#: C/evolution.xml:5644(para)
 msgid ""
 "Type the name of your mail server, your user name, and select whether to use "
 "SSL."
@@ -11769,7 +11590,7 @@ msgstr ""
 "Escriba el nombre del servidor de su correo, su nombre de usuario y "
 "seleccione si quiere usar SSL."
 
-#: C/evolution.xml:5667(para)
+#: C/evolution.xml:5646(para)
 msgid ""
 "Select SSL for a highly secured connection between your client and server. "
 "Contact your administrator for further details."
@@ -11779,21 +11600,13 @@ msgstr ""
 
 #: C/evolution.xml:5671(para)
 msgid ""
-"Click the Receiving Options tab, then select if you want Evolution to "
-"automatically check for new mail."
-msgstr ""
-"Pulse sobre la solapa Opciones de recepción, después seleccione si quiere "
-"que Evolution compruebe automáticamente si hay correo nuevo."
-
-#: C/evolution.xml:5691(para)
-msgid ""
 "Select if you want to automatically synchronize your remote calendar and "
 "contacts locally."
 msgstr ""
 "Seleccione si quiere sincronizar automáticamente su calendario remoto y sus "
 "contactos localmente."
 
-#: C/evolution.xml:5692(para)
+#: C/evolution.xml:5672(para)
 msgid ""
 "It fetches the remote calendar and contact information and stores it on your "
 "local drive."
@@ -11801,7 +11614,7 @@ msgstr ""
 "Obtiene el calendario y la información del contacto remotos y los almacena "
 "en su unidad local."
 
-#: C/evolution.xml:5694(para)
+#: C/evolution.xml:5674(para)
 msgid ""
 "Remote calendar and contacts are typically stored remotely on servers rather "
 "than on local hard disk."
@@ -11809,7 +11622,7 @@ msgstr ""
 "Generalmente los calendarios y contactos remotos se almacenan en servidores "
 "en lugar de en discos duros locales."
 
-#: C/evolution.xml:5698(para)
+#: C/evolution.xml:5678(para)
 msgid ""
 "Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -11817,7 +11630,7 @@ msgstr ""
 "Especifique su puerto del agente de la oficina de correos SOAP en el campo "
 "Puerto del agente de la oficina de correos SOAP."
 
-#: C/evolution.xml:5702(para)
+#: C/evolution.xml:5682(para)
 msgid ""
 "(Optional) Click the Proxy tab, then click Add to add any Proxy users to "
 "your account."
@@ -11825,15 +11638,11 @@ msgstr ""
 "(Opcional) pulse sobre la solapa Proxy, después pulse Añadir para añadir "
 "cualquier usuario proxy a su cuenta."
 
-#: C/evolution.xml:5705(para) C/evolution.xml:6081(para)
-msgid "Click OK, then click Close."
-msgstr "Pulse Aceptar, después pulse Cerrar."
-
-#: C/evolution.xml:5712(title)
+#: C/evolution.xml:5693(title)
 msgid "Reminder Notes"
 msgstr "Notas de recordatorios"
 
-#: C/evolution.xml:5713(para)
+#: C/evolution.xml:5694(para)
 msgid ""
 "GroupWise Reminder notes are like mail messages except they are scheduled "
 "for a particular day and appear on the Calendar for that date. You can use "
@@ -11848,7 +11657,7 @@ msgstr ""
 "Calendario en la fecha que especifique. No se emplazan en su Buzón de correo "
 "o en el buzón de correo de ningún otro usuario."
 
-#: C/evolution.xml:5714(para)
+#: C/evolution.xml:5695(para)
 msgid ""
 "Evolution integrates this feature into its Memo component so that you can "
 "view the Reminder notes listed under Memo at the right bottom side of the "
@@ -11858,7 +11667,7 @@ msgstr ""
 "que puede ver las Notas de recordatorio listadas bajo las Notas en la parte "
 "inferior derecha de la vista del calendario."
 
-#: C/evolution.xml:5716(para)
+#: C/evolution.xml:5697(para)
 msgid ""
 "Select the memo or the Reminder notes under the Memo component to display it "
 "on the Calendar view."
@@ -11866,7 +11675,7 @@ msgstr ""
 "Seleccione la nota o la Nota de recordatorio bajo el componente Notas para "
 "mostrarla en la vista del Calendario."
 
-#: C/evolution.xml:5719(para)
+#: C/evolution.xml:5700(para)
 msgid ""
 "To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</"
 "link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend="
@@ -11876,15 +11685,15 @@ msgstr ""
 "\">Paso 1</link> hasta el <link linkend=\"b10fqh6r\">Paso 8</link> bajo "
 "<link linkend=\"b1012vdd\">Notas</link>."
 
-#: C/evolution.xml:5720(para)
+#: C/evolution.xml:5701(para)
 msgid "To send a Reminder Note,"
 msgstr "Enviar una nota de recordatorio,"
 
-#: C/evolution.xml:5723(para)
-msgid "Click New &gt; Shared Memo to open the new window."
-msgstr "Pulse Nuevo &gt; Nota compartida para abrir la nueva ventana."
+#: C/evolution.xml:5704(para)
+msgid "Click File &gt; New &gt; Shared Memo."
+msgstr "Pulse Archivo &gt; Nuevo &gt; Nota compartida."
 
-#: C/evolution.xml:5726(para)
+#: C/evolution.xml:5707(para)
 msgid ""
 "Select the Organizer's account name from the drop-down list given next to "
 "the Organizer field."
@@ -11892,7 +11701,7 @@ msgstr ""
 "Seleccione el nombre de la cuenta del Organizador de la lista desplegable "
 "proporcionada junto al campo Organizador."
 
-#: C/evolution.xml:5729(para)
+#: C/evolution.xml:5710(para)
 msgid ""
 "In the To field, type a username, then press Enter. Repeat for additional "
 "users."
@@ -11900,29 +11709,15 @@ msgstr ""
 "En el campo Para escriba un nombre de usuario, después pulse Intro. Repita "
 "la operación para añadir usuarios adicionales."
 
-#: C/evolution.xml:5732(para)
-msgid "Select the Group in which you would create the entry."
-msgstr "Seleccione el grupo en el que quiere crear la entrada."
-
-#: C/evolution.xml:5735(para)
-msgid "Enter a brief description about the Reminder Note in the Summary field."
-msgstr ""
-"Introduzca una breve descripción acerca de la Nota de recordatorio en el "
-"campo Resumen."
-
-#: C/evolution.xml:5741(para)
+#: C/evolution.xml:5722(para)
 msgid "Specify the category that the Reminder note falls under."
 msgstr "Especifique la categoría bajo la que recae la nota de recordatorio."
 
-#: C/evolution.xml:5744(para)
-msgid "Enter the description for the Reminder Note."
-msgstr "Introduzca la descripción para la nota de recordatorio."
-
-#: C/evolution.xml:5747(para)
+#: C/evolution.xml:5728(para)
 msgid "Click Save."
 msgstr "Pulse Guardar."
 
-#: C/evolution.xml:5756(para)
+#: C/evolution.xml:5737(para)
 msgid ""
 "When you schedule a meeting with your calendar on GroupWise, you can check "
 "when other local GroupWise users are busy according to their GroupWise "
@@ -11932,7 +11727,7 @@ msgstr ""
 "podrá comprobar la disponibilidad de otros usuarios en el mismo servidor en "
 "función de sus respectivos calendarios GruopWise."
 
-#: C/evolution.xml:5758(para)
+#: C/evolution.xml:5739(para)
 msgid ""
 "Reminders for appointments in your GroupWise calendar do not work until you "
 "have run Evolution at least once after logging in. This is different from "
@@ -11945,23 +11740,23 @@ msgstr ""
 "que funcionan desde el mismo momento de iniciar la sesión, sin tener en "
 "cuenta si ejecutó el Evolution durante dicha sesión."
 
-#: C/evolution.xml:5761(para)
+#: C/evolution.xml:5742(para)
 msgid "Open a new appointment in the calendar."
 msgstr "Abra una nueva cita en el calendario."
 
-#: C/evolution.xml:5764(para)
+#: C/evolution.xml:5745(para)
 msgid "Click Actions &gt; Schedule Meeting."
 msgstr "Pulse Acciones &gt; Planificar una reunión."
 
-#: C/evolution.xml:5767(para)
+#: C/evolution.xml:5748(para)
 msgid ""
-"Add attendees, either by entering their e-mail addresses into the list, or "
-"by clicking the Invite Others button."
+"Add attendees, either by entering their email addresses into the list, or by "
+"clicking the Invite Others button."
 msgstr ""
 "Añada participantes, ya sea introduciendo sus direcciones de correo-e en la "
 "lista o pulsando el botón Invitar a otros."
 
-#: C/evolution.xml:5770(para)
+#: C/evolution.xml:5751(para)
 msgid ""
 "Click Options, then click Update Free/Busy to check participant schedules "
 "and, if possible, update the meeting in all participants' calendars."
@@ -11970,7 +11765,7 @@ msgstr ""
 "agendas de los participantes y, si es posible, actualizar la reunión en los "
 "calendarios de cada uno de los asistentes."
 
-#: C/evolution.xml:5773(para)
+#: C/evolution.xml:5754(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11988,60 +11783,60 @@ msgstr ""
 "asistentes estarán disponibles. Si el resultado no le satisface, arrastre "
 "los lados de la reunión hacia las horas que desea seleccionar."
 
-#: C/evolution.xml:5780(link) C/evolution.xml:5800(title)
+#: C/evolution.xml:5761(link) C/evolution.xml:5781(title)
 msgid "Confirming Delivery of Items You have Sent"
 msgstr "Confirmar la entrega de los elementos que ha enviado"
 
-#: C/evolution.xml:5783(link) C/evolution.xml:5905(title)
+#: C/evolution.xml:5764(link) C/evolution.xml:5887(title)
 msgid "Displaying Sent Items"
 msgstr "Mostrar elementos enviados"
 
-#: C/evolution.xml:5786(link) C/evolution.xml:5844(title)
+#: C/evolution.xml:5767(link) C/evolution.xml:5826(title)
 msgid "Checking the Status of an Item You Have Sent"
 msgstr "Comprobar el estado de un elemento que ha enviado"
 
-#: C/evolution.xml:5789(link) C/evolution.xml:5792(link)
-#: C/evolution.xml:5871(title)
+#: C/evolution.xml:5770(link) C/evolution.xml:5773(link)
+#: C/evolution.xml:5853(title)
 msgid "Requesting a Reply for Items You Send"
 msgstr "Petición de respuesta para elementos que envíe"
 
-#: C/evolution.xml:5796(para)
+#: C/evolution.xml:5777(para)
 msgid ""
-"You can manage your sent items for GroupWise e-mail only if the recipient is "
+"You can manage your sent items for GroupWise email only if the recipient is "
 "located on the same GroupWise system as you."
 msgstr ""
 "Puede gestionar sus elementos enviados para correo electrónico GroupWise "
 "sólo si el destinatario está ubicado en el mismo sistema GruopWise."
 
-#: C/evolution.xml:5801(para)
+#: C/evolution.xml:5782(para)
 msgid ""
 "Evolution provides several ways for you to confirm that your item was "
 "delivered. You can easily track message status of any message you have sent. "
-"For example, you can see when an e-mail was delivered and when the recipient "
-"opened or deleted the e-mail."
+"For example, you can see when an email was delivered and when the recipient "
+"opened or deleted the email."
 msgstr ""
 "Evolution proporciona varias formas para que confirme que su elemento se "
 "entregó. Puede seguir fácilmente el estado de cualquier mensaje que haya "
 "enviado. Por ejemplo, puede ver cuándo se entregó un correo-e y cuándo lo "
 "abrió o borró el destinatario."
 
-#: C/evolution.xml:5803(title)
+#: C/evolution.xml:5784(title)
 msgid "Track an Item You Sent:"
 msgstr "Seguir un elemento que haya enviado:"
 
-#: C/evolution.xml:5804(para)
+#: C/evolution.xml:5785(para)
 msgid ""
-"You can check the status in the Message Status window of an e-mail you have "
+"You can check the status in the Message Status window of an email you have "
 "sent."
 msgstr ""
 "Puede comprobar el estado de un correo electrónico que haya enviado en la "
 "ventana Estado del mensaje."
 
-#: C/evolution.xml:5807(title)
+#: C/evolution.xml:5788(title)
 msgid "Receive Notification When the Item is Opened or Deleted:"
 msgstr "Recibir una notificación cuando se abre o borra el elemento:"
 
-#: C/evolution.xml:5808(para)
+#: C/evolution.xml:5789(para)
 msgid ""
 "You can receive notification when the recipient opens or deletes a message. "
 "For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items "
@@ -12051,13 +11846,13 @@ msgstr ""
 "mensaje. Para obtener más información consulte <link linkend=\"Ak05sv1"
 "\">Recibir notificaciones acerca de elementos que envíe</link>."
 
-#: C/evolution.xml:5811(title)
+#: C/evolution.xml:5792(title)
 msgid "Request a Reply:"
 msgstr "Pedir una respuesta:"
 
-#: C/evolution.xml:5812(para)
+#: C/evolution.xml:5793(para)
 msgid ""
-"You can inform the recipient that you need a reply to an e-mail. Evolution "
+"You can inform the recipient that you need a reply to an email. Evolution "
 "adds a sentence to the item stating that a reply is requested and changes "
 "the icon in the recipient's Mailbox to a double arrow. For information, see "
 "<link linkend=\"Ak05sv1\">Requesting a Reply for Items You Send</link>."
@@ -12068,25 +11863,26 @@ msgstr ""
 "doble flecha. Para obtener más información vea <link linkend=\"Ak05sv1"
 "\">Petición de respuesta para elementos que envíe</link>."
 
-#: C/evolution.xml:5816(title) C/evolution.xml:5929(title)
+#: C/evolution.xml:5797(title) C/evolution.xml:5911(title)
 msgid "Enabling Status Tracking"
 msgstr "Activar el seguimiento de estado"
 
-#: C/evolution.xml:5819(para)
-msgid ""
-"In the Compose Message window, click Insert &gt; Send Options &gt; Status "
-"Tracking"
-msgstr ""
-"En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío "
-"&gt; Seguimiento de estado"
+#: C/evolution.xml:5800(para) C/evolution.xml:5840(para)
+#: C/evolution.xml:5856(para)
+msgid "In the Compose Message window, click Insert &gt; Send Options."
+msgstr "En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío."
+
+#: C/evolution.xml:5801(para)
+msgid "Select Status Tracking."
+msgstr "Seleccione Seguimiento de estado"
 
-#: C/evolution.xml:5824(para) C/evolution.xml:5936(para)
+#: C/evolution.xml:5806(para) C/evolution.xml:5918(para)
 msgid "Select the check box next to Create a sent item to track information."
 msgstr ""
 "Seleccione la casilla de verificación junto a Crear un elemento enviado para "
 "seguimiento de la información."
 
-#: C/evolution.xml:5827(para) C/evolution.xml:5939(para)
+#: C/evolution.xml:5809(para) C/evolution.xml:5921(para)
 msgid ""
 "Select any of the options given (Delivered, Delivered and opened, All "
 "information)"
@@ -12094,7 +11890,7 @@ msgstr ""
 "Seleccione cualqueira de las opciones dadas (Entregado, Entregado y abierto, "
 "Toda la información)"
 
-#: C/evolution.xml:5828(para) C/evolution.xml:5940(para)
+#: C/evolution.xml:5810(para) C/evolution.xml:5922(para)
 msgid ""
 "Based on this selection, you can view the status of the send message in the "
 "Sent Items folder."
@@ -12102,7 +11898,7 @@ msgstr ""
 "Basándose en esta selección, puede ver el estado del mensaje enviado en la "
 "carpeta de Correo enviado."
 
-#: C/evolution.xml:5829(para)
+#: C/evolution.xml:5811(para)
 msgid ""
 "For more information, see <link linkend=\"Aal54a9\">Checking the Status of "
 "an Item You Have Sent</link>."
@@ -12110,7 +11906,7 @@ msgstr ""
 "Para obtener más información, consulte <link linkend=\"Aal54a9\">Comprobar "
 "el estado de un elemento que ha enviado</link>."
 
-#: C/evolution.xml:5832(para) C/evolution.xml:5943(para)
+#: C/evolution.xml:5814(para) C/evolution.xml:5925(para)
 msgid ""
 "(Optional)Select the check box next to Auto-delete sent item to "
 "automatically delete the sent item from the Sent folder."
@@ -12118,19 +11914,19 @@ msgstr ""
 "(Opcional) Seleccione la casilla junto a Autoborrar el elemento enviado para "
 "borrar automáticamente el elemento enviado de la carpeta Correo enviado."
 
-#: C/evolution.xml:5835(para) C/evolution.xml:5946(para)
+#: C/evolution.xml:5817(para) C/evolution.xml:5928(para)
 msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
 "En Devolver notificación, especifique el tipo de notificación que desea "
 "recibir."
 
-#: C/evolution.xml:5847(para)
-msgid "Right-click an e-mail in your Sent folder, then click Track Message Status."
+#: C/evolution.xml:5829(para)
+msgid "Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
 "Pulse con el botón derecho sobre un correo-e en su carpeta de Correo "
 "enviado, después pulse Seguir el estado del mensaje."
 
-#: C/evolution.xml:5848(para)
+#: C/evolution.xml:5830(para)
 msgid ""
 "With Message Tracking, you know when the item reaches the recipients or is "
 "read by them. You also know exactly who received your message, who read your "
@@ -12140,19 +11936,15 @@ msgstr ""
 "destinatarios o cuándo se leyó. También podrá saber exactamente quién "
 "recibió su mensaje, quién lo leyó y quién lo borró y cuándo."
 
-#: C/evolution.xml:5855(title)
-msgid "Changing the Priority of an E-Mail"
+#: C/evolution.xml:5837(title)
+msgid "Changing the Priority of an Email"
 msgstr "Cambiar la prioridad de un correo-e"
 
-#: C/evolution.xml:5858(para) C/evolution.xml:5874(para)
-msgid "In the Compose Message window, click Insert &gt; Send Options."
-msgstr "En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío."
-
-#: C/evolution.xml:5861(para)
+#: C/evolution.xml:5843(para)
 msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
 msgstr "Seleccione Prioridad Alta, Estándar, Baja, o Indefinida."
 
-#: C/evolution.xml:5862(para)
+#: C/evolution.xml:5844(para)
 msgid ""
 "The small icon next to an item in the Mailbox is red when the priority is "
 "high."
@@ -12160,13 +11952,13 @@ msgstr ""
 "El pequeño icono junto al elemento en el Buzón de correo será rojo cuando la "
 "prioridad sea alta."
 
-#: C/evolution.xml:5878(para)
+#: C/evolution.xml:5860(para)
 msgid "Click Reply Requested, then specify when you want to receive the reply."
 msgstr ""
 "Pulse Respuesta solicitada, después especifique cuando quiere recibir la "
 "respuesta."
 
-#: C/evolution.xml:5879(para)
+#: C/evolution.xml:5861(para)
 msgid ""
 "If you select When Convenient, then Reply Requested: When Convenient appears "
 "at the top of the message. If you select Within x Days, then Reply "
@@ -12178,7 +11970,7 @@ msgstr ""
 "días, entonces aparecerá Respuesta solicitada: en <varname>día del mes día "
 "numérico hora año</varname> en la parte superior del mensaje."
 
-#: C/evolution.xml:5882(para)
+#: C/evolution.xml:5864(para)
 msgid ""
 "Click Set Expiration Date, then specify the number of days for this message "
 "to remain in the recipient's Inbox."
@@ -12186,11 +11978,11 @@ msgstr ""
 "Pulse Establecer fecha de caducidad y especifique el número de días durante "
 "el cual este mensaje permanecerá en el buzón de correo del destinatario."
 
-#: C/evolution.xml:5890(title)
+#: C/evolution.xml:5872(title)
 msgid "Setting Message Delivery Options"
 msgstr "Establecer opciones de entrega de los mensajes"
 
-#: C/evolution.xml:5891(para)
+#: C/evolution.xml:5873(para)
 msgid ""
 "You can delay the delivery of an individual message by having it held in the "
 "Outbox for a specified time."
@@ -12198,11 +11990,11 @@ msgstr ""
 "Puede posponer la entrega de un mensaje individual dejándolo en la Bandeja "
 "de salida por un periodo de tiempo especificado."
 
-#: C/evolution.xml:5894(para)
+#: C/evolution.xml:5876(para)
 msgid "Click Delay message delivery."
 msgstr "Pulse Retrasar la entrega del mensaje."
 
-#: C/evolution.xml:5897(para)
+#: C/evolution.xml:5879(para)
 msgid ""
 "Use the Date and Time options to specify how long the message should remain "
 "in the Outbox before it is sent to the recipient."
@@ -12211,17 +12003,17 @@ msgstr ""
 "permanecer el mensaje en la Bandeja de salida antes de que se envíe a su "
 "destinatario."
 
-#: C/evolution.xml:5908(para)
+#: C/evolution.xml:5890(para)
 msgid "Click the Sent Items folder in the Folder List."
 msgstr "Pulse en la carpeta Correo enviado en la lista de carpetas."
 
-#: C/evolution.xml:5911(para)
+#: C/evolution.xml:5893(para)
+#, fuzzy
 msgid ""
 "All sent items reside in this folder unless you select a different folder "
-"for sent e-mail in the account editor default settings. For more "
-"information, refer to <link linkend=\"b17s9qmz\">Changing Default Folder for "
-"Sent and Draft Items</link> under <link linkend=\"b13uhy6r\">Default "
-"Settings</link>."
+"for sent email in the account editor default settings. For more information, "
+"refer to <link linkend=\"b17s9qmz\">Changing Default Folder for Sent and "
+"Draft Items</link> under <link linkend=\"b13uhy6r\">Default Settings</link>."
 msgstr ""
 "Todos los elementos enviados están en esta carpeta a no ser que seleccione "
 "una carpeta diferente para los correos-e enviados en la configuración "
@@ -12230,17 +12022,17 @@ msgstr ""
 "Correo enviado y los Borradores</link> bajo <link linkend=\"b13uhy6r"
 "\">Predeterminados</link>."
 
-#: C/evolution.xml:5914(title)
+#: C/evolution.xml:5896(title)
 msgid "Delegating an Item"
 msgstr "Borrar un elemento"
 
-#: C/evolution.xml:5917(para)
+#: C/evolution.xml:5899(para)
 msgid "In the Calendar, right-click the meeting or appointment you want to delegate."
 msgstr ""
 "En el Calendario, pulse con el botón derecho sobre la reunión o cita que "
 "quiere delegar."
 
-#: C/evolution.xml:5920(para)
+#: C/evolution.xml:5902(para)
 msgid ""
 "Select Delegate Meeting, then select the contacts you want to delegate the "
 "meeting/appointment for."
@@ -12248,11 +12040,11 @@ msgstr ""
 "Seleccione Delegar reunión, después seleccione los contactos a los que "
 "quiere delegar la reunión o cita."
 
-#: C/evolution.xml:5926(para)
+#: C/evolution.xml:5908(para)
 msgid "Each contact gets a copy of the appointment or meeting."
 msgstr "Cada contacto obtiene una copia de la cita o reunión."
 
-#: C/evolution.xml:5932(para)
+#: C/evolution.xml:5914(para)
 msgid ""
 "In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
 "Tracking"
@@ -12260,7 +12052,7 @@ msgstr ""
 "En la ventana del editor de mensaje pulse Insertar &gt; Opciones de envío "
 "&gt; Seguimiento de estado"
 
-#: C/evolution.xml:5958(para)
+#: C/evolution.xml:5940(para)
 msgid ""
 "Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you "
 "perform various actions, such as reading, accepting, and declining items on "
@@ -12271,7 +12063,7 @@ msgstr ""
 "aceptar y rechazar elementos de parte del otro usuario, con las "
 "restricciones que el otro usuario ajuste."
 
-#: C/evolution.xml:5960(para)
+#: C/evolution.xml:5942(para)
 msgid ""
 "You can proxy for a user in a different post office or domain, as long as "
 "that person is in the same GroupWise system. You cannot proxy for a user in "
@@ -12281,27 +12073,27 @@ msgstr ""
 "diferente, siempre que la persona esté en el mismo sistema GroupWise. No "
 "puede establecer el proxy para un usuario en un sistema GroupWise diferente."
 
-#: C/evolution.xml:5965(link) C/evolution.xml:5982(title)
+#: C/evolution.xml:5947(link) C/evolution.xml:5964(title)
 msgid "Receiving Proxy Rights"
 msgstr "Obtener derechos del Proxy"
 
-#: C/evolution.xml:5968(link) C/evolution.xml:5987(title)
+#: C/evolution.xml:5950(link) C/evolution.xml:5969(title)
 msgid "Assigning Proxy Rights to Another User"
 msgstr "Asignar derechos proxy a otro usuario"
 
-#: C/evolution.xml:5971(link) C/evolution.xml:6058(title)
+#: C/evolution.xml:5953(link) C/evolution.xml:6040(title)
 msgid "Adding and Removing Proxy Names and Rights in Your Proxy List"
 msgstr "Añadir y eliminar nombres y derechos Proxy en su Lista proxy"
 
-#: C/evolution.xml:5974(link) C/evolution.xml:6088(title)
+#: C/evolution.xml:5956(link) C/evolution.xml:6071(title)
 msgid "Managing Someone Else's Mailbox or Calendar"
 msgstr "Gestionar el buzón de correo o el calendario de otra persona"
 
-#: C/evolution.xml:5977(link) C/evolution.xml:6112(title)
+#: C/evolution.xml:5959(link) C/evolution.xml:6095(title)
 msgid "Marking an Item Private"
 msgstr "Hacer un elemento privado"
 
-#: C/evolution.xml:5983(para)
+#: C/evolution.xml:5965(para)
 msgid ""
 "Two steps must be completed before you can act as someone's proxy. First, "
 "the person for whom you plan to act as proxy must grant you rights in the "
@@ -12314,7 +12106,7 @@ msgstr ""
 "seleccionar al usuario de tal forma que pueda acceder a su Buzón de correo o "
 "Calendario."
 
-#: C/evolution.xml:5988(para)
+#: C/evolution.xml:5970(para)
 msgid ""
 "Use the Proxy List in the Preferences Account Editor to give other users "
 "rights to proxy for you. You can assign each user different rights to your "
@@ -12331,19 +12123,19 @@ msgstr ""
 "calendario, deles acceso de lectura para las citas. La siguiente tabla "
 "describe los permisos que puede otorgar a los usuarios:"
 
-#: C/evolution.xml:5996(para)
+#: C/evolution.xml:5978(para)
 msgid "This Right"
 msgstr "Este derecho"
 
-#: C/evolution.xml:5999(para)
+#: C/evolution.xml:5981(para)
 msgid "Lets your proxy do this"
 msgstr "Permite que su proxy haga esto"
 
-#: C/evolution.xml:6006(para)
+#: C/evolution.xml:5988(para)
 msgid "Read"
 msgstr "Leer"
 
-#: C/evolution.xml:6009(para)
+#: C/evolution.xml:5991(para)
 msgid ""
 "Read items you receive. Proxies cannot see your Contacts folder with this or "
 "any other proxy right."
@@ -12351,11 +12143,11 @@ msgstr ""
 "Leer los elementos que reciba. Los proxies no pueden ver su Carpeta de "
 "contactos con éste o cualquier otro derecho."
 
-#: C/evolution.xml:6014(para)
+#: C/evolution.xml:5996(para)
 msgid "Write"
 msgstr "Escribir"
 
-#: C/evolution.xml:6017(para)
+#: C/evolution.xml:5999(para)
 msgid ""
 "Create and send items in your name, including applying your signature if you "
 "have one defined. Assign categories to items, and change the subject of "
@@ -12364,11 +12156,11 @@ msgstr ""
 "Crear y enviar elementos en su nombre, incluyendo su firma si ha definido "
 "una. Asignar categorías a los elementos y cambiar el asunto de los elementos."
 
-#: C/evolution.xml:6022(para)
+#: C/evolution.xml:6004(para)
 msgid "Subscribe to my alarms"
 msgstr "Suscribirse a sus alertas"
 
-#: C/evolution.xml:6025(para)
+#: C/evolution.xml:6007(para)
 msgid ""
 "Receive the same alarms you receive. Receiving alarms is supported only if "
 "the proxy is on the same post office you are."
@@ -12376,11 +12168,11 @@ msgstr ""
 "Recibir las mismas alertas que usted reciba. Recibir alertas está soportado "
 "sólo si el proxy está en la misma oficina postal."
 
-#: C/evolution.xml:6030(para)
+#: C/evolution.xml:6012(para)
 msgid "Subscribe to my notifications"
 msgstr "Suscribirse a sus notificaciones"
 
-#: C/evolution.xml:6033(para)
+#: C/evolution.xml:6015(para)
 msgid ""
 "Receive notification when you receive items. Receiving notifications is "
 "supported only if the proxy is on the same post office you are."
@@ -12389,11 +12181,11 @@ msgstr ""
 "notificaciones sólo está soportada si el proxy está en la misma oficina "
 "postal."
 
-#: C/evolution.xml:6038(para)
+#: C/evolution.xml:6020(para)
 msgid "Modify options/rules/folders"
 msgstr "Modificar opciones/reglas/carpetas"
 
-#: C/evolution.xml:6041(para)
+#: C/evolution.xml:6023(para)
 msgid ""
 "Change the options in your Mailbox. The proxy can edit any of your Options "
 "settings, including the access given to other users. If the proxy also has "
@@ -12406,11 +12198,11 @@ msgstr ""
 "modificar reglas y carpetas. Este permiso permite a un proxy añadir, borrar "
 "y modificar categorías."
 
-#: C/evolution.xml:6046(para)
+#: C/evolution.xml:6028(para)
 msgid "Read items marked Private"
 msgstr "Leer elementos marcados como Privado"
 
-#: C/evolution.xml:6049(para)
+#: C/evolution.xml:6031(para)
 msgid ""
 "Read the items you marked Private. If you don't give a proxy Private rights, "
 "all items marked Private in your Mailbox are hidden from that proxy."
@@ -12419,15 +12211,15 @@ msgstr ""
 "Privados a un proxy, todos los elementos marcados como Privado en su Buzón "
 "de correo permanecerán ocultos para ese proxy."
 
-#: C/evolution.xml:6064(para)
+#: C/evolution.xml:6046(para)
 msgid "Select the GroupWise account to edit, then click Edit."
 msgstr "Seleccione la cuenta GruopWise para editarla, después pulse Editar."
 
-#: C/evolution.xml:6067(para)
+#: C/evolution.xml:6049(para)
 msgid "Click the Proxy tab, then click Add."
 msgstr "Pulse en la solapa Proxy, después en Añadir."
 
-#: C/evolution.xml:6070(para)
+#: C/evolution.xml:6052(para)
 msgid ""
 "To add a user to the list, type the name in the Name box or import the "
 "contact from Contact list."
@@ -12435,11 +12227,11 @@ msgstr ""
 "Para añadir un usuario a la lista, escriba el nombre en la caja Nombre o "
 "importe el contacto de la Lista de contactos."
 
-#: C/evolution.xml:6073(para)
+#: C/evolution.xml:6055(para)
 msgid "Select the rights you want to give to the user."
 msgstr "Seleccione los derechos que quiere darle al usuario."
 
-#: C/evolution.xml:6078(para)
+#: C/evolution.xml:6060(para)
 msgid ""
 "Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll"
 "\">Step 5</link> to assign rights to each user in the Proxy List."
@@ -12448,7 +12240,7 @@ msgstr ""
 "\"Aai4sll\">Paso 5</link> para asignar derechos a cada usuario en la lista "
 "proxy."
 
-#: C/evolution.xml:6084(para)
+#: C/evolution.xml:6067(para)
 msgid ""
 "To delete a user from the Proxy List, select the user, then click Remove "
 "User."
@@ -12456,7 +12248,7 @@ msgstr ""
 "Para borrar un usuario de la lista proxy, seleccione el usuario, después "
 "pulse Quitar usuario."
 
-#: C/evolution.xml:6089(para)
+#: C/evolution.xml:6072(para)
 msgid ""
 "Before you can act as a proxy for someone, that person must give you proxy "
 "rights in his or her Proxy List in Preferences. The amount of access you "
@@ -12466,15 +12258,15 @@ msgstr ""
 "de proxy en su Lista proxy en las Preferencias. La cantidad de acceso que "
 "tenga dependerá de los permisos que le hayan concedido."
 
-#: C/evolution.xml:6092(para)
+#: C/evolution.xml:6075(para)
 msgid "Right-click on the GroupWise account in the folder list."
 msgstr "Pulse con el botón derecho sobre la cuenta GroupWise en la lista de carpetas."
 
-#: C/evolution.xml:6095(para)
+#: C/evolution.xml:6078(para)
 msgid "Click Proxy Login."
 msgstr "Pulse Sesión proxy."
 
-#: C/evolution.xml:6100(para)
+#: C/evolution.xml:6083(para)
 msgid ""
 "Type the user name of the person who has given you Proxy access, or select "
 "from the list."
@@ -12482,11 +12274,11 @@ msgstr ""
 "Escriba el nombre de usuario de la persona que le ha dado acceso proxy o "
 "selecciónelo de la lista."
 
-#: C/evolution.xml:6104(para)
+#: C/evolution.xml:6087(para)
 msgid "The user's data appears in the respective components."
 msgstr "Los datos del usuario aparecerán en los respectivos componentes."
 
-#: C/evolution.xml:6106(para)
+#: C/evolution.xml:6089(para)
 msgid ""
 "You can set different colors to each user to distinguish between each users' "
 "appointments. You can also select whether to display the appointments of a "
@@ -12496,7 +12288,7 @@ msgstr ""
 "citas de cada usuario. También puede seleccionar si quiere mostrar las citas "
 "de un usuario en particular o no hacerlo."
 
-#: C/evolution.xml:6113(para)
+#: C/evolution.xml:6096(para)
 msgid ""
 "You can limit a proxy's access to individual items in your Mailbox or "
 "Calendar by marking items Private."
@@ -12504,7 +12296,7 @@ msgstr ""
 "Puede limitar el acceso de un proxy a elementos individuales en su Buzón de "
 "correo o Calendario haciéndolos privados."
 
-#: C/evolution.xml:6114(para)
+#: C/evolution.xml:6097(para)
 msgid ""
 "When you mark an item Private, you prevent unauthorized proxies from opening "
 "it. Proxies cannot access items marked Private unless you give them those "
@@ -12514,7 +12306,7 @@ msgstr ""
 "puedan abrirlo. Los proxies no pueden acceder a los elementos marcados como "
 "Privado a no ser que les de esos permisos en su Lista de acceso."
 
-#: C/evolution.xml:6115(para)
+#: C/evolution.xml:6098(para)
 msgid ""
 "If you mark an item Private when you send it, neither your proxies nor the "
 "recipient's proxies can open the item without rights. If you mark an item "
@@ -12531,11 +12323,11 @@ msgstr ""
 "búsqueda de Disponibilidad en concordancia con el estado que seleccionó "
 "cuando aceptó la cita."
 
-#: C/evolution.xml:6118(para)
+#: C/evolution.xml:6101(para)
 msgid "In an open item, click Actions, then click Mark Private."
 msgstr "En un elemento abierto, pulse Acciones, después pulse Marcar como privado."
 
-#: C/evolution.xml:6120(para)
+#: C/evolution.xml:6103(para)
 msgid ""
 "In your Calendar, click an item in the Appointments, Reminder Notes, or "
 "Tasks List, click Actions, then click Mark Private."
@@ -12543,9 +12335,10 @@ msgstr ""
 "En su Calendario, pulse un elemento en las Citas, Notas de recordatorio o "
 "Lista de tareas, pulse Acciones y después pulse Marcar como privado."
 
-#: C/evolution.xml:6128(para)
+#: C/evolution.xml:6111(para)
+#, fuzzy
 msgid ""
-"Junk mail handling for GroupWise accounts is a little different then other "
+"Junk mail handling for GroupWise accounts is a little different than other "
 "junk mail handling. When you mark an item as junk mail in GroupWise, the "
 "item is added to your junk list in the GroupWise system. Because these "
 "settings are on the GroupWise system, your junk list follows you from "
@@ -12557,33 +12350,33 @@ msgstr ""
 "Debido a que estos ajustes están en el sistema GroupWise, su lista de spam "
 "le sigue de equipo en equipo."
 
-#: C/evolution.xml:6131(link) C/evolution.xml:6148(title)
+#: C/evolution.xml:6114(link) C/evolution.xml:6131(title)
 msgid "Marking a Message As Junk Mail"
 msgstr "Marcar un mensaje como spam"
 
-#: C/evolution.xml:6134(link) C/evolution.xml:6158(title)
+#: C/evolution.xml:6117(link) C/evolution.xml:6141(title)
 msgid "Marking a Message As Not Junk Mail"
 msgstr "Marcar un mensaje como no spam"
 
-#: C/evolution.xml:6137(link) C/evolution.xml:6172(title)
+#: C/evolution.xml:6120(link) C/evolution.xml:6155(title)
 msgid "Enabling or Disabling Your Junk Mail List"
 msgstr "Activar o desactivar su lista de correo basura"
 
-#: C/evolution.xml:6140(link) C/evolution.xml:6187(title)
-msgid "Adding an E-Mail Address to Your Junk List"
+#: C/evolution.xml:6123(link) C/evolution.xml:6170(title)
+msgid "Adding an Email Address to Your Junk List"
 msgstr "Añadir una dirección de correo electrónico a su lista de correo basura"
 
-#: C/evolution.xml:6143(link) C/evolution.xml:6202(title)
-msgid "Removing an E-Mail Address from Your Junk List"
+#: C/evolution.xml:6126(link) C/evolution.xml:6185(title)
+msgid "Removing an Email Address from Your Junk List"
 msgstr "Quitar una dirección de correo electrónico de su lista de correo basura"
 
-#: C/evolution.xml:6151(para)
+#: C/evolution.xml:6134(para)
 msgid "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
 msgstr ""
 "Seleccione el mensaje marcado como spam, después pulse el icono de SPAM o "
 "pulse Ctrl+J."
 
-#: C/evolution.xml:6152(para)
+#: C/evolution.xml:6135(para)
 msgid ""
 "The message is moved to your Junk Mail folder and the user is added to your "
 "junk list."
@@ -12591,23 +12384,23 @@ msgstr ""
 "El mensaje se moverá a su carpeta de correo basura y el usuario se añadirá a "
 "su lista de spam."
 
-#: C/evolution.xml:6161(para)
+#: C/evolution.xml:6144(para)
 msgid "Select the message to mark as not junk in your Junk Mail folder."
 msgstr ""
 "Seleccione el mensaje para marcarlo como no spam en su Carpeta de correo "
 "basura."
 
-#: C/evolution.xml:6164(para)
+#: C/evolution.xml:6147(para)
 msgid "Right-click the message, then click Mark as Not Junk."
 msgstr ""
 "Pulse con el botón derecho sobre el mensaje, después pulse Marcar como no "
 "spam."
 
-#: C/evolution.xml:6165(para)
+#: C/evolution.xml:6148(para)
 msgid "Or select the message and press Shift+Ctrl+J"
 msgstr "O seleccione el mensaje y pulse Mayús+Ctrl+J"
 
-#: C/evolution.xml:6166(para)
+#: C/evolution.xml:6149(para)
 msgid ""
 "The message is moved to your Mailbox folder and the name is removed from "
 "your junk list."
@@ -12615,62 +12408,28 @@ msgstr ""
 "El mensaje se moverá a su Bandeja de entrada y el nombre se eliminará de su "
 "lista de correo basura."
 
-#: C/evolution.xml:6175(para) C/evolution.xml:6190(para)
-#: C/evolution.xml:6205(para)
+#: C/evolution.xml:6158(para) C/evolution.xml:6173(para)
+#: C/evolution.xml:6188(para)
 msgid "Right-click a message, then click Junk Mail Settings."
 msgstr "Pulse con el botón derecho, después pulse Opciones de spam."
 
-#: C/evolution.xml:6178(para)
+#: C/evolution.xml:6161(para)
 msgid "Select if you want to enable or disable junk mail handling."
 msgstr "Seleccione si quiere activar o desactivar el manejo del correo basura."
 
-#: C/evolution.xml:6193(para)
-msgid "Type the e-mail address to block in the Email field."
+#: C/evolution.xml:6176(para)
+msgid "Type the email address to block in the Email field."
 msgstr "Escriba la dirección de correo electrónico a bloquear en el campo Correo-e."
 
-#: C/evolution.xml:6196(para)
+#: C/evolution.xml:6179(para)
 msgid "Click Add, then click OK."
 msgstr "Pulse Añadir, después pulse Aceptar."
 
-#: C/evolution.xml:6208(para)
-msgid "Select the e-mail address to remove, then click Remove."
+#: C/evolution.xml:6191(para)
+msgid "Select the email address to remove, then click Remove."
 msgstr "Seleccione la dirección de correo-e a quitar, después pulse Quitar."
 
-#: C/evolution.xml:6220(para)
-msgid ""
-"<trademark>Evolution</trademark> supports mail connectivity to <trademark "
-"class=\"registered\">Hula</trademark> servers through IMAP and calendaring "
-"support through CalDAV."
-msgstr ""
-"<trademark>Evolution</trademark> soporta conectividad de correo en "
-"servidores <trademark class=\"registered\">Hula</trademark> a través de IMAP "
-"y soporta calendarios a través de CalDAV."
-
-#: C/evolution.xml:6221(para)
-msgid ""
-"To add your Hula account to Evolution, you must create a new Hula account by "
-"performing the following steps:"
-msgstr ""
-"Para añadir su cuenta Hula a Evolution debe crear una nueva cuenta Hula "
-"realizando los siguientes pasos:"
-
-#: C/evolution.xml:6224(para)
-msgid "Click Edit, click Preferences, then click Mail Accounts."
-msgstr "Pulse Editar, pulse Preferencias, después pulse Cuentas de correo."
-
-#: C/evolution.xml:6227(para)
-msgid "In the Preferences window, click Add."
-msgstr "En la ventana Preferencias, pulse Añadir."
-
-#: C/evolution.xml:6230(para)
-msgid ""
-"Follow the procedure explained in <link linkend=\"usage-mainwindow-starting"
-"\">Starting Evolution for the First Time</link>."
-msgstr ""
-"Siga el procedimiento explicado en <link linkend=\"usage-mainwindow-starting"
-"\">Inicio de Evolution por primera vez</link>."
-
-#: C/evolution.xml:6237(para)
+#: C/evolution.xml:6203(para)
 msgid ""
 "Perhaps your mail server has changed names. Or you have grown tired of a "
 "certain layout for your appointments. Whatever the reason, you can change "
@@ -12681,39 +12440,39 @@ msgstr ""
 "puede que quiera cambiar su configuración de <trademark>Evolution</"
 "trademark>."
 
-#: C/evolution.xml:6240(link) C/evolution.xml:6294(title)
+#: C/evolution.xml:6206(link) C/evolution.xml:6260(title)
 msgid "Working with Mail Accounts"
 msgstr "Utilización de cuentas de correo"
 
-#: C/evolution.xml:6243(link) C/evolution.xml:6337(title)
+#: C/evolution.xml:6209(link) C/evolution.xml:6303(title)
 msgid "Autocompletion"
 msgstr "Autocompletado"
 
-#: C/evolution.xml:6246(link) C/evolution.xml:6399(title)
+#: C/evolution.xml:6212(link) C/evolution.xml:6365(title)
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: C/evolution.xml:6249(link) C/evolution.xml:6568(title)
+#: C/evolution.xml:6215(link) C/evolution.xml:6534(title)
 msgid "Composer Preferences"
 msgstr "Editor de correo"
 
-#: C/evolution.xml:6252(link) C/evolution.xml:6626(title)
+#: C/evolution.xml:6218(link) C/evolution.xml:6593(title)
 msgid "Calendar and Tasks Settings"
 msgstr "Preferencias del calendario y de las tareas"
 
-#: C/evolution.xml:6255(link) C/evolution.xml:6745(title)
+#: C/evolution.xml:6221(link) C/evolution.xml:6712(title)
 msgid "Contact Management"
 msgstr "Gestión de contactos"
 
-#: C/evolution.xml:6258(link) C/evolution.xml:6728(title)
+#: C/evolution.xml:6224(link) C/evolution.xml:6695(title)
 msgid "Certificates"
 msgstr "Certificados"
 
-#: C/evolution.xml:6261(link) C/evolution.xml:6878(title)
+#: C/evolution.xml:6227(link) C/evolution.xml:6845(title)
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
 
-#: C/evolution.xml:6264(para)
+#: C/evolution.xml:6230(para)
 msgid ""
 "You reach the Evolution settings window by clicking Edit &gt; Preferences. "
 "In the left part of the settings window is a column, similar to the "
@@ -12727,18 +12486,18 @@ msgstr ""
 "de Evolution personalizar. La parte derecha de la ventana es donde realmente "
 "realizará cambios."
 
-#: C/evolution.xml:6266(para)
+#: C/evolution.xml:6232(para)
 msgid "There are six items you can customize."
 msgstr "Existen seis elementos que puede personalizar."
 
-#: C/evolution.xml:6268(title)
+#: C/evolution.xml:6234(title)
 msgid "Mail Accounts:"
 msgstr "Cuentas de correo:"
 
-#: C/evolution.xml:6269(para)
+#: C/evolution.xml:6235(para)
 msgid ""
-"Add or change information about your e-mail accounts, such as the servers "
-"you connect to, the way you download mail, and your password authentication "
+"Add or change information about your email accounts, such as the servers you "
+"connect to, the way you download mail, and your password authentication "
 "mode. This is the most complex item in the list, and is covered in <link "
 "linkend=\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
 msgstr ""
@@ -12748,13 +12507,13 @@ msgstr ""
 "complejo de la lista y está descrito en <link linkend=\"config-prefs-mail-"
 "identity\">Utilización de cuentas de correo</link>."
 
-#: C/evolution.xml:6272(title)
+#: C/evolution.xml:6238(title)
 msgid "Autocompletion:"
 msgstr "Autocompletado:"
 
-#: C/evolution.xml:6273(para)
+#: C/evolution.xml:6239(para)
 msgid ""
-"Set the contact groups to be used when completing e-mail addresses in the "
+"Set the address books to be used when completing email addresses in the "
 "message composer. For more information, see <link linkend=\"bshoq5l"
 "\">Autocompletion</link>."
 msgstr ""
@@ -12762,11 +12521,11 @@ msgstr ""
 "correo-e en el editor de mensajes. Para obtener más información vea <link "
 "linkend=\"bshoq5l\">Autocompletado</link>."
 
-#: C/evolution.xml:6276(title)
+#: C/evolution.xml:6242(title)
 msgid "Mail Preferences:"
 msgstr "Opciones de correo:"
 
-#: C/evolution.xml:6277(para)
+#: C/evolution.xml:6243(para)
 msgid ""
 "These are overall mail reading preferences, such as display settings, "
 "notification options, and security. Settings that vary per account are in "
@@ -12781,17 +12540,18 @@ msgstr ""
 "link>, pero la mayoría de los ajustes de correo están en <link linkend="
 "\"config-prefs-mail\">Opciones de correo</link>."
 
-#: C/evolution.xml:6280(title)
+#: C/evolution.xml:6246(title)
 msgid "Composer Preferences:"
 msgstr "Preferencias del editor:"
 
-#: C/evolution.xml:6281(para)
+#: C/evolution.xml:6247(para)
+#, fuzzy
 msgid ""
 "These are settings for the way that you use the mail composer, such as "
-"shortcuts, signatures, and spelling. This includes the ability to substitute "
-"graphical emoticons for <quote>emoticons</quote> such as : ) that many "
-"people use in e-mail. This tool is covered in <link linkend=\"config-prefs-"
-"mail-composer\">Composer Preferences</link>."
+"signatures, and spelling. This includes the ability to substitute graphical "
+"emoticons for <quote>emoticons</quote> such as : ) that many people use in "
+"email. This tool is covered in <link linkend=\"config-prefs-mail-composer"
+"\">Composer Preferences</link>."
 msgstr ""
 "Estos son ajustes para definir la manera en la que quiere usar el editor de "
 "correo, tales como atajos, firmas, y corrección ortográfica. Ésto incluye la "
@@ -12800,11 +12560,11 @@ msgstr ""
 "en las <link linkend=\"config-prefs-mail-composer\">Preferencias del editor</"
 "link>."
 
-#: C/evolution.xml:6284(title)
+#: C/evolution.xml:6250(title)
 msgid "Calendar and Tasks:"
 msgstr "Calendario y tareas:"
 
-#: C/evolution.xml:6285(para)
+#: C/evolution.xml:6251(para)
 msgid ""
 "Use these settings to control how the calendar behaves, including your time "
 "zone and the length of your work week. For more information, see <link "
@@ -12815,11 +12575,11 @@ msgstr ""
 "más información vea <link linkend=\"config-prefs-cal\">Preferencias del "
 "calendario y de las tareas</link>."
 
-#: C/evolution.xml:6288(title)
+#: C/evolution.xml:6254(title)
 msgid "Certificates:"
 msgstr "Certificados:"
 
-#: C/evolution.xml:6289(para)
+#: C/evolution.xml:6255(para)
 msgid ""
 "Use these settings for certificate handling for S/MIME security systems. For "
 "more information, see <link linkend=\"bshoty0\">Certificates</link>."
@@ -12828,7 +12588,7 @@ msgstr ""
 "MIME. Para obtener más información vea <link linkend=\"bshoty0"
 "\">Certificados</link>."
 
-#: C/evolution.xml:6291(para)
+#: C/evolution.xml:6257(para)
 msgid ""
 "Previous versions of Evolution included directory servers, folder settings, "
 "and Exchange delegation in the settings tool. Directory servers can now be "
@@ -12844,10 +12604,10 @@ msgstr ""
 "botón derecho sobre la carpeta, y la delegación para Exchange está "
 "disponible en el menú Mensaje de la herramienta Exchange."
 
-#: C/evolution.xml:6295(para)
+#: C/evolution.xml:6261(para)
 msgid ""
 "Evolution allows you to maintain multiple accounts, or identities. When you "
-"are writing an e-mail message, you can choose which account to use by "
+"are writing an email message, you can choose which account to use by "
 "selecting from the drop-down list next to the From field in the message "
 "composer."
 msgstr ""
@@ -12856,18 +12616,19 @@ msgstr ""
 "cuanta quiere usar seleccionándola de una lista desplegable junto al campo "
 "De: en el editor de mensajes."
 
-#: C/evolution.xml:6296(para)
+#: C/evolution.xml:6262(para)
+#, fuzzy
 msgid ""
-"Click Send/Receive to select all mail sources that are not disabled. If you "
-"don't want to check mail for a given account, select the account in the Mail "
-"Accounts tab and click the Disable button.."
+"Click Send/Receive to update all mail sources that are not disabled. If you "
+"don't want to check mail for a given account, select the account in Edit "
+"&gt; Preferences &gt; Mail Accounts page and click the Disable button."
 msgstr ""
 "Pulse Enviar/Recibir para seleccionar todas las fuentes de correo que no "
-"estén deshabilitadas. Si no quiere comprobar el correo para una cuenta dada, "
+"estén desactivadas. Si no quiere comprobar el correo para una cuenta dada, "
 "seleccione la cuenta en la solapa Cuentas de correo y pulse el botón "
 "Desactivar."
 
-#: C/evolution.xml:6297(para)
+#: C/evolution.xml:6263(para)
 msgid ""
 "To add a new account, click Add to open the Evolution configuration "
 "assistant. To alter an existing account, select it in the Preferences "
@@ -12878,37 +12639,37 @@ msgstr ""
 "selecciónela y pulse en Editar para abrir el cuadro de diálogo del editor de "
 "cuentas."
 
-#: C/evolution.xml:6298(para)
+#: C/evolution.xml:6264(para)
 msgid "The account editor dialog box has seven sections:"
 msgstr "El cuadro de diálogo del editor de cuentas cuenta con siete secciones:"
 
-#: C/evolution.xml:6300(title)
+#: C/evolution.xml:6266(title)
 msgid "Identity:"
 msgstr "Identidad:"
 
-#: C/evolution.xml:6301(para)
+#: C/evolution.xml:6267(para)
 msgid ""
-"Specify the name and e-mail address for this account. You can also choose a "
+"Specify the name and email address for this account. You can also choose a "
 "default signature to insert into messages sent from this account."
 msgstr ""
 "Especifique el nombre y dirección de correo-e para esta cuenta. También "
 "puede elegir una firma predeterminada para añadirla al final de los mensajes "
 "enviados desde esta cuenta."
 
-#: C/evolution.xml:6304(title)
+#: C/evolution.xml:6270(title)
 msgid "Receiving Email:"
 msgstr "Recibir correo electrónico:"
 
-#: C/evolution.xml:6305(para)
+#: C/evolution.xml:6271(para)
+#, fuzzy
 msgid ""
-"Select the way you receive e-mail. You can download e-mail from a <link "
+"Select the way you receive email. You can download email from a <link "
 "linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
 "Exchange, <trademark class=\"registered\">Novell</trademark><trademark class="
 "\"registered\">GroupWise</trademark>, or IMAP<link linkend=\"imap\">IMAP</"
 "link>), or read it from files that already exist on your desktop computer. "
-"Your server requires you to use a Secure Socket Layer (SSL) connection. You "
-"can select from the given three options: No encryption, TLS encryption or "
-"SSL encryption."
+"If your server requires you to use a secure connection, you can select from "
+"the given three options: No encryption, TLS encryption or SSL encryption."
 msgstr ""
 "Seleccione de qué manera desea recibir su correo-e. Puede descargarlo desde "
 "un <link linkend=\"pop\">servidor POP</link>, leerlo y conservarlo en el "
@@ -12919,7 +12680,7 @@ msgstr ""
 "cifradas (SSL, Secure Socket Layer). Puede seleccionar una opción de las "
 "tres dadas: Sin cifrado, cifrado TLS o cifrado SSL."
 
-#: C/evolution.xml:6307(para)
+#: C/evolution.xml:6273(para)
 msgid ""
 "Your system administrator might ask you to connect to a specific port on a "
 "mail server. To specify which port you use, just type a colon and the port "
@@ -12933,7 +12694,7 @@ msgstr ""
 "servidor smtp.ejemplo.net, especifique smtp.ejemplo.net:142 como nombre del "
 "servidor."
 
-#: C/evolution.xml:6308(para)
+#: C/evolution.xml:6274(para)
 msgid ""
 "For additional information, see <link linkend=\"second-step\">Receiving "
 "Mail</link>."
@@ -12941,11 +12702,11 @@ msgstr ""
 "Para obtener información adicional, vea <link linkend=\"second-step"
 "\">Recepción de correo</link>."
 
-#: C/evolution.xml:6310(title)
+#: C/evolution.xml:6276(title)
 msgid "Receiving Options:"
 msgstr "Opciones de recepción:"
 
-#: C/evolution.xml:6311(para)
+#: C/evolution.xml:6277(para)
 msgid ""
 "Decide if you want to check for mail automatically and how often, as well as "
 "setting other message retrieval options."
@@ -12953,7 +12714,7 @@ msgstr ""
 "Decida si quiere descargar su correo automáticamente y con qué frecuencia, "
 "así como otras opciones de recuperación de los mensajes."
 
-#: C/evolution.xml:6313(para)
+#: C/evolution.xml:6279(para)
 msgid ""
 "For additional information, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -12963,23 +12724,24 @@ msgstr ""
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:6315(title)
+#: C/evolution.xml:6281(title)
 msgid "Sending Mail:"
 msgstr "Envío de correo:"
 
-#: C/evolution.xml:6316(para)
+#: C/evolution.xml:6282(para)
+#, fuzzy
 msgid ""
 "Use this section to choose and configure a method for sending mail. You can "
 "choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have "
-"installed the Evolution Connector for Microsoft Exchange), or <link linkend="
-"\"sendmail\">Sendmail</link>."
+"installed the Evolution Connector for Microsoft Exchange), <link linkend="
+"\"sendmail\">Sendmail</link> or many other options."
 msgstr ""
 "Use esta sección para elegir y configurar un método de de envío de correo. "
 "Puede elegir <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (si ha "
 "instalado Evolution Connector para Microsoft Exchange) o <link linkend="
 "\"sendmail\">Sendmail</link>."
 
-#: C/evolution.xml:6318(para)
+#: C/evolution.xml:6284(para)
 msgid ""
 "For additional information, see <link linkend=\"third-step\">Sending Mail</"
 "link>."
@@ -12987,21 +12749,21 @@ msgstr ""
 "Para obtener información adicional vea <link linkend=\"third-step\">Envío de "
 "correo</link>."
 
-#: C/evolution.xml:6320(title)
+#: C/evolution.xml:6286(title)
 msgid "Defaults:"
 msgstr "Predeterminados:"
 
-#: C/evolution.xml:6321(para)
+#: C/evolution.xml:6287(para)
 msgid ""
 "Use this section to set where this account stores the messages that it has "
 "sent, and the messages that you save as drafts. If you want to revert to the "
-"default settings, click Restore Defaults."
+"default settings, click Restore."
 msgstr ""
 "Puede decidir dónde quiere que esta cuenta almacene los mensajes enviados y "
 "los guardados como borradores. Si quiere restaurar la configuración "
 "predeterminada pulse el botón Revertir."
 
-#: C/evolution.xml:6323(para)
+#: C/evolution.xml:6289(para)
 msgid ""
 "If you want to send someone a copy of every message from this account, "
 "select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) "
@@ -13011,7 +12773,7 @@ msgstr ""
 "active la casilla Siempre enviar copia de carbón (Cc) a: o Siempre enviar "
 "copia de carbón oculta (Cco) a: e introduzca una o más direcciones."
 
-#: C/evolution.xml:6324(para)
+#: C/evolution.xml:6290(para)
 msgid ""
 "You can specify the way you want to receive message receipts. You can set "
 "Send message receipts to Never, Always or Ask for each message. For more "
@@ -13022,7 +12784,7 @@ msgstr ""
 "por cada mensaje. Para obtener más información consulte <link linkend="
 "\"b13uhy6r\">Ajustes predeterminados</link>."
 
-#: C/evolution.xml:6325(para)
+#: C/evolution.xml:6291(para)
 msgid ""
 "You can change the default settings of your sent items. Click Advanced Send "
 "Options to prioritize, classify your send messages. You can also set the "
@@ -13037,11 +12799,11 @@ msgstr ""
 "concordancia. Active el seguimiento de estado así como Devolver notificación "
 "para el correo, el calendario y las tareas."
 
-#: C/evolution.xml:6327(title)
+#: C/evolution.xml:6293(title)
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: C/evolution.xml:6328(para)
+#: C/evolution.xml:6294(para)
 msgid ""
 "Use this section to set the security options for this account. If you use "
 "encryption, enter your PGP key ID (see <link linkend=\"encryption"
@@ -13053,11 +12815,11 @@ msgstr ""
 "\"encryption\">Cifrado</link>) y elija, entre las cuatro opciones "
 "disponibles, la manera de manejar su clave y firma."
 
-#: C/evolution.xml:6331(title)
+#: C/evolution.xml:6297(title)
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: C/evolution.xml:6332(para)
+#: C/evolution.xml:6298(para)
 msgid ""
 "This only displays if you have a GroupWise account. Use this section to set "
 "proxy access for other users to access your mailbox or calendar."
@@ -13066,12 +12828,14 @@ msgstr ""
 "ajustar el acceso proxy para que otros usuarios accedan a su Bandeja de "
 "correo o Calendario."
 
-#: C/evolution.xml:6338(para)
+#: C/evolution.xml:6304(para)
+#, fuzzy
 msgid ""
 "The Autocompletion tool lets you choose address books to auto-complete names "
-"for you. This functionality requires accessibility to each of the address "
-"books you want to use. To enable autocompletion, select each of the address "
-"books that you want to use auto completion in the Autocompletion page."
+"for you in the mail composer. This functionality requires accessibility to "
+"each of the address books you want to use. To enable autocompletion, select "
+"each of the address books that you want to use auto completion in the "
+"Autocompletion page."
 msgstr ""
 "La herramienta de autocompletado le permite elegir libretas de direcciones "
 "para autocompletar nombres. Esta funcionalidad requiere accesibilidad para "
@@ -13079,17 +12843,17 @@ msgstr ""
 "autocompletado, seleccione cada una de las libretas de direcciones que "
 "quiere usar en la página Autocompletado."
 
-#: C/evolution.xml:6342(title)
+#: C/evolution.xml:6308(title)
 msgid "IMAP Mail Headers"
 msgstr "Cabeceras de correo IMAP"
 
-#: C/evolution.xml:6343(para)
+#: C/evolution.xml:6309(para)
+#, fuzzy
 msgid ""
-"Evolution allow you to choose the headers that you want to download so that "
-"you can reduce the download time and at the same time having control as to "
-"filter or move your mails around the way you like it. Evolution help you "
-"customize your IMAP Mail header preferences and thus save the download time. "
-"The IMAP Mail headers are as follows:"
+"Evolution allows you to choose the headers that you want to download so that "
+"you can reduce the download time and filter or move your mail around the way "
+"you like it. Evolution help you customize your IMAP Mail header preferences "
+"and thus save the download time. The IMAP Mail header options are as follows:"
 msgstr ""
 "Evolution le permite elegir las cabeceras que quiere descargar para reducir "
 "el tiempo de descarga y al mismo tiempo tener un control para filtrar o "
@@ -13097,23 +12861,23 @@ msgstr ""
 "las preferencias de las cabeceras de corroe IMAP y así ahorrar tiempo de "
 "descarga. Las cabeceras de correo IMAP son las siguientes:"
 
-#: C/evolution.xml:6345(title)
+#: C/evolution.xml:6311(title)
 msgid "All Headers:"
 msgstr "Todas las cabeceras:"
 
-#: C/evolution.xml:6346(para)
+#: C/evolution.xml:6312(para)
 msgid ""
-"This include all the available IMAP Mail headers. By choosing this option, "
-"Evolution will download all the Headers for all the messages."
+"This includes all the available IMAP Mail headers. By choosing this option, "
+"Evolution will download all the headers for all the messages."
 msgstr ""
 "Esto incluye todas las cabeceras de correo IMAP disponibles. Eligiendo esta "
 "opción Evolution descargará todas las cabeceras de todos los mensajes."
 
-#: C/evolution.xml:6349(title)
+#: C/evolution.xml:6315(title)
 msgid "Basic Headers:"
 msgstr "Cabeceras básicas:"
 
-#: C/evolution.xml:6350(para)
+#: C/evolution.xml:6316(para)
 msgid ""
 "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
 "Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
@@ -13127,16 +12891,17 @@ msgstr ""
 "en sus listas de correo, elija esta opción. Esto hará que Evolution trabaje "
 "más rápido y generalmente se recomienda para usuarios normales."
 
-#: C/evolution.xml:6353(title)
+#: C/evolution.xml:6319(title)
 msgid "Mailing List Headers:"
 msgstr "Cabeceras de las listas de correo:"
 
-#: C/evolution.xml:6354(para)
+#: C/evolution.xml:6320(para)
+#, fuzzy
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
 "mailing-lists are also fetched. Mailing list headers will have the "
-"informations such as the mailing list ID, owner of the mailing list, and so "
+"informations such as the mailinglist-ID, owner of the mailing list, and so "
 "on with which you can create mailing list filters."
 msgstr ""
 "Active esta opción para tener filtros basados en las cabeceras de las listas "
@@ -13146,13 +12911,14 @@ msgstr ""
 "propietario de la lista de correo y demás con lo que puede crear un filtro "
 "para listas de correo."
 
-#: C/evolution.xml:6356(para)
+#: C/evolution.xml:6322(para)
+#, fuzzy
 msgid ""
-"This is the default Header preferences that comes with Evolution. When this "
+"This is the default Header preference that comes with Evolution. When this "
 "option is chosen, Evolution will download a basic set of headers (as "
 "described above) along with a set of headers that are needed for client-side "
 "filters based on mailing lists. If you do not have any filters on Evolution, "
-"it is recommended to switch to the \"Basic Headers Only\"option."
+"it is recommended to switch to the \"Basic Headers Only\" option."
 msgstr ""
 "Estas son las preferencias predeterminadas en Evolution para las Cabeceras. "
 "Cuando se elije esta opción, Evolution descargará un juego básico de "
@@ -13161,11 +12927,11 @@ msgstr ""
 "correo. Si no tiene ningún filtro en Evolution, se recomienda que cambie a "
 "la opción «Cabeceras básicas»."
 
-#: C/evolution.xml:6358(title)
+#: C/evolution.xml:6324(title)
 msgid "Custom Headers:"
 msgstr "Cabeceras personalizadas:"
 
-#: C/evolution.xml:6359(para)
+#: C/evolution.xml:6325(para)
 msgid ""
 "These are the extra headers in addition to the above standard headers. You "
 "can add custom headers in addition to the standard headers. If you want to "
@@ -13182,25 +12948,21 @@ msgstr ""
 "con la opción Cabeceras personalizadas. Aquí podrá seleccionar Añadir/Quitar "
 "cabeceras según sus necesidades."
 
-#: C/evolution.xml:6362(para)
+#: C/evolution.xml:6328(para)
 msgid "This option may not be needed if you have chosen to download ALL Headers."
 msgstr ""
 "Puede que esta opción no sea necesaria si ha elegido descargar Todas las "
 "cabeceras."
 
-#: C/evolution.xml:6364(para)
+#: C/evolution.xml:6330(para)
 msgid "To set the IMAP Mail headers:"
 msgstr "Para establecer las cabeceras de correo IMAP:"
 
-#: C/evolution.xml:6367(para)
-msgid "Select Edit &gt; Preferences."
-msgstr "Seleccione Editar &gt; Preferencias."
-
-#: C/evolution.xml:6370(para)
+#: C/evolution.xml:6336(para)
 msgid "Select the IMAP account and click Edit to open the Account Editor."
 msgstr "Seleccione la cuenta IMAP y pulse Editar para abrir el editor de cuentas."
 
-#: C/evolution.xml:6373(para)
+#: C/evolution.xml:6339(para)
 msgid ""
 "On the Account Editor, click IMAP Headers tab to open IMAP Headers to the "
 "Account Editor."
@@ -13208,13 +12970,13 @@ msgstr ""
 "En el Editor de cuentas, pulse la solapa Cabeceras IMAP para abrir las "
 "Cabeceras IMAP en el Editor de cuentas."
 
-#: C/evolution.xml:6378(para)
+#: C/evolution.xml:6344(para)
 msgid "Click Fetch All Headers to download all the available header information."
 msgstr ""
 "Pulse Obtener todas las cabeceras para descargar toda la información "
 "disponible sobre las cabeceras."
 
-#: C/evolution.xml:6380(para)
+#: C/evolution.xml:6346(para)
 msgid ""
 "The more headers you have, the more time it will consume to download. This "
 "option is not recommended."
@@ -13222,25 +12984,25 @@ msgstr ""
 "Cuantas más cabeceras tenga más tiempo llevará descargarlas. No se "
 "recomienda esta opción."
 
-#: C/evolution.xml:6384(para)
+#: C/evolution.xml:6350(para)
 msgid "Click Basic Headers to download basic headers."
 msgstr "Pulse Cabeceras básicas para descargar las cabeceras básicas."
 
-#: C/evolution.xml:6387(para)
+#: C/evolution.xml:6353(para)
 msgid "Click Basic and Mailing Headers to download both."
 msgstr ""
 "Pulse Cabeceras básicas y de listas de correo predeterminadas para descargar "
 "ambas."
 
-#: C/evolution.xml:6390(para)
+#: C/evolution.xml:6356(para)
 msgid "Click Add to add any predefined custom headers."
 msgstr "Pulse Añadir para añadir cualquier cabecera predefinida."
 
-#: C/evolution.xml:6393(para)
+#: C/evolution.xml:6359(para)
 msgid "Click Remove to remove the custom headers."
 msgstr "Pulse Eliminar para eliminar las cabeceras personalizadas."
 
-#: C/evolution.xml:6400(para)
+#: C/evolution.xml:6366(para)
 msgid ""
 "The Mail Preferences tool lets you choose how to display citations, how long "
 "to wait before marking a message as read, and other mail display settings."
@@ -13250,68 +13012,68 @@ msgstr ""
 "así como otros ajustes de representación del correo."
 
 # index.docbook:29, index.docbook:30
-#: C/evolution.xml:6403(link) C/evolution.xml:6427(title)
+#: C/evolution.xml:6369(link) C/evolution.xml:6393(title)
 msgid "General Mail Settings"
 msgstr "Ajustes generales del correo"
 
-#: C/evolution.xml:6406(link) C/evolution.xml:6449(title)
+#: C/evolution.xml:6372(link) C/evolution.xml:6415(title)
 msgid "HTML Mail Preferences"
 msgstr "Preferencias del correo en HTML"
 
-#: C/evolution.xml:6409(link) C/evolution.xml:6467(title)
+#: C/evolution.xml:6375(link) C/evolution.xml:6433(title)
 msgid "Label Preferences"
 msgstr "Preferencias de las etiquetas"
 
-#: C/evolution.xml:6412(link) C/evolution.xml:6501(title)
+#: C/evolution.xml:6378(link) C/evolution.xml:6467(title)
 msgid "Mail Header Preferences"
 msgstr "Opciones de las cabeceras del correo"
 
-#: C/evolution.xml:6415(link) C/evolution.xml:6513(title)
+#: C/evolution.xml:6381(link) C/evolution.xml:6479(title)
 msgid "Junk Mail Preferences"
 msgstr "Opciones de correo spam"
 
-#: C/evolution.xml:6418(link) C/evolution.xml:6556(title)
+#: C/evolution.xml:6384(link) C/evolution.xml:6522(title)
 msgid "Automatic Contacts Preferences"
 msgstr "Preferencias de los contactos automáticos"
 
-#: C/evolution.xml:6421(link) C/evolution.xml:6562(title)
+#: C/evolution.xml:6387(link) C/evolution.xml:6528(title)
 msgid "Calendar and Tasks Preferences"
 msgstr "Preferencias del calendario y de las tareas"
 
-#: C/evolution.xml:6424(para)
+#: C/evolution.xml:6390(para)
 msgid ""
-"For information on individual e-mail account settings, see <link linkend="
+"For information on individual email account settings, see <link linkend="
 "\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
 msgstr ""
 "Para saber más sobre opciones individuales de correo electrónico consulte "
 "<link linkend=\"config-prefs-mail-identity\">Utilización de cuentas de "
 "correo</link>."
 
-#: C/evolution.xml:6428(para)
+#: C/evolution.xml:6394(para) C/evolution.xml:6550(para)
 msgid "The General page has the following options:"
 msgstr "La página General tiene las siguientes opciones:"
 
-#: C/evolution.xml:6430(title)
+#: C/evolution.xml:6396(title)
 msgid "Message Fonts:"
 msgstr "Tipografías del mensaje:"
 
-#: C/evolution.xml:6431(para)
+#: C/evolution.xml:6397(para)
 msgid ""
 "Normally, Evolution uses the same fonts as other GNOME applications. To "
 "choose different fonts, deselect Use the same fonts as other applications "
-"and select one font for standard typefaces and a second for monospace, "
-"terminal, or display."
+"and select one font for standard typefaces and a second for monospace."
 msgstr ""
 "En general Evolution usará las mismas tipografías que el resto de "
 "aplicaciones GNOME. Para elegir otras diferentes desactive la casilla Usar "
 "las mismas tipografías que en otras aplicaciones y elija una tipografía "
 "estándar y otra de tamaño fijo."
 
-#: C/evolution.xml:6434(title)
+#: C/evolution.xml:6400(title)
 msgid "Message Display:"
 msgstr "Vista de los mensajes:"
 
-#: C/evolution.xml:6435(para)
+#: C/evolution.xml:6401(para)
+#, fuzzy
 msgid ""
 "Choose how long you want to wait before marking a message read, how to "
 "highlight quotations, and the default encoding. Enable <guilabel>Fall back "
@@ -13319,7 +13081,7 @@ msgid ""
 "threads. You can also set the limit to the number of addresses displayed in "
 "the message header by enabling <guilabel>Shrink To/CC/BCC header to</"
 "guilabel> option.You can also set the limit for rendering text content in "
-"the message you recive.By default, when you receive a message with text "
+"the message you receive. By default, when you receive a message with text "
 "content more than 4096 Kilo Bytes, Evolution will not render the message in "
 "the preview pane. You can view unformatted text either inline or using an "
 "external application. You can also enable Magic spacebar and search folders."
@@ -13337,23 +13099,24 @@ msgstr ""
 "aplicación externa. También puede activar la barra espaciadora mágica y las "
 "carpetas de búsqueda."
 
-#: C/evolution.xml:6437(para)
+#: C/evolution.xml:6403(para)
 msgid ""
 "To group the messages as threads select View &gt; Group By threads or press "
-"Ctrl +T."
+"Ctrl+T."
 msgstr ""
 "Para agrupar mensajes por conversaciones, seleccione Ver &gt; Agrupar por "
 "conversaciones o pulse Ctrl +T."
 
-#: C/evolution.xml:6439(title)
+#: C/evolution.xml:6405(title)
 msgid "Deleting Mail:"
 msgstr "Borrar correo:"
 
-#: C/evolution.xml:6440(para)
+#: C/evolution.xml:6406(para)
+#, fuzzy
 msgid ""
 "Choose whether to delete messages automatically when quitting Evolution and "
 "how frequently, and whether you want to explicitly confirm the final "
-"deletion of messages.Select Confirm when expunging a folder to confirm the "
+"deletion of messages. Select Confirm when expunging a folder to confirm the "
 "final deletion. You can have four different options to set the frequency for "
 "deletion: Everytime, Once per day, Once per week, and Once per month."
 msgstr ""
@@ -13364,11 +13127,11 @@ msgstr ""
 "frecuencia para la eliminación: Cada vez, Una vez por día, Una vez por "
 "semana y Una vez por mes."
 
-#: C/evolution.xml:6443(title)
+#: C/evolution.xml:6409(title)
 msgid "New Mail Notifications:"
 msgstr "Notificaciones de correo nuevo:"
 
-#: C/evolution.xml:6444(para)
+#: C/evolution.xml:6410(para)
 msgid ""
 "Evolution can alert you to the arrival of new mail with a beep or by playing "
 "a sound file. Choose your alert noise, or select none, as you prefer. You "
@@ -13379,23 +13142,23 @@ msgstr ""
 "ninguno, tal como prefiera. Puede elegir no notificar la llegada de correo "
 "nuevo."
 
-#: C/evolution.xml:6450(para)
+#: C/evolution.xml:6416(para)
 msgid "The HTML Mail page has the following options:"
 msgstr "La página Correo HTML tiene las siguientes opciones:"
 
-#: C/evolution.xml:6452(title)
+#: C/evolution.xml:6418(title)
 msgid "Show Image Animations:"
 msgstr "Mostrar imágenes animadas:"
 
-#: C/evolution.xml:6453(para)
-msgid "Turns animation on or off."
-msgstr "Activar o desactivar las animaciones."
+#: C/evolution.xml:6419(para)
+msgid "Turns image animation (e.g. GIF files) on or off."
+msgstr "Activar o desactivar las animaciones (ej. archivos GIF)."
 
-#: C/evolution.xml:6456(title)
+#: C/evolution.xml:6422(title)
 msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:"
 msgstr "Preguntar al mandar mensajes HTML a contactos que no los quieren:"
 
-#: C/evolution.xml:6457(para)
+#: C/evolution.xml:6423(para)
 msgid ""
 "Some people do not like HTML mail, and you can set Evolution to warn you of "
 "this preference. This warning appears only when you send HTML mail to people "
@@ -13406,35 +13169,37 @@ msgstr ""
 "HTML a personas a las que previamente ha anotado en su libreta de "
 "direcciones que no quieren recibirlo."
 
-#: C/evolution.xml:6460(title)
+#: C/evolution.xml:6426(title)
 msgid "Loading Images:"
 msgstr "Cargar imágenes:"
 
-#: C/evolution.xml:6461(para)
+#: C/evolution.xml:6427(para)
+#, fuzzy
 msgid ""
-"You can embed a image in an e-mail and have it load only when the message "
+"You can embed a image in an email and have it load only when the message "
 "arrives. However, spammers can use image loading patterns to confirm "
-"<quote>live</quote> addresses and invade your privacy. You can elect to "
+"<quote>valid</quote> addresses and invade your privacy. You can elect to "
 "never load images automatically, to load images only if the sender is in "
 "your contacts, or always load images."
 msgstr ""
 "Puede incluir una imagen en un correo-e y que sólo se descargue cuando el "
 "destinatario lea el mensaje. Sin embargo los «spammers» pueden usar los "
-"patrones de descarga de imágenes para confirmar <quote>direcciones activas</"
+"patrones de descarga de imágenes para confirmar direcciones <quote>válidas</"
 "quote> e invadir la privacidad de sus datos. Puede elegir que nunca se "
 "carguen las imágenes automáticamente, hacerlo solamente si el remitente está "
 "en su libreta de direcciones o cargarlas siempre."
 
-#: C/evolution.xml:6463(para)
+#: C/evolution.xml:6429(para)
 msgid ""
 "If you have chosen not to load images automatically, you can choose to see "
 "the images in one message at a time by selecting View &gt; Load Images or "
-"press Ctrl +I."
+"press Ctrl+I."
 msgstr ""
-"Si ha elegido no descargar imágenes automáticamente puede elegir verlas en "
-"cada mensaje con Ver &gt; Cargar imágenes o pulsando Ctrl+I."
+"Si ha elegido no descargar imágenes automáticamente puede elegir ver las "
+"imágenes en cada mensaje seleccionando Ver &gt; Cargar imágenes o pulsando "
+"Ctrl+I."
 
-#: C/evolution.xml:6468(para)
+#: C/evolution.xml:6434(para)
 msgid ""
 "The Label preferences option lets you add color labels for different kinds "
 "of messages. You can add, edit, or remove the labels. You can also assign "
@@ -13444,46 +13209,46 @@ msgstr ""
 "color para diferentes tipos de mensajes. Puede añadir, editar o eliminar las "
 "etiquetas. También puede asignar colores a cada etiqueta que haya creado."
 
-#: C/evolution.xml:6470(para)
+#: C/evolution.xml:6436(para)
 msgid "To create a label:"
 msgstr "Para crear una etiqueta:"
 
-#: C/evolution.xml:6473(para)
+#: C/evolution.xml:6439(para)
 msgid "Click Add and specify the name in the Label Name dialog box."
 msgstr ""
 "Pulse Añadir y especifique el nombre en la caja de diálogo Nombre de la "
 "etiqueta."
 
-#: C/evolution.xml:6476(para)
+#: C/evolution.xml:6442(para)
 msgid "Click the color tab and select a color, then click OK."
 msgstr "Pulse la solapa de color y seleccione el color, después pulse Aceptar."
 
-#: C/evolution.xml:6479(para)
+#: C/evolution.xml:6445(para)
 msgid "To edit label properties:"
 msgstr "Para editar las propiedades de la etiqueta:"
 
-#: C/evolution.xml:6482(para)
+#: C/evolution.xml:6448(para)
 msgid "Select the label and click Edit."
 msgstr "Seleccione la etiqueta y pulse Editar."
 
-#: C/evolution.xml:6485(para)
+#: C/evolution.xml:6451(para)
 msgid "Edit name and color, then click OK."
 msgstr "Edite el nombre y color, después pulse Aceptar."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:6488(para)
-msgid "To assign a label to a specific e-mail message:"
+#: C/evolution.xml:6454(para)
+msgid "To assign a label to a specific email message:"
 msgstr "Para asignar una etiqueta a un mensaje de correo-e específico:"
 
-#: C/evolution.xml:6491(para)
+#: C/evolution.xml:6457(para)
 msgid "Right-click the message from the message preview."
 msgstr "Pulse con el botón derecho sobre el mensaje desde la vista previa del mismo."
 
-#: C/evolution.xml:6494(para)
+#: C/evolution.xml:6460(para)
 msgid "Click Label and select the desired label for the message."
 msgstr "Pulse Etiqueta y seleccione la etiqueta deseada para el mensaje."
 
-#: C/evolution.xml:6502(para)
+#: C/evolution.xml:6468(para)
 msgid ""
 "The headers on an incoming message are the information about the message "
 "that isn't the content of the message itself, such as the sender and the "
@@ -13498,11 +13263,11 @@ msgstr ""
 "puede añadir o quitar cabeceras a la lista. Las cabeceras predeterminadas no "
 "se pueden eliminar."
 
-#: C/evolution.xml:6504(title)
+#: C/evolution.xml:6470(title)
 msgid "Sender Photograph:"
 msgstr "Foto del remitente:"
 
-#: C/evolution.xml:6505(para)
+#: C/evolution.xml:6471(para)
 msgid ""
 "This feature adds support for viewing the photograph of the sender at the "
 "right side of the preview pane."
@@ -13510,7 +13275,7 @@ msgstr ""
 "Esta característica añade soporte para ver la fotografía del remitente en la "
 "parte derecha del panel de vista preliminar."
 
-#: C/evolution.xml:6507(para)
+#: C/evolution.xml:6473(para)
 msgid ""
 "To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences "
 "&gt; Headers &gt; Show the photograph of sender in the email preview. "
@@ -13521,7 +13286,7 @@ msgstr ""
 "vista preliminar del correo-e. Deseleccione esta opción para desactivar esta "
 "característica."
 
-#: C/evolution.xml:6508(para)
+#: C/evolution.xml:6474(para)
 msgid ""
 "By default it searches only in the local addressbooks enabled for "
 "autocompletion. If you deselect the option <guilabel>Search for sender "
@@ -13542,7 +13307,7 @@ msgstr ""
 "tomará el primer contacto independientemente de que tenga o no una "
 "fotografía."
 
-#: C/evolution.xml:6509(para)
+#: C/evolution.xml:6475(para)
 msgid ""
 "This feature is disabled by default as it causes delay in fetching the "
 "messages."
@@ -13550,7 +13315,7 @@ msgstr ""
 "Esta característica está desactivada de forma predeterminada ya que causa "
 "retraso al obtener los correos."
 
-#: C/evolution.xml:6514(para)
+#: C/evolution.xml:6480(para)
 msgid ""
 "You can check your incoming messages for junk content by using Bogofilter "
 "and SpamAssassin* tools, which have trainable Bayesian filters. You need to "
@@ -13561,15 +13326,15 @@ msgstr ""
 "Debeactivar los respectivos complementos de SPAM para activar el filtro de "
 "SPAM."
 
-#: C/evolution.xml:6515(para)
+#: C/evolution.xml:6481(para)
 msgid "To enable Junk plugins:"
 msgstr "Activar complementos anti SPAM:"
 
-#: C/evolution.xml:6518(para)
+#: C/evolution.xml:6484(para)
 msgid "Select Edit &gt; Plugins"
 msgstr "Seleccione Editar &gt; Complementos"
 
-#: C/evolution.xml:6521(para)
+#: C/evolution.xml:6487(para)
 msgid ""
 "Select the junk plugins you want. You can select either Bogofilter or "
 "SpamAssassin, or you can select both."
@@ -13577,33 +13342,34 @@ msgstr ""
 "Seleccione los complementos de filtro de SPAM que quiera. Puede seleccionar "
 "tanto Bogofilter como SpamAssasin, o puede seleccionar los dos."
 
-#: C/evolution.xml:6525(title)
+#: C/evolution.xml:6491(title)
 msgid "General:"
 msgstr "General:"
 
-#: C/evolution.xml:6526(para)
+#: C/evolution.xml:6492(para)
+#, fuzzy
 msgid ""
-"You can check incoming e-mail for junk contents and also decide how often "
-"you want to delete junk mail. You also have the option to choose either "
+"You can check incoming email for junk contents and also decide how often you "
+"want to delete junk mail. You also have the option to choose either "
 "SpamAssassin or Bogofilter, or you can select both."
 msgstr ""
 "Puede comprobar si el correo entrante es basura y también decidir con qué "
 "frecuencia quiere borrar el correo basura. También tiene la opción de elegir "
 "entre SpamAssasin, Bogofilter o ambos."
 
-#: C/evolution.xml:6529(title)
+#: C/evolution.xml:6495(title)
 msgid "Checking Incoming Mail for Junk:"
 msgstr "Detectar si el correo entrante es spam:"
 
-#: C/evolution.xml:6530(para)
+#: C/evolution.xml:6496(para)
 msgid "This option turns automatic junk mail filtering on or off."
 msgstr "Esta opción activa los filtros de comprobación automática de correo basura."
 
-#: C/evolution.xml:6533(title)
-msgid "Delete junk mails on exit:"
-msgstr "Borrar los correos spam al salir:"
+#: C/evolution.xml:6499(title)
+msgid "Delete junk mail on exit:"
+msgstr "Borrar los correos SPAM al salir:"
 
-#: C/evolution.xml:6534(para)
+#: C/evolution.xml:6500(para)
 msgid ""
 "This option deletes junk messages when you exit. You can also specify when "
 "to delete the junk messages (every time, once per day, once per week, once "
@@ -13613,11 +13379,11 @@ msgstr ""
 "cuándo se deben borrar los correos basura de las opciones (Cada vez, Una vez "
 "por día, Una vez por semana, Una vez por mes)."
 
-#: C/evolution.xml:6537(title)
+#: C/evolution.xml:6503(title)
 msgid "Default junk plugin:"
 msgstr "Complemento spam predeterminado:"
 
-#: C/evolution.xml:6538(para)
+#: C/evolution.xml:6504(para)
 msgid ""
 "Select either SpamAssassin or Bogofilter, or both, as your junk filter. You "
 "can view them only if you have enabled the respective plugins. When you "
@@ -13629,11 +13395,11 @@ msgstr ""
 "Cuando seleccione cualquier opción, también le informa si el binario "
 "correspondiente está disponible o no."
 
-#: C/evolution.xml:6542(title)
+#: C/evolution.xml:6508(title)
 msgid "SpamAssassin Options:"
 msgstr "Opciones de SpamAssasin:"
 
-#: C/evolution.xml:6543(para)
+#: C/evolution.xml:6509(para)
 msgid ""
 "Remote Test performs junk mail filtering on remote servers. It also includes "
 "online tests, like checking for blacklisted message senders and ISPs."
@@ -13642,7 +13408,7 @@ msgstr ""
 "También incluyen pruebas en línea como comprobación de remitentes e ISP en "
 "listas negras."
 
-#: C/evolution.xml:6545(para)
+#: C/evolution.xml:6511(para)
 msgid ""
 "This option uses tests that require a network connection, such as checking "
 "to see if a message is in a list of known junk messages, or if the sender or "
@@ -13659,11 +13425,11 @@ msgstr ""
 "eficacia. Cuando seleccione esta opción, no necesitará ninguna configuración "
 "adicional para que funcione."
 
-#: C/evolution.xml:6547(title)
+#: C/evolution.xml:6513(title)
 msgid "Bogofilter Options:"
 msgstr "Opciones de Bogofilter:"
 
-#: C/evolution.xml:6548(para)
+#: C/evolution.xml:6514(para)
 msgid ""
 "Select Convert mail text to Unicode to enable Unicode* filtering. For more "
 "information on Bogofilter, see the <ulink url=\"http://bogofilter."
@@ -13674,20 +13440,20 @@ msgstr ""
 "consulte el <ulink url=\"http://bogofilter.sourceforge.net/\">sitio de "
 "Bogofilter</ulink>."
 
-#: C/evolution.xml:6551(para)
+#: C/evolution.xml:6517(para)
 msgid ""
 "Check new messages for junk contents option under Edit &gt; Preferences &gt; "
-"Mail Accounts &gt; Edit &gt; Receiving option is enabled only for IMAP. "
-"Check incoming mail for junk option under Edit &gt; Prefernces &gt; Mail "
+"Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. "
+"Check incoming mail for junk option under Edit &gt; Preferences &gt; Mail "
 "Preferences &gt; Junk &gt; General refers only to POP and Local Delivery."
 msgstr ""
-"La opción Detectar si el correo entrante es spam bajo Editar &gt; "
+"La opción Detectar si el correo entrante es SPAM bajo Editar &gt; "
 "Preferencias &gt; Cuentas de correo &gt; Opciones de recepción, está "
-"activada sólo para IMAP. La opción Detectar si el correo entrante es spam "
+"activada sólo para IMAP. La opción Detectar si el correo entrante es SPAM "
 "bajo Editar &gt; Preferencias &gt; Opciones de correo &gt; SPAM &gt; General "
 "se refiere sólo al correo POP y Correo local."
 
-#: C/evolution.xml:6557(para)
+#: C/evolution.xml:6523(para)
 msgid ""
 "There are two items in this section: Automatic Contacts automatically adds "
 "people that you respond to into your address book. You can select the "
@@ -13698,7 +13464,7 @@ msgstr ""
 "direcciones. Puede seleccionar la libreta de direcciones predeterminada para "
 "los contactos automáticos de la lista."
 
-#: C/evolution.xml:6558(para)
+#: C/evolution.xml:6524(para)
 msgid ""
 "Instant Messaging Contacts periodically synchronizes contact information and "
 "images with your instant messaging program. Currently this only works with "
@@ -13710,7 +13476,7 @@ msgstr ""
 "Actualmente esto sólo funciona con Pidgin. Su libreta de direcciones no debe "
 "ser de sólo lectura para que ambas características funcionen correctamente."
 
-#: C/evolution.xml:6563(para)
+#: C/evolution.xml:6529(para)
 msgid ""
 "Allows you to delete messages after you have acted on an appointment. It "
 "also allows you to select calendars to search for meeting conflicts."
@@ -13719,36 +13485,31 @@ msgstr ""
 "También le permite seleccionar calendarios para buscar conflictos entre "
 "reuniones."
 
-#: C/evolution.xml:6569(para)
+#: C/evolution.xml:6535(para)
 msgid ""
 "There are three tabs for message composer settings where you can set the "
-"composer preferences. The General tab covers shortcuts and assorted "
-"behavior, the Signature tab sets your signature, and the Spell Checking tab "
-"controls spell checking."
+"composer preferences. The General tab covers assorted behavior, the "
+"Signature tab sets your signature, and the Spell Checking tab controls spell "
+"checking."
 msgstr ""
-"La configuración del editor de correo tiene tres solapas de opciones donde "
-"puede configurar las preferencias del editor. La solapa General le permite "
-"configurar atajos y acciones asociadas, la solapa Firma le permite "
-"establecer su firma y la solapa Ortografía controla la corrección "
-"ortográfica."
+"Existen tres solapas para los ajustes del editor de mensajes donde puede "
+"configurar las preferencias del editor. La solapa General le permite "
+"configurar el comportamiento, la solapa Firma le permite establecer su firma "
+"y la solapa Ortografía controla la corrección ortográfica."
 
-#: C/evolution.xml:6575(link) C/evolution.xml:6615(title)
+#: C/evolution.xml:6541(link) C/evolution.xml:6581(title)
 msgid "Signature"
 msgstr "Firma"
 
-#: C/evolution.xml:6578(link) C/evolution.xml:6620(title)
+#: C/evolution.xml:6544(link) C/evolution.xml:6586(title)
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: C/evolution.xml:6584(para)
-msgid "In the General tab, you can set the following options:"
-msgstr "La solapa General le permite establecer los siguientes valores:"
-
-#: C/evolution.xml:6586(title)
+#: C/evolution.xml:6552(title)
 msgid "Default Behavior:"
 msgstr "Comportamiento predeterminado:"
 
-#: C/evolution.xml:6587(para)
+#: C/evolution.xml:6553(para)
 msgid ""
 "Choose how to normally forward and reply to messages, what character set "
 "they will use, whether they are in HTML, and whether that HTML can contain "
@@ -13758,7 +13519,7 @@ msgstr ""
 "caracteres usará, si desea utilizar el formato HTML y en ese caso, si desea "
 "utilizar emoticones."
 
-#: C/evolution.xml:6589(para)
+#: C/evolution.xml:6555(para)
 msgid ""
 "You can forward messages either as an attachment or inline, or else as "
 "quoted. Choose reply style from the drop-down list: Quote original message, "
@@ -13768,11 +13529,11 @@ msgstr ""
 "citado. Elija la forma de responder de la lista desplegable: Citar el "
 "mensaje original, No citar el mensaje original, Adjuntar mensaje original."
 
-#: C/evolution.xml:6591(title)
+#: C/evolution.xml:6557(title)
 msgid "Top Posting Options:"
 msgstr "Opciones de publicar por encima:"
 
-#: C/evolution.xml:6592(para)
+#: C/evolution.xml:6558(para)
 msgid ""
 "When replying, you can choose where to place your signature in the message. "
 "You can place the signature either above the original message or at the end "
@@ -13787,27 +13548,27 @@ msgstr ""
 "del correo electrónico."
 
 # index.docbook:462, index.docbook:594
-#: C/evolution.xml:6595(title) C/evolution.xml:6667(title)
+#: C/evolution.xml:6561(title) C/evolution.xml:6634(title)
 msgid "Alerts:"
 msgstr "Alertas:"
 
-#: C/evolution.xml:6596(para)
+#: C/evolution.xml:6562(para)
 msgid "There are two optional alerts you can select:"
 msgstr "Hay dos alertas opcionales que puede seleccionar:"
 
-#: C/evolution.xml:6601(title)
+#: C/evolution.xml:6567(title)
 msgid "Prompt When Sending Messages With an Empty Subject Line:"
 msgstr "Preguntar al mandar mensajes con el asunto vacío:"
 
-#: C/evolution.xml:6602(para)
+#: C/evolution.xml:6568(para)
 msgid "The composer warns you if you try to send a message without a subject."
 msgstr "El editor muestra una advertencia si intenta enviar un mensaje sin asunto."
 
-#: C/evolution.xml:6607(title)
+#: C/evolution.xml:6573(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
 msgstr "Preguntar al mandar mensajes que sólo tengan definido Cco:"
 
-#: C/evolution.xml:6608(para)
+#: C/evolution.xml:6574(para)
 msgid ""
 "The composer warns you if you try to send a message that has only Bcc "
 "recipients. This is important because some mail servers fail to transmit "
@@ -13819,10 +13580,11 @@ msgstr ""
 "correo sólo aceptarán copias ocultas cuando el mensaje contiene al menos un "
 "destinatario visible para todos los lectores."
 
-#: C/evolution.xml:6616(para)
+#: C/evolution.xml:6582(para)
+#, fuzzy
 msgid ""
 "The signature editor allows you to create several different signatures in "
-"plain text or in HTML, and to specify which of them will be added to e-mail "
+"plain text or in HTML, and to specify which of them will be added to email "
 "you create in the message composer. If you prefer to use an alternate "
 "signature or none at all, you can select it from the mail composer itself."
 msgstr ""
@@ -13831,16 +13593,16 @@ msgstr ""
 "mensajes que crea en el editor de mensajes. También puede elegir una firma "
 "alternativa, o no utilizar ninguna, desde el propio editor de correo."
 
-#: C/evolution.xml:6621(para)
+#: C/evolution.xml:6587(para)
+#, fuzzy
 msgid ""
-"To choose a spell-checking language, select it here. You must install the "
-"gnome-spell package, for spell-checking to be available in Evolution. "
-"Additional dictionaries are also available through <trademark class="
-"\"registered\">Red Carpet</trademark> and are detected automatically if you "
-"have installed them. You must also install the aspell package. If this is "
-"the case, please contact your packager. To have the composer automatically "
-"check your spelling while you type, select Check Spelling While I Type. You "
-"can set the color for misspelled words."
+"To choose a spell-checking language, select it here. You must install gnome-"
+"spell, aspell, and an aspell language package (like for example aspell-en "
+"for english language) for spell-checking to be available in Evolution. "
+"Additional dictionaries are available through your package manager and are "
+"detected automatically if you have installed them. To have the composer "
+"automatically check your spelling while you type, select Check Spelling "
+"While I Type. You can set the color for misspelled words."
 msgstr ""
 "Seleccione aquí un idioma al que aplicar la corrección ortográfica. Debe "
 "instalar el paquete gnome-spell, para que la corrección ortográfica esté "
@@ -13852,74 +13614,72 @@ msgstr ""
 "ortografía mientras se escribe. Puede ajustar el color de las palabras mal "
 "escritas."
 
-#: C/evolution.xml:6627(para)
-msgid "The calendar configuration tool has four pages:"
-msgstr "La herramienta de configuración tiene cuatro página:"
+#: C/evolution.xml:6594(para)
+msgid "The calendar configuration tool has several pages:"
+msgstr "La herramienta de configuración del calendario tiene varias páginas:"
 
-#: C/evolution.xml:6633(link) C/evolution.xml:6673(title)
+#: C/evolution.xml:6600(link) C/evolution.xml:6640(title)
 msgid "Display"
 msgstr "Mostrar"
 
 # index.docbook:462, index.docbook:594
-#: C/evolution.xml:6636(link) C/evolution.xml:6706(title)
+#: C/evolution.xml:6603(link) C/evolution.xml:6673(title)
 msgid "Alarms"
 msgstr "Alertas"
 
-#: C/evolution.xml:6639(link) C/evolution.xml:6719(title)
+#: C/evolution.xml:6606(link) C/evolution.xml:6686(title)
 msgid "Calendar Publishing"
 msgstr "Publicar el calendario"
 
-#: C/evolution.xml:6645(para)
+#: C/evolution.xml:6612(para)
 msgid "The General page lets you set the following options:"
 msgstr "La página General le permite establecer los siguientes valores:"
 
-#: C/evolution.xml:6647(title)
+#: C/evolution.xml:6614(title)
 msgid "Time Zone:"
 msgstr "Zona horaria:"
 
-#: C/evolution.xml:6648(para)
+#: C/evolution.xml:6615(para)
 msgid "The city you're located in, to specify your time zone."
 msgstr "La ciudad en la que se encuentra, para calcular su zona horaria."
 
-#: C/evolution.xml:6651(title)
+#: C/evolution.xml:6618(title)
 msgid "Time Format:"
 msgstr "Formato de la hora:"
 
-#: C/evolution.xml:6652(para)
+#: C/evolution.xml:6619(para)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Elija entre el formato de doce horas (AM/PM) o de veinticuatro horas."
 
-#: C/evolution.xml:6655(title)
+#: C/evolution.xml:6622(title)
 msgid "Week Starts:"
 msgstr "La semana empieza en:"
 
-#: C/evolution.xml:6656(para)
+#: C/evolution.xml:6623(para)
 msgid "Select the day to display as the first in each week."
 msgstr "Seleccione el día a mostrar como el primer día de cada semana."
 
-#: C/evolution.xml:6659(title)
+#: C/evolution.xml:6626(title)
 msgid "Day Begins:"
 msgstr "El día comienza a las:"
 
-#: C/evolution.xml:6660(para)
+#: C/evolution.xml:6627(para)
 msgid ""
 "For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can "
-"select your preferred hours to make sure that all your events are displayed "
-"properly."
+"select your preferred hours."
 msgstr ""
-"Para Evolution, un día normal de trabajo comienza a las 9 AM y termina a las "
-"5 PM. Puede seleccionar su horario de trabajo para asegurarse de que todos "
-"los acontecimientos se muestran apropiadamente."
+"Para Evolution, un día normal de trabajo comienza a las 9 horas y termina a "
+"las 17 horas. Puede seleccionar su horario de trabajo preferido."
 
-#: C/evolution.xml:6663(title)
+#: C/evolution.xml:6630(title)
 msgid "Day Ends:"
 msgstr "El día acaba a las:"
 
-#: C/evolution.xml:6664(para)
+#: C/evolution.xml:6631(para)
 msgid "Sets the end of a normal workday."
 msgstr "Establece el final de un día de trabajo normal."
 
-#: C/evolution.xml:6668(para)
+#: C/evolution.xml:6635(para)
 msgid ""
 "If you want to be warned before you delete any appointment, or to have a "
 "reminder automatically appear for each event, select the options here."
@@ -13927,7 +13687,7 @@ msgstr ""
 "Active las casillas si desea mostrar una advertencia antes de eliminar "
 "cualquier cita, o recibir recordatorios automáticos para cada acontecimiento."
 
-#: C/evolution.xml:6674(para)
+#: C/evolution.xml:6641(para)
 msgid ""
 "The Display page lets you choose how your appointments and tasks appear in "
 "your calendar."
@@ -13935,11 +13695,11 @@ msgstr ""
 "La sección Vista sirve para elegir la presentación de sus citas y tareas "
 "dentro del calendario."
 
-#: C/evolution.xml:6676(title)
+#: C/evolution.xml:6643(title)
 msgid "Time Divisions:"
 msgstr "Divisiones de horas:"
 
-#: C/evolution.xml:6677(para)
+#: C/evolution.xml:6644(para)
 msgid ""
 "Sets the time increments shown as fine lines on the daily view in the "
 "calendar."
@@ -13947,11 +13707,11 @@ msgstr ""
 "Establece el incremento de tiempo mostrado como líneas finas en la vista "
 "diaria del calendario."
 
-#: C/evolution.xml:6680(title)
+#: C/evolution.xml:6647(title)
 msgid "Show appointment end times in week and month views:"
 msgstr "Mostrar la hora del final de las citas en las vistas semanales y mensuales:"
 
-#: C/evolution.xml:6681(para)
+#: C/evolution.xml:6648(para)
 msgid ""
 "If there is space, Evolution shows the end times in the week and month views "
 "for each appointment."
@@ -13959,11 +13719,11 @@ msgstr ""
 "Si hay espacio suficiente, el cliente Evolution mostrará las horas finales "
 "en las vistas semanales y mensajes para cada cita."
 
-#: C/evolution.xml:6684(title)
+#: C/evolution.xml:6651(title)
 msgid "Compress weekends in month view:"
 msgstr "Comprimir fines de semana en la vista mensual:"
 
-#: C/evolution.xml:6685(para)
+#: C/evolution.xml:6652(para)
 msgid ""
 "Select this option to display weekends in one box instead of two in the "
 "month view."
@@ -13971,37 +13731,37 @@ msgstr ""
 "Seleccione esta opción para mostrar los fines de semana en una caja en lugar "
 "de dos en la vista mensual."
 
-#: C/evolution.xml:6688(title)
+#: C/evolution.xml:6655(title)
 msgid "Show week numbers in date navigator:"
 msgstr "Muestra los números de las semanas en el navegador de fechas:"
 
-#: C/evolution.xml:6689(para)
+#: C/evolution.xml:6656(para)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr ""
 "Muestra los números de la semana junto a las respectivas semanas en el "
 "calendario."
 
-#: C/evolution.xml:6692(title)
+#: C/evolution.xml:6659(title)
 msgid "Tasks due today:"
 msgstr "Tareas que vencen hoy:"
 
-#: C/evolution.xml:6693(para)
+#: C/evolution.xml:6660(para)
 msgid "Select the color for tasks due today."
 msgstr "Establece el color para las tareas que vencen hoy."
 
-#: C/evolution.xml:6696(title)
+#: C/evolution.xml:6663(title)
 msgid "Overdue tasks:"
 msgstr "Tareas vencidas:"
 
-#: C/evolution.xml:6697(para)
+#: C/evolution.xml:6664(para)
 msgid "Select the color for overdue tasks."
 msgstr "Establece el color para las tareas vencidas."
 
-#: C/evolution.xml:6700(title)
+#: C/evolution.xml:6667(title)
 msgid "Hide completed tasks after:"
 msgstr "Ocultar las tareas completadas tras:"
 
-#: C/evolution.xml:6701(para)
+#: C/evolution.xml:6668(para)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you don't select this option, "
@@ -14012,11 +13772,11 @@ msgstr ""
 "opción, las tareas completadas se mantendrán en su lista de tareas, marcadas "
 "como completadas."
 
-#: C/evolution.xml:6708(title)
+#: C/evolution.xml:6675(title)
 msgid "Select the Calendars for Alarm Notification:"
 msgstr "Seleccionar los calendarios para las notificaciones de alerta:"
 
-#: C/evolution.xml:6709(para)
+#: C/evolution.xml:6676(para)
 msgid ""
 "Select the calendars for which you want an alarm notification. If you don't "
 "select the calendar, you will not have an alarm notification for any event "
@@ -14026,23 +13786,15 @@ msgstr ""
 "Si no selecciona el calendario no tendrça notificaciones de alerta para "
 "ningún acontecimiento en este calendario."
 
-#: C/evolution.xml:6714(title)
+#: C/evolution.xml:6681(title)
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
-#: C/evolution.xml:6715(para)
-msgid ""
-"Allows you to specify a template to use while posting your Free/Buy "
-"information to a server."
-msgstr ""
-"Le permite especificar una plantilla para usar al publicar su disponibilidad "
-"a un servidor."
-
-#: C/evolution.xml:6721(title)
+#: C/evolution.xml:6688(title)
 msgid "Publishing:"
 msgstr "Publicación:"
 
-#: C/evolution.xml:6722(para)
+#: C/evolution.xml:6689(para)
 msgid ""
 "Allows you to select a URL to post your calendar information to. When you "
 "add a URL, you can specify the publishing location, the frequency of "
@@ -14053,7 +13805,7 @@ msgstr ""
 "publicación, la frecuencia de publicación, qué calendario publicará y cómo "
 "qué persona autenticarse."
 
-#: C/evolution.xml:6729(para)
+#: C/evolution.xml:6696(para)
 msgid ""
 "Evolution allows you to add certificates for yourself as well as for "
 "contacts. This allows you to communicate with others securely over an "
@@ -14065,25 +13817,24 @@ msgstr ""
 "una conexión cifrada o firmar un mensaje confirmando su identidad al "
 "contacto. Estos ajustes sólo se aplican al cifrado S/MIME."
 
-#: C/evolution.xml:6731(title)
+#: C/evolution.xml:6698(title)
 msgid "Your Certificates:"
 msgstr "Sus certificados:"
 
-#: C/evolution.xml:6732(para)
+#: C/evolution.xml:6699(para)
 msgid ""
 "Click the Your Certificates tab to display a list of certificates that you "
-"own. You can import, view, back up and delete your certificates from this "
-"page."
+"own. You can import, view and delete your certificates from this page."
 msgstr ""
-"Pulse sobre la solapa Sus certificados par amostrar una lista de los "
-"certificados que posee. Desde esta página puede importar, ver, respaldar y "
-"borrar sus certificados."
+"Pulse sobre la solapa Sus certificados para mostrar una lista de los "
+"certificados que posee. Desde esta página puede importar, ver y borrar sus "
+"certificados."
 
-#: C/evolution.xml:6735(title)
+#: C/evolution.xml:6702(title)
 msgid "Contact Certificates:"
 msgstr "Certificados de los contactos:"
 
-#: C/evolution.xml:6736(para)
+#: C/evolution.xml:6703(para)
 msgid ""
 "Click the Contact Certificates tab to display a list of certificates that "
 "you have for contacts. These certificates allow you to decrypt messages as "
@@ -14096,11 +13847,11 @@ msgstr ""
 "página puede importar, ver, respaldar y borrar los certificados de sus "
 "contactos."
 
-#: C/evolution.xml:6739(title)
+#: C/evolution.xml:6706(title)
 msgid "Authorities:"
 msgstr "Autoridades:"
 
-#: C/evolution.xml:6740(para)
+#: C/evolution.xml:6707(para)
 msgid ""
 "Click the Authorities tab to display a list of trusted certificate "
 "authorities who verify that the certificate you have is valid. You can "
@@ -14111,67 +13862,67 @@ msgstr ""
 "es válido. Puede importar, ver, editar y borrar las autoridades de "
 "certificados desde esta página."
 
-#: C/evolution.xml:6746(para)
+#: C/evolution.xml:6713(para)
 msgid "There are two main tasks for configuring contact information:"
 msgstr "Existen dos tareas principales para configurar la información de un contacto:"
 
-#: C/evolution.xml:6749(link) C/evolution.xml:6757(title)
+#: C/evolution.xml:6716(link) C/evolution.xml:6724(title)
 msgid "Creating a Contact"
 msgstr "Crear un contacto"
 
-#: C/evolution.xml:6752(link) C/evolution.xml:6779(title)
+#: C/evolution.xml:6719(link) C/evolution.xml:6746(title)
 msgid "Creating an Address Book"
 msgstr "Crear una libreta de direcciones"
 
-#: C/evolution.xml:6758(para)
+#: C/evolution.xml:6725(para)
 msgid "To add a new contact list, either local or remote:"
 msgstr "Para añadir una nueva lista de contactos, local o remota:"
 
-#: C/evolution.xml:6761(para)
+#: C/evolution.xml:6728(para)
 msgid "Click Contacts in the Switcher."
 msgstr "Pulse Contactos en el Selector."
 
-#: C/evolution.xml:6764(para)
+#: C/evolution.xml:6731(para)
 msgid "Click the down-arrow next to New."
 msgstr "Pulse la flecha abajo junto a Nuevo."
 
-#: C/evolution.xml:6767(para)
+#: C/evolution.xml:6734(para)
 msgid "Select Contact List."
 msgstr "Seleccione una lista de contactos."
 
-#: C/evolution.xml:6770(para)
+#: C/evolution.xml:6737(para)
 msgid "Type a name and location for the Address Book."
 msgstr "Escriba un nombre y un lugar para la libreta de direcciones."
 
-#: C/evolution.xml:6782(para)
+#: C/evolution.xml:6749(para)
 msgid "Click File &gt; New &gt; Address Book."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Libreta de direcciones."
 
-#: C/evolution.xml:6785(para)
+#: C/evolution.xml:6752(para)
 msgid "Select the type of Address Book."
 msgstr "Seleccione el tipo de libreta de direcciones."
 
-#: C/evolution.xml:6787(title)
+#: C/evolution.xml:6754(title)
 msgid "On This Computer:"
 msgstr "En este equipo:"
 
-#: C/evolution.xml:6788(para)
+#: C/evolution.xml:6755(para)
 msgid "Creates a local address book on the computer."
 msgstr "Crea una libreta de direcciones local en el equipo."
 
-#: C/evolution.xml:6791(title)
+#: C/evolution.xml:6758(title)
 msgid "On LDAP Server:"
 msgstr "En un servidor LDAP:"
 
-#: C/evolution.xml:6792(para)
+#: C/evolution.xml:6759(para)
 msgid "Creates an address book on the LDAP server."
 msgstr "Crea una libreta de direcciones en el servidor LDAP."
 
-#: C/evolution.xml:6795(title)
+#: C/evolution.xml:6762(title)
 msgid "Specific Account:"
 msgstr "Cuenta específica:"
 
-#: C/evolution.xml:6796(para)
+#: C/evolution.xml:6763(para)
 msgid ""
 "If you have an account that allows you to create an address book on that "
 "server, you can select that account."
@@ -14179,51 +13930,52 @@ msgstr ""
 "Si tiene una cuenta que le permite crear una libreta de direcciones en ese "
 "servidor, puede seleccionar esa cuenta."
 
-#: C/evolution.xml:6800(para)
+#: C/evolution.xml:6767(para)
 msgid ""
-"If you selected On This Computer, specify the name of the computer, and "
+"If you selected On This Computer, specify the name of the address book, and "
 "choose whether you want to the new address book as your default folder."
 msgstr ""
-"Si seleccionó En este equipo, especifique el nombre del equipo y elija dónde "
-"quiere que se almacene su nueva libreta de direcciones como su carpeta "
-"predeterminada."
+"Si seleccionó En este equipo, especifique el nombre de la libreta de "
+"direcciones y elija dónde quiere que se almacene su nueva libreta de "
+"direcciones como su carpeta predeterminada."
 
-#: C/evolution.xml:6802(para)
+#: C/evolution.xml:6769(para)
 msgid ""
-"If you are creating an <link linkend=\"ldap\">LDAP</link> server, enter the "
-"server information as requested by the assistant:"
+"If you are creating an address book on an <link linkend=\"ldap\">LDAP</link> "
+"server, enter the server information as requested by the assistant:"
 msgstr ""
-"Si está creando un servdor <link linkend=\"ldap\">LDAP</link>, introduzca "
-"los datos del servidor solicitados por el asistente:"
+"Si está creando una libreta de direcciones en un servidor <link linkend="
+"\"ldap\">LDAP</link>, introduzca la información del servidor solicitada por "
+"el asistente:"
 
-#: C/evolution.xml:6804(title)
+#: C/evolution.xml:6771(title)
 msgid "Server Name:"
 msgstr "Nombre del servidor:"
 
-#: C/evolution.xml:6805(para)
+#: C/evolution.xml:6772(para)
 msgid "The Internet address of the contact server you are using."
 msgstr "La dirección de internet del servidor de contactos que está usando."
 
-#: C/evolution.xml:6808(title)
+#: C/evolution.xml:6775(title)
 msgid "Login Method:"
 msgstr "Método de inicio de sesión:"
 
-#: C/evolution.xml:6809(para)
+#: C/evolution.xml:6776(para)
 msgid ""
-"Specify whether your login is anonymous, uses an e-mail address, or uses a "
-"distinguished name. If the login is not anonymous, specify the e-mail "
-"address or distinguished name (DN) required by the server."
+"Specify whether your login is anonymous, uses an email address, or uses a "
+"distinguished name. If the login is not anonymous, specify the email address "
+"or distinguished name (DN) required by the server."
 msgstr ""
 "Especifique si el método de inicio de sesión es anónimo, con la dirección de "
 "correo electrónico o usa «nombre distinguido». Si no utiliza un inicio de "
 "sesión anónimo, especifique la dirección de correo-e o el «nombre "
 "distinguido» (DN) requerido por el servidor."
 
-#: C/evolution.xml:6812(title)
+#: C/evolution.xml:6779(title)
 msgid "Port:"
 msgstr "Puerto:"
 
-#: C/evolution.xml:6813(para)
+#: C/evolution.xml:6780(para)
 msgid ""
 "The Internet port Evolution connects to in order to access the LDAP "
 "database. This is normally 389."
@@ -14231,28 +13983,25 @@ msgstr ""
 "El puerto de Internet al que se conecta Evolution para acceder a la base de "
 "datos LDAP. Normalmente es el puerto 389."
 
-#: C/evolution.xml:6816(title)
+#: C/evolution.xml:6783(title)
 msgid "Use SSL/TLS:"
 msgstr "Usar SSL/TLS:"
 
-#: C/evolution.xml:6817(para)
+#: C/evolution.xml:6784(para)
 msgid ""
-"SSL and TLS are security mechanisms. If you select Always, Evolution does "
-"not connect unless secure connections are available. The default value is "
-"Whenever Possible, which uses secure connections if they are available, but "
-"does not cause failure if they are not."
+"SSL and TLS are security mechanisms. If you select No Encryption, Evolution "
+"will send your password unencrypted. By using SSL or TLS, a secure "
+"connection will be used and your password will be sent encrypted."
 msgstr ""
-"Los protocolos SSL y TLS son mecanismos de seguridad. Si selecciona Siempre, "
-"Evolution no se conectará a no ser que estén disponibles conexiones seguras. "
-"El valor predeterminado es Cuando sea posible, que utiliza conexiones "
-"seguras cuando están disponibles, pero también funciona sin problemas en "
-"caso contrario."
+"SSL y TLS son mecanismos de seguridad. Si selecciona Sin cifrado, Evolution "
+"enviará su contraseña sin cifrar. Usando SSL o TSL se usará una conexión "
+"segura y su contraseña se enviará cifrada."
 
-#: C/evolution.xml:6820(title)
+#: C/evolution.xml:6787(title)
 msgid "Details: Search Base:"
 msgstr "Detalles: Base de búsqueda:"
 
-#: C/evolution.xml:6821(para)
+#: C/evolution.xml:6788(para)
 msgid ""
 "The <link linkend=\"search-base\">search base</link> is the starting point "
 "for a directory search. Contact your network administrator for information "
@@ -14262,11 +14011,11 @@ msgstr ""
 "punto de partida utilizado para las búsquedas en directorios. Consulte a su "
 "administrador para obtener información acerca de los ajustes adecuados."
 
-#: C/evolution.xml:6824(title)
+#: C/evolution.xml:6791(title)
 msgid "Search Scope:"
 msgstr "Rango de búsqueda:"
 
-#: C/evolution.xml:6825(para)
+#: C/evolution.xml:6792(para)
 msgid ""
 "The <link linkend=\"search-scope\">search scope</link> is the breadth of a "
 "given search. The following options are available:"
@@ -14274,27 +14023,27 @@ msgstr ""
 "El <glossterm linkend=\"search-scope\">rango de búsqueda</glossterm> es la "
 "extensión de una búsqueda dada. Están disponibles las siguientes:"
 
-#: C/evolution.xml:6830(title)
+#: C/evolution.xml:6797(title)
 msgid "One:"
 msgstr "Uno:"
 
-#: C/evolution.xml:6831(para)
+#: C/evolution.xml:6798(para)
 msgid "Searches the Search Base and one entry below it."
 msgstr "Busca dentro de la raíz y un nivel de subdirectorios."
 
-#: C/evolution.xml:6836(title)
+#: C/evolution.xml:6803(title)
 msgid "Sub:"
 msgstr "Sub:"
 
-#: C/evolution.xml:6837(para)
+#: C/evolution.xml:6804(para)
 msgid "Searches the Search Base and all entries below it."
 msgstr "Busca dentro de la raíz y en todos los subdirectorios."
 
-#: C/evolution.xml:6842(title)
+#: C/evolution.xml:6809(title)
 msgid "Timeout (minutes):"
 msgstr "Tiempo de expiración (minutos):"
 
-#: C/evolution.xml:6843(para)
+#: C/evolution.xml:6810(para)
 msgid ""
 "The maximum time Evolution attempts to download data from the server before "
 "giving up."
@@ -14302,11 +14051,11 @@ msgstr ""
 "Es el tiempo de espera máximo para descargar los datos del servidor, antes "
 "de abandonar."
 
-#: C/evolution.xml:6848(title)
+#: C/evolution.xml:6815(title)
 msgid "Download Limit:"
 msgstr "Límite de descarga:"
 
-#: C/evolution.xml:6849(para)
+#: C/evolution.xml:6816(para)
 msgid ""
 "The maximum number of results for a given search. Most servers refuse to "
 "send more than 500, but you can set the number lower if you want to shorten "
@@ -14316,11 +14065,11 @@ msgstr ""
 "aceptan enviar más de 500 respuestas, pero puede fijar un número inferior "
 "para reducir el volumen de descargas, en caso de búsquedas muy amplias."
 
-#: C/evolution.xml:6854(title)
+#: C/evolution.xml:6821(title)
 msgid "Display Name:"
 msgstr "Nombre a mostrar:"
 
-#: C/evolution.xml:6855(para)
+#: C/evolution.xml:6822(para)
 msgid ""
 "The name you want to use as a label for this folder. It can be any name you "
 "choose."
@@ -14328,23 +14077,22 @@ msgstr ""
 "Este es el nombre que quiere usar como etiqueta para esta carpeta. Puede ser "
 "cualquier nombre que elija."
 
-#: C/evolution.xml:6860(title)
+#: C/evolution.xml:6827(title)
 msgid "Search Filter:"
 msgstr "Filtro de búsquedas:"
 
-#: C/evolution.xml:6861(para)
+#: C/evolution.xml:6828(para)
 msgid "The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 "Se puede establecer aquí el filtro de búsqueda para todas las consultas "
 "LDAP. Por ejemplo:"
 
-#: C/evolution.xml:6863(para)
+#: C/evolution.xml:6830(para)
 msgid ""
 "ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists "
-"only the user objects.Filter (|(ObjectClass=User)"
-"(ObjectClass=groupOfNames)): Retrieves the User and Contact List objects."
-"(&amp;(mail=*)(ObjectClass=*)): Lists the objects associated with the e-mail "
-"addresses."
+"only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): "
+"Retrieves the User and Contact List objects.(&amp;(mail=*)(ObjectClass=*)): "
+"Lists the objects associated with the email addresses."
 msgstr ""
 "ObjectClass=*: Lista todos los objetos del servidor. ObjectClass=User: Lista "
 "sólo los objetos del usuario. Filter (|(ObjectClass=User)"
@@ -14352,7 +14100,7 @@ msgstr ""
 "de contactos. (&amp;(mail=*)(ObjectClass=*)): Lista los objetos asociados "
 "con las direcciones de correo-e."
 
-#: C/evolution.xml:6865(para)
+#: C/evolution.xml:6832(para)
 msgid ""
 "If you change any LDAP address book configurations, Evolution and the "
 "Evolution Data Server need to be restarted in order to see the changes."
@@ -14360,7 +14108,7 @@ msgstr ""
 "Si cambia cualquier configuración de la libreta de direcciones LDAP deberá "
 "reiniciar Evolution y Evolution Data Server para que puedan ver los cambios."
 
-#: C/evolution.xml:6868(para)
+#: C/evolution.xml:6835(para)
 msgid ""
 "If you are creating the address book for a specific account, type the name "
 "of the address book if you want the address book stored locally when "
@@ -14371,7 +14119,7 @@ msgstr ""
 "direcciones se almacene localmente cuando esté desconectado, y si quiere que "
 "la libreta de direcciones sea su carpeta predeterminada."
 
-#: C/evolution.xml:6879(para)
+#: C/evolution.xml:6846(para)
 msgid ""
 "Evolution allows you to view the error logs and set the display duration for "
 "the error messages that appear in the statusbar. When an error occurs, "
@@ -14383,19 +14131,19 @@ msgstr ""
 "barra de estado muestra el mensaje de error durante el tiempo especificado y "
 "después el mensaje se mueve al archivo de depuración."
 
-#: C/evolution.xml:6882(para)
+#: C/evolution.xml:6849(para)
 msgid "From the Help menu, select Debug Logs."
 msgstr "Desde el menú Ayuda seleccione la Depuración de sucesos."
 
-#: C/evolution.xml:6886(para)
+#: C/evolution.xml:6853(para)
 msgid "Specify the display duration for the error messages."
 msgstr "Especifique la duración del mostrado de los mensajes de error."
 
-#: C/evolution.xml:6887(para)
+#: C/evolution.xml:6854(para)
 msgid "The messages remain in the statusbar for this specified time."
 msgstr "El mensaje permanece en la barra de estado durante el tiempo especificado."
 
-#: C/evolution.xml:6891(para)
+#: C/evolution.xml:6858(para)
 msgid ""
 "The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
 "> icon indicates that the error message is a warning. The <inlinegraphic "
@@ -14407,7 +14155,7 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> se "
 "muestra con un mensaje «para-su-información»."
 
-#: C/evolution.xml:6898(para)
+#: C/evolution.xml:6865(para)
 msgid ""
 "Synchronization presents you with three issues you need to address. First, "
 "you need to enable synchronization. Second, your computer needs to recognize "
@@ -14421,24 +14169,24 @@ msgstr ""
 "sólo soporta dispositivos Palm OS como PalmPilot* y Handspring Visor. "
 "Tercero, debe decidir que tipo de sincronización quiere."
 
-#: C/evolution.xml:6901(link) C/evolution.xml:6912(title)
+#: C/evolution.xml:6868(link) C/evolution.xml:6879(title)
 msgid "Enabling Synchronization"
 msgstr "Activar la sincronización"
 
-#: C/evolution.xml:6904(link) C/evolution.xml:6917(title)
+#: C/evolution.xml:6871(link) C/evolution.xml:6884(title)
 msgid "Selecting Conduits"
 msgstr "Seleccionar un conducto"
 
-#: C/evolution.xml:6907(link) C/evolution.xml:6940(title)
+#: C/evolution.xml:6874(link) C/evolution.xml:6907(title)
 msgid "Synchronizing Information"
 msgstr "Sincronizar la información"
 
-#: C/evolution.xml:6913(para)
+#: C/evolution.xml:6880(para)
 msgid ""
 "If you haven't used a handheld device with your computer before, you need to "
 "run the GNOME Control Center by clicking System &gt; Settings, and make sure "
 "that Pilot Link is properly configured. Make sure that you have read and "
-"write permissions on the device, which is normally n /dev/pilot. If that "
+"write permissions on the device, which is normally in /dev/pilot. If that "
 "does not work, check in /dev/ttyS0 if you have a serial connection, or in /"
 "dev/ttyUSB1 for a USB connection. You can do this by becoming root and "
 "adding your username to the group that owns this device node. For a USB "
@@ -14451,12 +14199,12 @@ msgstr ""
 "asegurarse de que dispone de permisos de lectura y escritura sobre el "
 "dispositivo, habitualmente n /dev/pilot. Si esto no funciona, compruebe /dev/"
 "ttyS0 si tiene una conexión serie o /dev/ttyUSB1 en el caso de una conexión "
-"USB. Para ello, inicie una sesión root y añada su nombre de usaurio al grupo "
+"USB. Para ello, inicie una sesión root y añada su nombre de usuario al grupo "
 "que es propietario de este nodo de dispositivo. Para un dispositivo USB se "
 "crean dos nodos de dispositivo, ttyUSB0 y ttyUSB1. El segundo nodo es el que "
-"debe ser usado al configurar el dispositivo."
+"se debe usar al configurar el dispositivo."
 
-#: C/evolution.xml:6918(para)
+#: C/evolution.xml:6885(para)
 msgid ""
 "After your computer and your Palm OS device are communicating, select the "
 "<link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits "
@@ -14473,7 +14221,7 @@ msgstr ""
 "libreta de direcciones, ECalendar, para el calendario y ETodo, para la lista "
 "de tareas."
 
-#: C/evolution.xml:6919(para)
+#: C/evolution.xml:6886(para)
 msgid ""
 "Click Enable, then click Settings to change what the conduit does when "
 "activated. Your options can vary depending on the conduit, but typically "
@@ -14483,19 +14231,19 @@ msgstr ""
 "vez activado. Las opciones pueden variar en función del conducto, pero "
 "habitualmente son las siguientes:"
 
-#: C/evolution.xml:6921(title)
+#: C/evolution.xml:6888(title)
 msgid "Disabled:"
 msgstr "Deshabilitado:"
 
-#: C/evolution.xml:6922(para)
+#: C/evolution.xml:6889(para)
 msgid "Do nothing."
 msgstr "No hacer nada."
 
-#: C/evolution.xml:6925(title)
+#: C/evolution.xml:6892(title)
 msgid "Synchronize:"
 msgstr "Sincronizar:"
 
-#: C/evolution.xml:6926(para)
+#: C/evolution.xml:6893(para)
 msgid ""
 "Copy new data from the computer to the handheld, and from the handheld to "
 "the computer. Remove items that were on both systems but have been deleted "
@@ -14505,23 +14253,23 @@ msgstr ""
 "direcciones. Elimina los elementos que se encontraban en los dos sistemas, "
 "pero que fueron eliminados en uno de ellos."
 
-#: C/evolution.xml:6929(title)
+#: C/evolution.xml:6896(title)
 msgid "Copy From Pilot:"
 msgstr "Copiar desde Pilot:"
 
-#: C/evolution.xml:6930(para)
+#: C/evolution.xml:6897(para)
 msgid "If there is any new data on the handheld device, copy it to the computer."
 msgstr "Si el dispositivo de mano contiene datos nuevos, los copia al equipo."
 
-#: C/evolution.xml:6933(title)
+#: C/evolution.xml:6900(title)
 msgid "Copy To Pilot:"
 msgstr "Copiar hacia Pilot:"
 
-#: C/evolution.xml:6934(para)
+#: C/evolution.xml:6901(para)
 msgid "Copy new data from the computer to the handheld."
 msgstr "Copia los datos nuevos del equipo hacia el dispositivo de mano."
 
-#: C/evolution.xml:6936(para)
+#: C/evolution.xml:6903(para)
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
 "not sure, use Synchronize."
@@ -14529,7 +14277,7 @@ msgstr ""
 "Seleccione el comportamiento de cada conducto elegido. Si no está seguro, "
 "use Sincronizar."
 
-#: C/evolution.xml:6941(para)
+#: C/evolution.xml:6908(para)
 msgid ""
 "Use the following procedure to synchronize the data on your Palm OS device "
 "with the data you store in Evolution."
@@ -14537,20 +14285,20 @@ msgstr ""
 "Use el siguiente procedimiento para sincronizar los datos en su dispositivo "
 "Palm Os con sus datos almacenados en Evolution."
 
-#: C/evolution.xml:6942(para)
+#: C/evolution.xml:6909(para)
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
-"the <command>evolution</command> directory inside your home directory."
+"the <command>.evolution</command> directory inside your home directory."
 msgstr ""
 "Si quiere realizar una copia de seguridad de su información antes de "
-"sincronizar, haga una copia del directorio <command>evolution</command> "
+"sincronizar, haga una copia del directorio <command>.evolution</command> "
 "dentro de su directorio de inicio."
 
-#: C/evolution.xml:6945(para)
+#: C/evolution.xml:6912(para)
 msgid "Put your handheld device in its cradle and press the HotSync button."
 msgstr "Coloque el dispositivo de mano en su base y pulse el botón HotSync."
 
-#: C/evolution.xml:6946(para)
+#: C/evolution.xml:6913(para)
 msgid ""
 "If you use Palm OS v. 4.0 and have password protection turned on for your "
 "handheld device, you might encounter trouble synchronizing. If this happens, "
@@ -14564,7 +14312,7 @@ msgstr ""
 "dispositivo de mano, realice la sincronización con su equipo de sobremesa y "
 "vuelva a habilitar la protección de su dispositivo."
 
-#: C/evolution.xml:6949(para)
+#: C/evolution.xml:6916(para)
 msgid ""
 "If you have followed the setup instructions properly, your Palm OS device "
 "will synchronize data with Evolution."
@@ -14572,7 +14320,7 @@ msgstr ""
 "Si siguió las instrucciones de configuración adecuadamente, los datos de su "
 "dispositivo Palm OS se podrán sincronizar con Evolution."
 
-#: C/evolution.xml:6955(para)
+#: C/evolution.xml:6922(para)
 msgid ""
 "If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
 "helps you switch to <trademark>Evolution</trademark>."
@@ -14580,11 +14328,11 @@ msgstr ""
 "Si está usando Microsoft Outlook pero no Microsoft Exchange, esta sección le "
 "ayuda a cambiarse a <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:6958(title)
+#: C/evolution.xml:6925(title)
 msgid "Migrating Local Outlook Mail Folders"
 msgstr "Migrar las carpetas de correo locales de Outlook"
 
-#: C/evolution.xml:6959(para)
+#: C/evolution.xml:6926(para)
 msgid ""
 "Exchange and IMAP mail is stored on the server, so you do not need to "
 "migrate it to your Linux* partition. However, if you have stored mail on "
@@ -14594,11 +14342,11 @@ msgstr ""
 "tiene que migrarlo a su partición Linux*. No obstante si ha almacenado "
 "correo en su equipo, quizá quiera hacerlo accesible a Evolution."
 
-#: C/evolution.xml:6960(para)
+#: C/evolution.xml:6927(para)
 msgid "First, while using Windows, prepare your messages for import:"
 msgstr "Primero, mientras usa Windows, prepare sus mensajes para importarlos:"
 
-#: C/evolution.xml:6963(para)
+#: C/evolution.xml:6930(para)
 msgid ""
 "Clean up your mail. Delete messages and folders you do not need, and click "
 "File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, "
@@ -14608,7 +14356,7 @@ msgstr ""
 "Archivo &gt; Carpetas &gt; Propiedades &gt; Avanzadas &gt; Compactar para "
 "borrar los mensajes antiguos y borrados de su archivo PST."
 
-#: C/evolution.xml:6966(para)
+#: C/evolution.xml:6933(para)
 msgid ""
 "If you nest your folders one inside another, you might want to rename "
 "subfolders so that you can tell which folder they belong to. You must re-"
@@ -14618,7 +14366,7 @@ msgstr ""
 "subcarpetas para poder saber a qué carpeta pertenecen. Debe volverlas a "
 "anidar después de cargarlas en Evolution."
 
-#: C/evolution.xml:6969(para)
+#: C/evolution.xml:6936(para)
 msgid ""
 "Import the files into Mozilla Mail (or another mailer, such as Netscape or "
 "Eudora, that uses the standard mbox format)."
@@ -14626,7 +14374,7 @@ msgstr ""
 "Importe los archivos en Mozilla Mail (o en otro cliente de correo que "
 "utilice el formato mbox estándar, como Netscape o Eudora)."
 
-#: C/evolution.xml:6970(para)
+#: C/evolution.xml:6937(para)
 msgid ""
 "Linux mailers cannot do this task, because it requires a library available "
 "only under Windows. In Mozilla, import by selecting Window Mail &amp; "
@@ -14636,7 +14384,7 @@ msgstr ""
 "sólo bajo Windows. En Mozilla, importe seleccionando Window Mail &amp; "
 "Newsgroups Tools Import."
 
-#: C/evolution.xml:6973(para)
+#: C/evolution.xml:6940(para)
 msgid ""
 "Mozilla creates a set of files in the directory<command> Windows"
 "\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail"
@@ -14648,19 +14396,19 @@ msgstr ""
 "\\Local Folders\\OutlookMail\\</command>. Los archivos de datos son los que "
 "no tienen extensión de archivo."
 
-#: C/evolution.xml:6974(para)
+#: C/evolution.xml:6941(para)
 msgid ""
-"If you are using Windows XP or Windows 2000, your Windows hard drive is "
-"probably in the NTFS format, which some Linux systems cannot read without "
-"additional software. You might find it simpler to copy the mail folders to a "
-"different drive or to burn a CD."
+"If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows "
+"hard drive is probably in the NTFS format, which some Linux systems cannot "
+"read without additional software. You might find it simpler to copy the mail "
+"folders to a different drive or to burn a CD."
 msgstr ""
-"Si está usando Windows XP o Windows 2000, el disco duro de su Windows "
-"probablemente esté en formato NTFS, que algunos sistemas Linux no pueden "
-"leer sin software adicional. Quizá encuentre más fácil copiar las carpetas "
-"de correo a una unidad diferente o grabar un CD."
+"Si está usando Windows Vista*, Windows XP* o Windows 2000*, el disco duro de "
+"su Windows probablemente esté en formato NTFS, que algunos sistemas Linux no "
+"pueden leer sin software adicional. Quizá encuentre más fácil copiar las "
+"carpetas de correo a una unidad diferente o grabar un CD."
 
-#: C/evolution.xml:6975(para)
+#: C/evolution.xml:6942(para)
 msgid ""
 "When you have your mail in a format Evolution can understand, reboot to "
 "Linux. Then continue with the following procedure. To create new folders for "
@@ -14670,61 +14418,59 @@ msgstr ""
 "bajo Linux. Continúe entonces con el siguiente procedimiento. Para crear "
 "nuevas carpetas para sus archivos:"
 
-#: C/evolution.xml:6978(para)
+#: C/evolution.xml:6945(para)
 msgid "Mount your Windows drive or the disk where you saved the mail files."
 msgstr ""
 "Monte su unidad Windows o el disco donde tenga guardados los archivos de "
 "correo."
 
-#: C/evolution.xml:6981(para)
+#: C/evolution.xml:6948(para)
 msgid "Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 "Copie todos los archivos de correo en su carpeta personal o cualquier otro "
 "lugar conveniente."
 
-#: C/evolution.xml:6984(para)
+#: C/evolution.xml:6951(para)
 msgid "Start Evolution."
 msgstr "Inicie Evolution."
 
-#: C/evolution.xml:6987(para)
-msgid "Select File &gt; New Folder to create the folders you want."
-msgstr "Seleccione Archivo &gt; Nueva carpeta para crear las carpetas que necesite."
+#: C/evolution.xml:6954(para)
+msgid "Select File &gt; New &gt; Mail Folder to create the folders you want."
+msgstr "Seleccione Archivo &gt; Nueva carpeta para crear las carpetas que desee."
 
-#: C/evolution.xml:6990(para)
+#: C/evolution.xml:6957(para)
 msgid "To import the data files:"
 msgstr "Importar los archivos de datos:"
 
-#: C/evolution.xml:6993(para)
+#: C/evolution.xml:6960(para)
 msgid "In Evolution, open the File Import assistant by clicking File &gt; Import."
 msgstr ""
 "En Evolution, abra el asistente de Importación de archivos pulsando Archivo "
 "&gt; Importar."
 
-#: C/evolution.xml:6996(para)
-msgid "Click Next, then select Import A Single File."
+#: C/evolution.xml:6963(para)
+msgid "Click Next, then select Import a single file."
 msgstr "Pulse Siguiente, después seleccione Importar un solo archivo."
 
-#: C/evolution.xml:6999(para)
-msgid "Leave the file type as Automatic, then click Browse to select the data file."
-msgstr ""
-"Deje el tipo de archivo como Automático, después pulse Examinar para "
-"seleccionar el archivo de datos."
+#: C/evolution.xml:6966(para)
+msgid "Click on the filechooser to select the data file."
+msgstr "Pulse en el selector de archivos para seleccionar el archivo de datos."
 
-#: C/evolution.xml:7000(para)
+#: C/evolution.xml:6967(para)
 msgid "Remember, the data files are the files that have no file extension."
 msgstr ""
 "Recuerde, los archivos de datos son los archivos que no tienen extensión de "
 "archivo."
 
-#: C/evolution.xml:7003(para)
+#: C/evolution.xml:6970(para)
 msgid "Select the folder where you want to put the imported data file."
 msgstr "Seleccione la carpeta donde quiere poner sus archivos de datos importados."
 
-#: C/evolution.xml:7009(para)
+#: C/evolution.xml:6976(para)
 msgid "Repeat the import steps until you have imported all your mail."
 msgstr "Repita los pasos de importación hasta que haya importado todo su correo."
 
-#: C/evolution.xml:7017(para)
+#: C/evolution.xml:6984(para)
 msgid ""
 "You can print this section to use it as a quick reference for most of the "
 "things you want to do with <trademark>Evolution</trademark>. You can also "
@@ -14735,23 +14481,23 @@ msgstr ""
 "trademark>. También puede encontrar esta información seleccionando Ayuda "
 "&gt; Referencia rápida en la barra de menú."
 
-#: C/evolution.xml:7020(link) C/evolution.xml:7034(title)
+#: C/evolution.xml:6987(link) C/evolution.xml:7001(title)
 msgid "Opening or Creating Items"
 msgstr "Apertura o cierre de elementos"
 
-#: C/evolution.xml:7023(link) C/evolution.xml:7059(title)
+#: C/evolution.xml:6990(link) C/evolution.xml:7026(title)
 msgid "Mail Tasks"
 msgstr "Tareas de correo"
 
-#: C/evolution.xml:7029(link) C/evolution.xml:7109(title)
+#: C/evolution.xml:6996(link) C/evolution.xml:7076(title)
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: C/evolution.xml:7037(title)
+#: C/evolution.xml:7004(title)
 msgid "New Item:"
 msgstr "Nuevo elemento:"
 
-#: C/evolution.xml:7038(para)
+#: C/evolution.xml:7005(para)
 msgid ""
 "Press Ctrl+N to open a new item for whatever part of Evolution you're "
 "working in. In mail, this means you create a new message. If you're looking "
@@ -14764,50 +14510,50 @@ msgstr ""
 "direcciones, Ctrl+N creará una nueva tarjeta para un contacto; y en el "
 "calendario se abrirá una nueva cita."
 
-#: C/evolution.xml:7041(title)
-msgid "Creating a New E-mail Message:"
+#: C/evolution.xml:7008(title)
+msgid "Creating a New Email Message:"
 msgstr "Crear un nuevo mensaje de correo-e:"
 
-#: C/evolution.xml:7042(para)
-msgid "Use File &gt; New &gt; Mail Message or Shift+Ctrl+M."
+#: C/evolution.xml:7009(para)
+msgid "Click File &gt; New &gt; Mail Message or Shift+Ctrl+M."
 msgstr "Use Archivo &gt; Nuevo &gt; Mensaje de correo o Mayús.+Ctrl+M."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:7045(title) C/evolution.xml:7098(title)
+#: C/evolution.xml:7012(title) C/evolution.xml:7065(title)
 msgid "Creating a New Appointment:"
 msgstr "Crear una cita nueva:"
 
-#: C/evolution.xml:7046(para) C/evolution.xml:7099(para)
-msgid "Use File &gt; New Appointment or Shift+Ctrl+A."
+#: C/evolution.xml:7013(para) C/evolution.xml:7066(para)
+msgid "Click File &gt; New &gt; Appointment or Shift+Ctrl+A."
 msgstr "Use Archivo &gt; Nuevo &gt; Cita o Mayús+Ctrl+A."
 
-#: C/evolution.xml:7049(title)
+#: C/evolution.xml:7016(title)
 msgid "Entering a New Contact:"
 msgstr "Introducir un contacto nuevo:"
 
-#: C/evolution.xml:7050(para)
+#: C/evolution.xml:7017(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
-"address card. You can also use File &gt; New Contact or Shift+Ctrl+C."
+"address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C."
 msgstr ""
-"Pulse dos veces sobre cualquier espacio vacío en el administrador de "
-"contactos para crear una tarjeta de direcciones nueva. También puede usar "
-"Archivo &gt; Nuevo &gt; Contacto o Mayús.+Ctrl+C."
+"Pulse dos veces sobre cualquier espacio vacío en el gestor de contactos para "
+"crear una tarjeta de direcciones nueva. También puede usar Archivo &gt; "
+"Nuevo &gt; Contacto o Mayús.+Ctrl+C."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:7053(title) C/evolution.xml:7103(title)
+#: C/evolution.xml:7020(title) C/evolution.xml:7070(title)
 msgid "Creating a New Task:"
 msgstr "Crear una tarea nueva:"
 
-#: C/evolution.xml:7054(para)
-msgid "File &gt; New Task or Shift+Ctrl+T."
-msgstr "Archivo &gt; Nuevo &gt; Tarea o Mayús.+Ctrl+T."
+#: C/evolution.xml:7021(para) C/evolution.xml:7071(para)
+msgid "Click File &gt; New &gt; Task or Shift+Ctrl+T."
+msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea o Mayús.+Ctrl+T."
 
-#: C/evolution.xml:7061(title)
+#: C/evolution.xml:7028(title)
 msgid "Send and Receive Mail:"
 msgstr "Enviar y recibir correo:"
 
-#: C/evolution.xml:7062(para)
+#: C/evolution.xml:7029(para)
 msgid ""
 "Press F9, click the Send/Receive button in the toolbar, or click File &gt; "
 "Send/Receive."
@@ -14815,11 +14561,11 @@ msgstr ""
 "Pulse F9, pulse el botón Enviar/Recibir en la barra de herramientas, o pulse "
 "Archivo &gt; Enviar/Recibir."
 
-#: C/evolution.xml:7065(title)
+#: C/evolution.xml:7032(title)
 msgid "Navigating the Message List with the Keyboard:"
 msgstr "Navegar por la lista de mensajes mediante el teclado:"
 
-#: C/evolution.xml:7066(para)
+#: C/evolution.xml:7033(para)
 msgid ""
 "Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the "
 "previous unread message. Use the arrow keys to move up and down in the list "
@@ -14829,21 +14575,21 @@ msgstr ""
 "al anterior mensaje no leído. Use las teclas del cursor para moverse arriba "
 "y abajo por toda la lista de mensajes."
 
-#: C/evolution.xml:7069(title)
+#: C/evolution.xml:7036(title)
 msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr "Moverse adelante y atrás en el panel de visualización de mensajes:"
 
-#: C/evolution.xml:7070(para)
+#: C/evolution.xml:7037(para)
 msgid "Press the Spacebar to move down a page. Press Backspace to move up a page."
 msgstr ""
 "Pulse la barra espaciadora para avanzar una página. Pulse la tecla Retroceso "
 "para volver hacia atrás una página."
 
-#: C/evolution.xml:7073(title)
+#: C/evolution.xml:7040(title)
 msgid "Replying To a Message:"
 msgstr "Responder un mensaje:"
 
-#: C/evolution.xml:7074(para)
+#: C/evolution.xml:7041(para)
 msgid ""
 "To reply only to the sender of the message, click Reply in the toolbar, or "
 "press Ctrl+R."
@@ -14851,7 +14597,7 @@ msgstr ""
 "Para responder sólo al remitente del mensaje, pulse Responder en la barra de "
 "herramientas o pulse Ctrl+R."
 
-#: C/evolution.xml:7076(para)
+#: C/evolution.xml:7043(para)
 msgid ""
 "To reply to the sender and all the other visible recipients of the message, "
 "click Reply to All or select the message and press Shift+Ctrl+R."
@@ -14859,11 +14605,11 @@ msgstr ""
 "Para responder al remitente y a todos los destinatarios visibles pulse en "
 "Responder a todos o seleccione el mensaje y pulse Mayús.+Ctrl+R."
 
-#: C/evolution.xml:7078(title)
+#: C/evolution.xml:7045(title)
 msgid "Forwarding a Message:"
 msgstr "Reenviar un mensaje:"
 
-#: C/evolution.xml:7079(para)
+#: C/evolution.xml:7046(para)
 msgid ""
 "Select the message or messages you want to forward, then click Forward in "
 "the toolbar, or press Ctrl+F."
@@ -14871,11 +14617,11 @@ msgstr ""
 "Seleccione el o los mensajes que quiera reenviar y pulse en Reenviar en la "
 "barra de herramientas o pulse Ctrl+F."
 
-#: C/evolution.xml:7082(title)
+#: C/evolution.xml:7049(title)
 msgid "Opening a Message In a New Window:"
 msgstr "Abrir un mensaje en una nueva ventana:"
 
-#: C/evolution.xml:7083(para)
+#: C/evolution.xml:7050(para)
 msgid ""
 "Double-click the message you want to view, or select it and press Enter or "
 "Ctrl+O."
@@ -14883,11 +14629,11 @@ msgstr ""
 "Pulse dos veces sobre el mensaje que quiera ver o selecciónelo y pulse Intro "
 "o Ctrl+O."
 
-#: C/evolution.xml:7086(title)
+#: C/evolution.xml:7053(title)
 msgid "Creating Filters and Search Folders:"
 msgstr "Crear filtros y carpetas de búsqueda:"
 
-#: C/evolution.xml:7087(para)
+#: C/evolution.xml:7054(para)
 msgid ""
 "Right-click a message and select Create Rule From Message. You can also "
 "create filters and Search folders in the Edit menu."
@@ -14896,20 +14642,17 @@ msgstr ""
 "mensaje. También puede crear filtros y carpetas de búsqueda desde el menú "
 "Editar."
 
-#: C/evolution.xml:7090(title)
+#: C/evolution.xml:7057(title)
 msgid "Adding a Sender to the Address Book:"
 msgstr "Añadir un remitente a la libreta de direcciones:"
 
-#: C/evolution.xml:7091(para)
-msgid ""
-"Right-click a message and select Add Sender to Address Book. You can also "
-"right-click on any e-mail address to add it to your address book."
+#: C/evolution.xml:7058(para)
+msgid "Right-click on any email address to add it to your address book."
 msgstr ""
-"Pulse con el botón derecho sobre un mensaje y seleccione Añadir remitente a "
-"la libreta de direcciones. También puede pulsar el botón derecho sobre "
-"cualquier dirección de correo y añadirla a su libreta de direcciones."
+"Pulse con el botón derecho sobre cualquier dirección de correo-e para "
+"añadirla a su libreta de direcciones."
 
-#: C/evolution.xml:7101(para)
+#: C/evolution.xml:7068(para)
 msgid ""
 "You can also click in any blank spot in the calendar and start typing to "
 "create a new appointment entry."
@@ -14917,25 +14660,21 @@ msgstr ""
 "También puede pulsar en cualquier lugar vacío del calendario y empezar a "
 "escribir para crear una nueva cita."
 
-#: C/evolution.xml:7104(para)
-msgid "Use File &gt; New Task or Shift+Ctrl+T."
-msgstr "Use Archivo &gt; Nueva tarea o Mayús.+Ctrl+T."
-
-#: C/evolution.xml:7111(title)
+#: C/evolution.xml:7078(title)
 msgid "Editing a Contact:"
 msgstr "Editar un contacto:"
 
-#: C/evolution.xml:7112(para)
+#: C/evolution.xml:7079(para)
 msgid "Double-click the contact's address card to change details."
 msgstr ""
 "Pulse dos veces en la dirección de la tarjeta del contacto para modificar "
 "los detalles."
 
-#: C/evolution.xml:7115(title)
+#: C/evolution.xml:7082(title)
 msgid "Deleting a Contact:"
 msgstr "Borrar un contacto:"
 
-#: C/evolution.xml:7116(para)
+#: C/evolution.xml:7083(para)
 msgid ""
 "Right-click a contact, then click Delete; or select a contact, then click "
 "Delete on the toolbar."
@@ -14944,21 +14683,21 @@ msgstr ""
 "seleccione el contacto y después pulse el botón Borrar en la barra de "
 "herramientas."
 
-#: C/evolution.xml:7119(title)
-msgid "Sending E-mails to a Contact:"
+#: C/evolution.xml:7086(title)
+msgid "Sending Emails to a Contact:"
 msgstr "Enviar correos-e a un contacto:"
 
-#: C/evolution.xml:7120(para)
+#: C/evolution.xml:7087(para)
 msgid "Right-click a contact, then click Send Message to Contact."
 msgstr ""
 "Pulse con el botón derecho sobre un contacto, después pulse Enviar un "
 "mensaje al contacto."
 
-#: C/evolution.xml:7123(title)
+#: C/evolution.xml:7090(title)
 msgid "Creating a New Contact:"
 msgstr "Crear un contacto nuevo:"
 
-#: C/evolution.xml:7124(para)
+#: C/evolution.xml:7091(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card, or right-click anywhere in the address book and select New "
@@ -14969,7 +14708,7 @@ msgstr ""
 "cualquier parte de la libreta de direcciones y seleccione Contacto nuevo. "
 "También puede pulsar Archivo &gt; Nuevo &gt; Contacto o pulsar Mayús+Ctrl+C."
 
-#: C/evolution.xml:7131(para)
+#: C/evolution.xml:7098(para)
 msgid ""
 "<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
 "\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
@@ -14983,7 +14722,7 @@ msgstr ""
 "información de errores de GNOME (conocida como bug-buddy en la línea de "
 "comandos)."
 
-#: C/evolution.xml:7132(para)
+#: C/evolution.xml:7099(para)
 msgid ""
 "A complete list of feature requests and other issues with Evolution is "
 "available online in the GNOME bug tracking system. You can learn more about "
@@ -14996,17 +14735,18 @@ msgstr ""
 "\"http://gnome.org/projects/evolution/developer.shtml\">web para "
 "desarrolladores de Evolution</ulink>."
 
-#: C/evolution.xml:7137(para)
+#: C/evolution.xml:7104(para)
 msgid ""
 "Evolution was written by the <trademark>Evolution</trademark> team and "
 "numerous other dedicated GNOME programmers. You can see their names by "
-"clicking Help &gt; About from any Evolution window."
+"clicking Help &gt; About from the main Evolution window."
 msgstr ""
-"El equipo de <trademark>Evolution</trademark> junto conuna numerosa cantidad "
-"de programadores de GNOME escribieron Evolution. Para ver sus nombres, "
-"seleccione Ayuda &gt; Acerca de en cualquiera de las ventanas de Evolution."
+"El equipo de <trademark>Evolution</trademark> junto con una numerosa "
+"cantidad de programadores de GNOME escribieron Evolution. Para ver sus "
+"nombres, seleccione Ayuda &gt; Acerca de en cualquiera de las ventanas de "
+"Evolution."
 
-#: C/evolution.xml:7138(para)
+#: C/evolution.xml:7105(para)
 msgid ""
 "The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar "
 "applications, and to KHTMLW. The developers of Evolution acknowledge the "
@@ -15017,70 +14757,69 @@ msgstr ""
 "reconocen los esfuerzos y contribuciones de todos los que trabajaron en "
 "estos proyectos."
 
-#: C/evolution.xml:7139(para)
+#: C/evolution.xml:7106(para)
 msgid ""
 "For more information please visit the Evolution <ulink url=\"http://www."
-"novell.com/products/desktop/features/evolution.html\">Web page</ulink>. "
-"Please send all comments, suggestions, and bug reports to the <ulink url="
-"\"http://bugzilla.gnome.com\">bug tracking database</ulink>. Instructions "
-"for submitting bug reports can be found on-line at the same location. You "
-"can also use the GNOME bug report tool, bug-buddy, to submit your defect "
-"reports."
-msgstr ""
-"Para obtener más información visite la <ulink url=\"http://www.ximian.com/"
-"products/ximian_evolution/\" type=\"http\">página web</ulink> de Evolution. "
-"Por favor envíenos todos sus comentarios, sugerencias e informes de error a "
-"la <ulink url=\"http://bugzilla.gnome.com\">base de datos de seguimiento de "
+"gnome.org/projects/evolution\">Web page</ulink>. Please send all comments, "
+"suggestions, and bug reports to the <ulink url=\"http://bugzilla.gnome.org"
+"\">bug tracking database</ulink>. Instructions for submitting bug reports "
+"can be found on-line at the same location. You can also use the GNOME bug "
+"report tool, bug-buddy, to submit your defect reports."
+msgstr ""
+"Para obtener más información visite la <ulink url=\"http://www.gnome.org/"
+"projects/evolution\" type=\"http\">página web</ulink> de Evolution. Por "
+"favor envíenos todos sus comentarios, sugerencias e informes de error a la "
+"<ulink url=\"http://bugzilla.gnome.com\">base de datos de seguimiento de "
 "errores</ulink>. Encontrará instrucciones sobre cómo enviar informes de "
 "error en esa misma dirección. También puede utilizar la herramienta de "
 "información de errores de GNOME bug-buddy para enviar notificaciones de "
 "fallos."
 
-#: C/evolution.xml:7140(para)
+#: C/evolution.xml:7107(para)
 msgid "This manual was written by:"
 msgstr "Este manual lo escribieron:"
 
-#: C/evolution.xml:7143(para)
+#: C/evolution.xml:7110(para)
 msgid "Radhika PC (pradhika@novell.com)"
 msgstr "Radhika PC (pradhika@novell.com)"
 
-#: C/evolution.xml:7146(para)
+#: C/evolution.xml:7113(para)
 msgid "Srinivasa Ragavan (sragavan@novell.com)"
 msgstr "Srinivasa Ragavan (sragavan@novell.com)"
 
-#: C/evolution.xml:7149(para)
+#: C/evolution.xml:7116(para)
 msgid "Andre Klapper (ak-47@gmx.net)"
 msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: C/evolution.xml:7152(para)
+#: C/evolution.xml:7119(para)
 msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 
-#: C/evolution.xml:7155(para)
+#: C/evolution.xml:7122(para)
 msgid "Mark Moulder (mmoulder@novell.com)"
 msgstr "Mark Moulder (mmoulder@novell.com)"
 
-#: C/evolution.xml:7158(para)
+#: C/evolution.xml:7125(para)
 msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
 
-#: C/evolution.xml:7161(para)
+#: C/evolution.xml:7128(para)
 msgid "Aaron Weber (aaron@ximian.com)"
 msgstr "Aaron Weber (aaron@ximian.com)"
 
-#: C/evolution.xml:7164(para)
+#: C/evolution.xml:7131(para)
 msgid "Kevin Breit (mrproper@ximian.com)"
 msgstr "Kevin Breit (mrproper@ximian.com)"
 
-#: C/evolution.xml:7167(para)
+#: C/evolution.xml:7134(para)
 msgid "Duncan Mak (duncan@ximian.com)"
 msgstr "Duncan Mak (duncan@ximian.com)"
 
-#: C/evolution.xml:7170(para)
+#: C/evolution.xml:7137(para)
 msgid "Ettore Perazzoli (ettore@ximian.com)"
 msgstr "Ettore Perazzoli (ettore@ximian.com)"
 
-#: C/evolution.xml:7173(para)
+#: C/evolution.xml:7140(para)
 msgid ""
 "With the help of the application programmers and the GNOME Documentation "
 "Project."
@@ -15088,20 +14827,20 @@ msgstr ""
 "Con la ayuda de los programadores de aplicaciones y del Proyecto de "
 "documentación de GNOME."
 
-#: C/evolution.xml:7176(para)
+#: C/evolution.xml:7143(para)
 msgid ""
 "Please file comments and suggestions for this manual as bugs in the GNOME "
 "bug tracking system. If you contributed to this project but do not see your "
-"name here, please contact Radhika PC (pradhika@novell.com) or Sreenivasa "
+"name here, please contact Radhika PC (pradhika@novell.com) or Srinivasa "
 "Ragavan (sragavan@novell.com) and either of them will list you."
 msgstr ""
 "Puede enviar comentarios y sugerencias acerca de este manual como errores en "
 "el sistema de seguimiento de errores de GNOME. Si ha contribuido a este "
 "proyecto pero no ve su nombre aquí, diríjase a Radhika PC (pradhika@novell."
-"com) o Sreenivasa Ragavan (sragavan@novell.com) y cualquiera de ellos le "
+"com) o Srinivasa Ragavan (sragavan@novell.com) y cualquiera de ellos le "
 "añadirá."
 
-#: C/evolution.xml:7177(para)
+#: C/evolution.xml:7144(para)
 msgid ""
 "Partial list of Documentation Translators (application translated to "
 "numerous additional languages):"
@@ -15109,25 +14848,25 @@ msgstr ""
 "Lista parcial de todos los traductores de la documentación (la aplicación "
 "está traducida a numerosos idiomas adicionales):"
 
-#: C/evolution.xml:7180(para)
+#: C/evolution.xml:7147(para)
 msgid "Daniel Persson for Swedish (.se)"
 msgstr "Daniel Persson al sueco"
 
-#: C/evolution.xml:7183(para)
+#: C/evolution.xml:7150(para)
 msgid "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
 msgstr ""
 "Hector García Álvarez, Franciso Javier F. Serrador y Jorge González para el "
 "español (.es)"
 
-#: C/evolution.xml:7186(para)
+#: C/evolution.xml:7153(para)
 msgid "Kjartan Maraas for Norwegian (.no)"
 msgstr "Kjartan Maraas al noruego"
 
-#: C/evolution.xml:7189(para)
+#: C/evolution.xml:7156(para)
 msgid "Sergey V. Mironov for Russian (.ru)"
 msgstr "Sergey V. Mironov al ruso (.ru)"
 
-#: C/evolution.xml:7196(para)
+#: C/evolution.xml:7163(para)
 msgid ""
 "This glossary contains terms that are frequently used in this guide as well "
 "as in <trademark>Evolution</trademark>."
@@ -15135,11 +14874,11 @@ msgstr ""
 "Este glosario contiene términos que se usan frecuentemente en esta guía así "
 "como en <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:7198(glossterm)
+#: C/evolution.xml:7165(glossterm)
 msgid "Assistant"
 msgstr "Asistente"
 
-#: C/evolution.xml:7200(para)
+#: C/evolution.xml:7167(para)
 msgid ""
 "A tool that guides a user through a series of steps, usually to configure or "
 "set up a program. Equivalent to Wizard and Druid."
@@ -15148,36 +14887,33 @@ msgstr ""
 "generalmente para configurar o ajustar un programa. Es equivalente a un "
 "Druida."
 
-#: C/evolution.xml:7204(glossterm)
+#: C/evolution.xml:7171(glossterm)
 msgid "attachment"
 msgstr "adjunto"
 
-#: C/evolution.xml:7206(para)
+#: C/evolution.xml:7173(para)
 msgid ""
-"Any file sent with an e-mail. Attachments can be embedded in a message or "
+"Any file sent with an email. Attachments can be embedded in a message or "
 "appended to it."
 msgstr ""
 "Cualquier archivo enviado con un correo-e. Los adjuntos se pueden empotrar "
 "en un mensaje o adjuntarse a él."
 
-#: C/evolution.xml:7210(glossterm)
+#: C/evolution.xml:7177(glossterm)
 msgid "automatic indexing"
 msgstr "indexado automático"
 
-#: C/evolution.xml:7212(para)
-msgid ""
-"A pre-downloading procedure that allows Evolution to quickly refer to data. "
-"It enables faster searches and decreases memory usage for data displays."
+#: C/evolution.xml:7179(para)
+msgid "A feature which allows Evolution to quickly find and sort data."
 msgstr ""
-"Un procedimiento de predescarga que permite que Evolution acceda rápidamente "
-"a los datos. Permite búsquedas más rápidas y reduce el uso de memoria para "
-"mostrar los datos."
+"Una característica que permite a Evolution buscar y ordenar datos "
+"rápidamente."
 
-#: C/evolution.xml:7216(glossterm)
+#: C/evolution.xml:7183(glossterm)
 msgid "Bcc (Blind Carbon Copy)"
 msgstr "Cco (Copia de carbón oculta)"
 
-#: C/evolution.xml:7218(para)
+#: C/evolution.xml:7185(para)
 msgid ""
 "Blind copy recipients (Bcc) receive a copy of an item. Other recipients "
 "receive no information about blind copies. Only the sender and the blind "
@@ -15191,11 +14927,11 @@ msgstr ""
 "Responder a todos, el destinatario en la copia de carbón oculta no recibirá "
 "la respuesta."
 
-#: C/evolution.xml:7222(glossterm)
+#: C/evolution.xml:7189(glossterm)
 msgid "Cc (Carbon Copy)"
 msgstr "Cc (Copia de carbón)"
 
-#: C/evolution.xml:7224(para)
+#: C/evolution.xml:7191(para)
 msgid ""
 "Carbon copy recipients (CC) receive a copy of an item. CC recipients are "
 "users who would benefit from the information in an item, but are not "
@@ -15208,11 +14944,11 @@ msgstr ""
 "Todos los destinatarios pueden ver que se envió la copia de carbón. También "
 "pueden ver todos los nombres de los destinatarios de la Cc."
 
-#: C/evolution.xml:7228(glossterm)
+#: C/evolution.xml:7195(glossterm)
 msgid "conduit"
 msgstr "conducto"
 
-#: C/evolution.xml:7230(para)
+#: C/evolution.xml:7197(para)
 msgid ""
 "A small application that controls the transfer of data between a handheld "
 "device and a desktop computer."
@@ -15220,15 +14956,15 @@ msgstr ""
 "Pequeña aplicación que controla la transferencia de datos entre un "
 "dispositivo portátil y el escritorio del equipo."
 
-#: C/evolution.xml:7236(para)
+#: C/evolution.xml:7203(para)
 msgid "The GNOME groupware application."
 msgstr "La aplicación groupware de GNOME."
 
-#: C/evolution.xml:7240(glossterm)
+#: C/evolution.xml:7207(glossterm)
 msgid "execute"
 msgstr "ejecutar"
 
-#: C/evolution.xml:7242(para)
+#: C/evolution.xml:7209(para)
 msgid ""
 "To run a program. Any file that can be run is called an executable. "
 "Evolution can download executable attachments, but before they can be run, "
@@ -15246,11 +14982,11 @@ msgstr ""
 "archivos consulte la documentación de su administrador de archivos o de su "
 "intérprete de órdenes."
 
-#: C/evolution.xml:7246(glossterm)
+#: C/evolution.xml:7213(glossterm)
 msgid "expunge"
 msgstr "purgar"
 
-#: C/evolution.xml:7248(para)
+#: C/evolution.xml:7215(para)
 msgid ""
 "When messages are marked for deletion, they remain until they are expunged. "
 "When a message is expunged, it is permanently deleted, as long as it was "
@@ -15260,11 +14996,11 @@ msgstr ""
 "purgan. Cuando se purga un mensaje se borra permanentemente, siempre y "
 "cuando estuviese marcado para su borrado."
 
-#: C/evolution.xml:7252(glossterm)
+#: C/evolution.xml:7219(glossterm)
 msgid "file tree"
 msgstr "árbol de archivos"
 
-#: C/evolution.xml:7254(para)
+#: C/evolution.xml:7221(para)
 msgid ""
 "A way of describing a group of files on a computer. The top of the tree is "
 "called the root directory, and is denoted by <command>/</command>. The rest "
@@ -15279,11 +15015,11 @@ msgstr ""
 "(«root») ni con el directorio de inicio del superusuario <command>/root</"
 "command>."
 
-#: C/evolution.xml:7258(glossterm)
+#: C/evolution.xml:7225(glossterm)
 msgid "filter"
 msgstr "filtro"
 
-#: C/evolution.xml:7260(para)
+#: C/evolution.xml:7227(para)
 msgid ""
 "Within Evolution, a filter is a method of sorting mail automatically when it "
 "is downloaded. You can create filters to perform one or more actions on a "
@@ -15294,42 +15030,42 @@ msgstr ""
 "acciones sobre un mensaje que cumpla una (o todas) las condiciones, "
 "definidas entre una amplia gama de posibilidades."
 
-#: C/evolution.xml:7264(glossterm)
+#: C/evolution.xml:7231(glossterm)
 msgid "forward"
 msgstr "reenviar"
 
-#: C/evolution.xml:7266(para)
+#: C/evolution.xml:7233(para)
 msgid ""
-"Forwards a copy of the message and any additional comments to a different e-"
-"mail address."
+"Forwards a copy of the message and any additional comments to a different "
+"email address."
 msgstr ""
 "Reenvía una copia del mensaje y cualquier comentario adicional a distintas "
 "direcciones de correo-e."
 
-#: C/evolution.xml:7270(glossterm)
+#: C/evolution.xml:7237(glossterm)
 msgid "groupware"
 msgstr "groupware"
 
-#: C/evolution.xml:7272(para)
+#: C/evolution.xml:7239(para)
 msgid ""
 "A term describing an application that helps groups of people work together. "
 "Typically, a groupware application has several productivity features built "
-"into one program, including e-mail, calendar, and address book tools."
+"into one program, including email, calendar, and address book tools."
 msgstr ""
 "Expresión que describe una aplicación con la que grupos de personas pueden "
 "trabajar juntos. Normalmente una aplicación de trabajo en grupo incluye "
 "varias funciones de productividad integradas en un único programa: correo "
 "electrónico, calendario y gestión de contactos."
 
-#: C/evolution.xml:7276(glossterm)
+#: C/evolution.xml:7243(glossterm)
 msgid "HTML"
 msgstr "HTML"
 
-#: C/evolution.xml:7278(para)
+#: C/evolution.xml:7245(para)
 msgid ""
 "Hypertext Markup Language (HTML) is a language for describing page layout in "
-"electronic documents such as Web pages, help files, and e-mail messages. "
-"HTML can be used in e-mail and news posts to insert images and apply text "
+"electronic documents such as Web pages, help files, and email messages. HTML "
+"can be used in email and news posts to insert images and apply text "
 "treatments."
 msgstr ""
 "El Lenguaje de Marcas de HiperTexto (HTML) se utiliza para describir páginas "
@@ -15338,23 +15074,23 @@ msgstr ""
 "envíos a los grupos de noticias para insertar imágenes y darle formato al "
 "texto."
 
-#: C/evolution.xml:7282(glossterm)
+#: C/evolution.xml:7249(glossterm)
 msgid "iCal"
 msgstr "iCal"
 
-#: C/evolution.xml:7284(para)
+#: C/evolution.xml:7251(para)
 msgid "iCal is a protocol that Evolution uses to manage the calendar section."
 msgstr ""
 "iCal es un protocolo que Evolution usa para gestionar la sección del "
 "calendario."
 
-#: C/evolution.xml:7288(glossterm)
+#: C/evolution.xml:7255(glossterm)
 msgid "IMAP"
 msgstr "IMAP"
 
-#: C/evolution.xml:7290(para)
+#: C/evolution.xml:7257(para)
 msgid ""
-"Internet Mail Access Protocol. It allows access to e-mail that is typically "
+"Internet Mail Access Protocol. It allows access to email that is typically "
 "stored remotely on a server rather than on a local hard disk. Often "
 "contrasted with POP."
 msgstr ""
@@ -15362,11 +15098,11 @@ msgstr ""
 "electrónico que normalmente se almacena remotamente en el servidor en lugar "
 "de en el disco duro local. IMAP suele ser la alternativa a POP."
 
-#: C/evolution.xml:7294(glossterm)
+#: C/evolution.xml:7261(glossterm)
 msgid "inline"
 msgstr "en línea"
 
-#: C/evolution.xml:7296(para)
+#: C/evolution.xml:7263(para)
 msgid ""
 "Displayed as part of a message or other document, rather than attached as a "
 "separate file. Contrast with <emphasis>attachment</emphasis>."
@@ -15374,11 +15110,11 @@ msgstr ""
 "Que se muestra empotrado, como parte de un mensaje u otro documento en lugar "
 "de estar anexo a un archivo. Alternativo a <emphasis>adjunto</emphasis>."
 
-#: C/evolution.xml:7300(glossterm)
+#: C/evolution.xml:7267(glossterm)
 msgid "LDAP"
 msgstr "LDAP"
 
-#: C/evolution.xml:7302(para)
+#: C/evolution.xml:7269(para)
 msgid ""
 "Lightweight Directory Access Protocol. Allows a client to search through a "
 "large database of addresses, phone numbers, and people stored on a server."
@@ -15387,13 +15123,14 @@ msgstr ""
 "buscar a través de grandes bases de datos, alojadas en un servidor, de "
 "direcciones, números de teléfono y personas."
 
-#: C/evolution.xml:7306(glossterm)
+#: C/evolution.xml:7273(glossterm)
 msgid "mail client"
 msgstr "cliente de correo"
 
-#: C/evolution.xml:7308(para)
+#: C/evolution.xml:7275(para)
+#, fuzzy
 msgid ""
-"The application with which a person reads and sends e-mail. Its counterparts "
+"The application with which a person reads and sends email. Its counterparts "
 "are the various types of mail servers, which handle user authentication and "
 "direct messages from the sender to the recipient."
 msgstr ""
@@ -15402,29 +15139,29 @@ msgstr ""
 "correo que manejan la autenticación de usuarios y dirigen los mensajes del "
 "remitente al destinatario."
 
-#: C/evolution.xml:7312(glossterm)
+#: C/evolution.xml:7279(glossterm)
 msgid "POP"
 msgstr "POP"
 
-#: C/evolution.xml:7314(para)
+#: C/evolution.xml:7281(para)
 msgid ""
-"Post Office Protocol. A mechanism for e-mail transport. In contrast to IMAP, "
+"Post Office Protocol. A mechanism for email transport. In contrast to IMAP, "
 "it is used only to get mail from a server and store it locally on your hard "
 "disk."
 msgstr ""
-" POP, el Protocolo de Oficina Postal, es un mecanismo de transporte de "
+"POP, el Protocolo de Oficina Postal, es un mecanismo de transporte de "
 "correo electrónico. En contraste con IMAP sólo se usa para descargar el "
 "correo y almacenarlo localmente en el disco duro."
 
-#: C/evolution.xml:7318(glossterm)
+#: C/evolution.xml:7285(glossterm)
 msgid "protocol"
 msgstr "protocolo"
 
-#: C/evolution.xml:7320(para)
+#: C/evolution.xml:7287(para)
 msgid ""
 "An agreed-upon method of communication, especially one for sending "
 "particular types of information between computer systems. Examples include "
-"POP (Post Office Protocol), for e-mail, and HTTP (HypterText Transfer "
+"POP (Post Office Protocol), for email, and HTTP (HyperText Transfer "
 "Protocol) for Web pages."
 msgstr ""
 "Un método acordado de comunicación especialmente para el envío de tipos "
@@ -15432,11 +15169,11 @@ msgstr ""
 "POP (Protocolo de Oficina Postal) para correo electrónico y HTTP (Protocolo "
 "de Transferencia de HiperTexto) para páginas web."
 
-#: C/evolution.xml:7324(glossterm)
+#: C/evolution.xml:7291(glossterm)
 msgid "public key encryption"
 msgstr "cifrado de clave pública"
 
-#: C/evolution.xml:7326(para)
+#: C/evolution.xml:7293(para)
 msgid ""
 "A strong encryption method that uses a set of two keys, one of which is made "
 "public, and one of which is kept private. Data encrypted using the public "
@@ -15448,11 +15185,11 @@ msgstr ""
 "pública sólo pueden ser descifrados con la clave privada. Cuanto más largas "
 "sean las claves más difícil será romper el cifrado."
 
-#: C/evolution.xml:7330(glossterm)
+#: C/evolution.xml:7297(glossterm)
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: C/evolution.xml:7332(para)
+#: C/evolution.xml:7299(para)
 msgid ""
 "A regular expression (regex) is a way of describing a string of text using "
 "metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
@@ -15470,11 +15207,11 @@ msgstr ""
 "<quote>fly in soap</quote>. Para obtener más información introduzca "
 "<command>man grep</command> en la línea de comandos."
 
-#: C/evolution.xml:7336(glossterm)
+#: C/evolution.xml:7303(glossterm)
 msgid "script"
 msgstr "script"
 
-#: C/evolution.xml:7338(para)
+#: C/evolution.xml:7305(para)
 msgid ""
 "A program written in an interpreted (rather than compiled) language. Often "
 "used as a synonym for macro, to denote a series of prerecorded commands or "
@@ -15486,11 +15223,11 @@ msgstr ""
 "órdenes pregrabadas o acciones dentro de una aplicación. Su utilización en "
 "tareas tediosas y repetitivas puede ahorrar mucho tiempo al usuario."
 
-#: C/evolution.xml:7342(glossterm)
+#: C/evolution.xml:7309(glossterm)
 msgid "search base"
 msgstr "base de búsqueda"
 
-#: C/evolution.xml:7344(para)
+#: C/evolution.xml:7311(para)
 msgid ""
 "LDAP can break contact lists into many groups. The search base tells LDAP "
 "the top group to use. How much of the Search Base to search is set by the "
@@ -15500,33 +15237,33 @@ msgstr ""
 "búsqueda le informa a LDAP el número de grupos a usar. La profundidad de la "
 "búsqueda base se ajusta con la opción Rango de búsqueda."
 
-#: C/evolution.xml:7348(glossterm)
+#: C/evolution.xml:7315(glossterm)
 msgid "search folder"
 msgstr "carpeta de búsqueda"
 
-#: C/evolution.xml:7350(para)
+#: C/evolution.xml:7317(para)
 msgid ""
-"An e-mail organization tool. Search folders allow you to create a folder "
-"that contains the results of a complex search. Search folder contents are "
-"updated dynamically."
+"An email organization tool. Search folders allow you to create a folder that "
+"contains the results of a complex search. Search folder contents are updated "
+"dynamically."
 msgstr ""
 "Una herramienta para organizar el correo. Las carpetas de búsqueda la "
 "permiten crear una carpeta que contenga los resultados de una búsqueda "
 "compleja. El contenido de una carpeta de búsqueda se actualiza dinámicamente."
 
-#: C/evolution.xml:7354(glossterm)
+#: C/evolution.xml:7321(glossterm)
 msgid "search scope"
 msgstr "rango de búsqueda"
 
-#: C/evolution.xml:7356(para)
+#: C/evolution.xml:7323(para)
 msgid "Search Scope states how much of the search base to search."
 msgstr "El rango de búsqueda indica cómo de profunda será la búsqueda base."
 
-#: C/evolution.xml:7360(glossterm)
+#: C/evolution.xml:7327(glossterm)
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: C/evolution.xml:7362(para)
+#: C/evolution.xml:7329(para)
 msgid ""
 "A program that sends mail. Evolution can use it instead of SMTP; some people "
 "prefer it because it offers more flexibility; however, it is more difficult "
@@ -15536,11 +15273,11 @@ msgstr ""
 "de SMTP, algunas personas lo prefieren porque ofrece mayor flexibilidad; no "
 "obstante es más difícil de configurar."
 
-#: C/evolution.xml:7366(glossterm)
+#: C/evolution.xml:7333(glossterm)
 msgid "switcher"
 msgstr "selector"
 
-#: C/evolution.xml:7368(para)
+#: C/evolution.xml:7335(para)
 msgid ""
 "An area of Evolution that offers users fast access to the most frequently "
 "used features of the application."
@@ -15548,13 +15285,13 @@ msgstr ""
 "Un área de Evolution que ofrece a los usuarios acceso rápido a la mayoría de "
 "las características usadas de la aplicación."
 
-#: C/evolution.xml:7372(glossterm)
+#: C/evolution.xml:7339(glossterm)
 msgid "signature"
 msgstr "firma"
 
-#: C/evolution.xml:7374(para)
+#: C/evolution.xml:7341(para)
 msgid ""
-"Text placed at the end of every e-mail sent, similar to a hand-written "
+"Text placed at the end of every email sent, similar to a hand-written "
 "signature at the bottom of a written letter. A signature can be anything "
 "from a favorite quotation to a link to a Web page; courtesy dictates that it "
 "be fewer than four lines long."
@@ -15564,11 +15301,11 @@ msgstr ""
 "desde una cita favorita hasta un enlace a una página web; la cortesía dicta "
 "que debe tener menos de cuatro líneas de longitud."
 
-#: C/evolution.xml:7378(glossterm)
+#: C/evolution.xml:7345(glossterm)
 msgid "SMTP"
 msgstr "SMTP"
 
-#: C/evolution.xml:7380(para)
+#: C/evolution.xml:7347(para)
 msgid ""
 "Simple Mail Transfer Protocol. The most common way of transporting mail "
 "messages from your computer to the server."
@@ -15576,11 +15313,11 @@ msgstr ""
 "Simple Mail Transfer Protocol. La forma más común de transportar mensajes de "
 "correo desde su equipo al servidor."
 
-#: C/evolution.xml:7384(glossterm)
+#: C/evolution.xml:7351(glossterm)
 msgid "tooltip"
 msgstr "consejo"
 
-#: C/evolution.xml:7386(para)
+#: C/evolution.xml:7353(para)
 msgid ""
 "A small box of explanatory text that appears when the mouse pointer is held "
 "over a button or other interface element."
@@ -15588,11 +15325,11 @@ msgstr ""
 "Una pequeña caja con texto explicativo que aparece cuando el puntero del "
 "ratón se mantiene sobre un botón u otro elemento del interfaz."
 
-#: C/evolution.xml:7390(glossterm)
+#: C/evolution.xml:7357(glossterm)
 msgid "virus"
 msgstr "virus"
 
-#: C/evolution.xml:7392(para)
+#: C/evolution.xml:7359(para)
 msgid ""
 "A program that inserts itself into other files or programs. When executed, "
 "it spreads to more programs and other computers. A virus can cause "
@@ -15604,24 +15341,24 @@ msgstr ""
 "un daño sustancial saturando redes o discos duros, borrando archivos o "
 "abriendo agujeros de seguridad."
 
-#: C/evolution.xml:7396(glossterm)
+#: C/evolution.xml:7363(glossterm)
 msgid "vCard"
 msgstr "vCard"
 
-#: C/evolution.xml:7398(para)
+#: C/evolution.xml:7365(para)
 msgid ""
 "A file format for the exchange of contact information. When you get an "
-"address card attached to an e-mail, it is probably in vCard format."
+"address card attached to an email, it is probably in vCard format."
 msgstr ""
 "Un formato de archivo para intercambiar información de contactos. Cuando "
 "obtiene una tarjeta de dirección adjuntada a un correo-e, probablemente esté "
 "en formato vCard."
 
-#: C/evolution.xml:7404(title)
+#: C/evolution.xml:7371(title)
 msgid "Legal Notices"
 msgstr "Notas legales"
 
-#: C/evolution.xml:7406(member)
+#: C/evolution.xml:7373(member)
 msgid ""
 "Novell, Inc. makes no representations or warranties with respect to the "
 "contents or use of this documentation, and specifically disclaims any "
@@ -15638,7 +15375,7 @@ msgstr ""
 "momento, sin obligación de notificar a ninguna persona o entidad tales "
 "cambios o revisiones."
 
-#: C/evolution.xml:7407(member)
+#: C/evolution.xml:7374(member)
 msgid ""
 "Further, Novell, Inc. makes no representations or warranties with respect to "
 "any software, and specifically disclaims any express or implied warranties "
@@ -15655,7 +15392,7 @@ msgstr ""
 "software de Novell en cualquier momento, sin obligación de notificar a "
 "ninguna persona o entidad tales cambios o revisiones."
 
-#: C/evolution.xml:7410(member)
+#: C/evolution.xml:7377(member)
 msgid ""
 "You may not use, export, or re-export this product in violation of any "
 "applicable laws or regulations including, without limitation, U.S. export "
@@ -15665,7 +15402,7 @@ msgstr ""
 "regulaciones aplicables incluyendo, sin limitación, las regulaciones de "
 "exportación de los EE.UU. o las leyes del país en el que resida."
 
-#: C/evolution.xml:7413(member)
+#: C/evolution.xml:7380(member)
 msgid ""
 "Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/"
 "or modify this document under the terms of the GNU Free Documentation "
@@ -15674,13 +15411,14 @@ msgid ""
 "Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/"
 "licenses/fdl.html."
 msgstr ""
-"Copyright 2007 Novell, Inc. Se concede autorización para copiar, distribuir y/o "
-"modificar este documento según los términos de la GFDL (GNU Free "
-"Documentation License), Versión 1.2, o cualquier otra versión posterior publicada por Free Software Foundation sin "
-"secciones invariables, textos de portada ni textos de contraportada. Podrá "
-"encontrar una copia de la GFDL en http://www.fsf.org/licenses/fdl.html."
+"Copyright 2007 Novell, Inc. Se concede autorización para copiar, distribuir "
+"y/o modificar este documento según los términos de la GFDL (GNU Free "
+"Documentation License), Versión 1.2, o cualquier otra versión posterior "
+"publicada por Free Software Foundation sin secciones invariables, textos de "
+"portada ni textos de contraportada. Podrá encontrar una copia de la GFDL en "
+"http://www.fsf.org/licenses/fdl.html."
 
-#: C/evolution.xml:7414(member)
+#: C/evolution.xml:7381(member)
 msgid ""
 "THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE "
 "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
@@ -15690,7 +15428,7 @@ msgstr ""
 "LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU "
 "(GFDL) Y TENIENDO EN CUENTA QUE:"
 
-#: C/evolution.xml:7415(member)
+#: C/evolution.xml:7382(member)
 msgid ""
 "1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY "
 "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
@@ -15717,7 +15455,7 @@ msgstr ""
 "NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO "
 "DE LA RENUNCIA;Y"
 
-#: C/evolution.xml:7416(member)
+#: C/evolution.xml:7383(member)
 msgid ""
 "2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
 "(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
@@ -15742,31 +15480,31 @@ msgstr ""
 "MODIFICADAS, AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE "
 "SE PRODUJESEN DICHOS DAÑOS."
 
-#: C/evolution.xml:7419(member)
+#: C/evolution.xml:7386(member)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
-#: C/evolution.xml:7420(member)
+#: C/evolution.xml:7387(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404 Wyman Street, Suite 500"
 
-#: C/evolution.xml:7421(member)
+#: C/evolution.xml:7388(member)
 msgid "Waltham, MA 02451"
 msgstr "Waltham, MA 02451"
 
-#: C/evolution.xml:7422(member)
+#: C/evolution.xml:7389(member)
 msgid "U.S.A."
 msgstr "EE. UU."
 
-#: C/evolution.xml:7423(member)
+#: C/evolution.xml:7390(member)
 msgid "www.novell.com"
 msgstr "www.novell.com"
 
-#: C/evolution.xml:7426(para)
+#: C/evolution.xml:7393(para)
 msgid "July 2007"
 msgstr "Julio de 2007"
 
-#: C/evolution.xml:7428(member)
+#: C/evolution.xml:7395(member)
 msgid ""
 "To access the online documentation for this and other Novell products, and "
 "to get updates, see www.novell.com/documentation"
@@ -15775,11 +15513,11 @@ msgstr ""
 "Novell así como para obtener actualizaciones, consulte www.novell.com/"
 "documentation."
 
-#: C/evolution.xml:7431(member)
+#: C/evolution.xml:7398(member)
 msgid "Evolution is a trademark of Novell, Inc."
 msgstr "Evolution es una marca comercial de Novell, Inc."
 
-#: C/evolution.xml:7432(member)
+#: C/evolution.xml:7399(member)
 msgid ""
 "GroupWise is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15787,7 +15525,7 @@ msgstr ""
 "GroupWise es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7433(member)
+#: C/evolution.xml:7400(member)
 msgid ""
 "Novell is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15795,11 +15533,11 @@ msgstr ""
 "Novell es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7434(member)
+#: C/evolution.xml:7401(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
 msgstr "SUSE es una marca comercial registrada de SUSE AG, una filial de Novell."
 
-#: C/evolution.xml:7435(member)
+#: C/evolution.xml:7402(member)
 msgid ""
 "Ximian is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15807,7 +15545,7 @@ msgstr ""
 "Ximian es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7438(member)
+#: C/evolution.xml:7405(member)
 msgid "All third-party trademarks are the property of their respective owners."
 msgstr ""
 "Todas las marcas comerciales de terceras partes son propiedad de sus "
diff --git a/help/es/figures/attach_reminder_a.png.png b/help/es/figures/attach_reminder_a.png
index 737aba7b11..737aba7b11 100644
--- a/help/es/figures/attach_reminder_a.png.png
+++ b/help/es/figures/attach_reminder_a.png
diff --git a/help/fr/figures/attach_reminder_a.png.png b/help/fr/figures/attach_reminder_a.png
index 2e345e36ef..2e345e36ef 100644
--- a/help/fr/figures/attach_reminder_a.png.png
+++ b/help/fr/figures/attach_reminder_a.png
diff --git a/help/fr/figures/evo_label_a.png b/help/fr/figures/evo_label_a.png
new file mode 100644
index 0000000000..f031d2590d
--- /dev/null
+++ b/help/fr/figures/evo_label_a.png
diff --git a/help/fr/fr.po b/help/fr/fr.po
index ca69c4deeb..4158769a3b 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution doc fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-29 17:14+0100\n"
-"PO-Revision-Date: 2008-02-29 18:43+0100\n"
+"POT-Creation-Date: 2008-07-28 19:40+0200\n"
+"PO-Revision-Date: 2008-07-28 19:46+0200\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:238(None)
-msgid "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+#: ../C/evolution.xml:233(None)
+msgid ""
+"@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgstr ""
+"@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:268(None)
+#: ../C/evolution.xml:263(None)
 msgid ""
 "@@image: 'figures/evo_receive_setup_a.png'; "
 "md5=5add6d290b2df212516dda2463930759"
@@ -37,19 +39,23 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:429(None)
-msgid "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
-msgstr "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
+#: ../C/evolution.xml:425(None)
+msgid ""
+"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
+msgstr ""
+"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:439(None)
-msgid "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
-msgstr "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+#: ../C/evolution.xml:435(None)
+msgid ""
+"@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+msgstr ""
+"@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:480(None)
+#: ../C/evolution.xml:476(None)
 msgid ""
 "@@image: 'figures/evo_imapreceive_a.png'; "
 "md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
@@ -59,25 +65,31 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:523(None)
-msgid "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
-msgstr "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+#: ../C/evolution.xml:519(None)
+msgid ""
+"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+msgstr ""
+"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:544(None)
-msgid "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
-msgstr "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
+#: ../C/evolution.xml:541(None)
+msgid ""
+"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
+msgstr ""
+"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: ../C/evolution.xml:591(None)
-msgid "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
-msgstr "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
+msgid ""
+"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
+msgstr ""
+"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:611(None)
+#: ../C/evolution.xml:612(None)
 msgid ""
 "@@image: 'figures/evo_maildirreceive_a.png'; "
 "md5=bdd9dfc00800338dc906e2fd12b07f62"
@@ -87,7 +99,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:632(None) ../C/evolution.xml:654(None)
+#: ../C/evolution.xml:634(None) ../C/evolution.xml:657(None)
 msgid ""
 "@@image: 'figures/evo_mboxreceive_a.png'; "
 "md5=a04753f7615eab6ac349f50caa39a7a8"
@@ -97,19 +109,23 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:682(None)
-msgid "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
-msgstr "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
+#: ../C/evolution.xml:685(None)
+msgid ""
+"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
+msgstr ""
+"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:729(None)
-msgid "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
-msgstr "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
+#: ../C/evolution.xml:732(None)
+msgid ""
+"@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
+msgstr ""
+"@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:756(None)
+#: ../C/evolution.xml:760(None)
 msgid ""
 "@@image: 'figures/evo_mail_callout_a.png'; "
 "md5=4fa6dda9663d554197736dd2feb79575"
@@ -119,13 +135,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:931(None)
+#: ../C/evolution.xml:935(None)
 msgid "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
-msgstr "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
+msgstr ""
+"@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:949(None)
+#: ../C/evolution.xml:953(None)
 msgid ""
 "@@image: 'figures/evo_cal_callout_a.png'; "
 "md5=6de000ad9c7b3fe42ed1996cad46432f"
@@ -135,7 +152,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:969(None)
+#: ../C/evolution.xml:973(None)
 msgid ""
 "@@image: 'figures/contacts_mainwindow_a.png'; "
 "md5=41335f17f056cb0b06e3df4900d08865"
@@ -145,13 +162,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:984(None)
+#: ../C/evolution.xml:987(None)
 msgid "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
-msgstr "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
+msgstr ""
+"@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:987(None)
+#: ../C/evolution.xml:990(None)
 msgid ""
 "@@image: 'figures/evo_backup_warning.png'; "
 "md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
@@ -161,7 +179,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:995(None)
+#: ../C/evolution.xml:998(None)
 msgid ""
 "@@image: 'figures/evo_backup_prgsbar.png'; "
 "md5=046642d35e096154508269063d672b07"
@@ -171,13 +189,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1014(None)
-msgid "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
-msgstr "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+#: ../C/evolution.xml:1016(None)
+msgid ""
+"@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+msgstr ""
+"@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1024(None)
+#: ../C/evolution.xml:1026(None)
 msgid ""
 "@@image: 'figures/evo_crash_recovery.png'; "
 "md5=6bfa921910f94e5845f893a6308169a6"
@@ -187,37 +207,46 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1181(None)
-msgid "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-msgstr "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+#: ../C/evolution.xml:1190(None)
+msgid ""
+"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+msgstr ""
+"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1198(None)
+#: ../C/evolution.xml:1207(None)
 msgid "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
-msgstr "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
+msgstr ""
+"@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1213(None)
-msgid "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
-msgstr "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+#: ../C/evolution.xml:1222(None)
+msgid ""
+"@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+msgstr ""
+"@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1383(None)
-msgid "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
-msgstr "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+#: ../C/evolution.xml:1397(None)
+msgid ""
+"@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+msgstr ""
+"@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1471(None)
-msgid "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
-msgstr "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+#: ../C/evolution.xml:1485(None)
+msgid ""
+"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+msgstr ""
+"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1525(None)
+#: ../C/evolution.xml:1539(None)
 msgid ""
 "@@image: 'figures/attach_reminder_a.png.png'; "
 "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
@@ -227,7 +256,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1538(None)
+#: ../C/evolution.xml:1552(None)
 msgid ""
 "@@image: 'figures/evo_attachreminder_plugin.png'; "
 "md5=25f7db7cd7d310110847354c62702ecf"
@@ -237,7 +266,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1866(None)
+#: ../C/evolution.xml:1880(None)
 msgid ""
 "@@image: 'figures/evo_account_editor_a.png'; "
 "md5=39b83104a4e6ecb9473cbb84121e6be3"
@@ -247,13 +276,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:1906(None)
-msgid "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
-msgstr "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+#: ../C/evolution.xml:1920(None)
+msgid ""
+"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+msgstr ""
+"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2339(None)
+#: ../C/evolution.xml:2361(None)
 msgid ""
 "@@image: 'figures/evo_import_asst_a.png'; "
 "md5=e86638d0b3a01478fd4f12e33781a8a0"
@@ -263,13 +294,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2365(None)
-msgid "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
-msgstr "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+#: ../C/evolution.xml:2388(None)
+msgid ""
+"@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+msgstr ""
+"@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2516(None)
+#: ../C/evolution.xml:2539(None)
 msgid ""
 "@@image: 'figures/evo_flag_follow_up_a.png'; "
 "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
@@ -279,7 +312,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2533(None)
+#: ../C/evolution.xml:2556(None)
 msgid ""
 "@@image: 'figures/evo_select_folder.png'; "
 "md5=7b99ef6be9990bc1c1d869512ae2f617"
@@ -289,7 +322,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2536(None)
+#: ../C/evolution.xml:2559(None)
 msgid ""
 "@@image: 'figures/evo_message_filters_a.png'; "
 "md5=3b7067638063c6aad2c316db838d2273"
@@ -299,37 +332,46 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2699(None)
-msgid "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
-msgstr "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+#: ../C/evolution.xml:2722(None)
+msgid ""
+"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+msgstr ""
+"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2729(None)
-msgid "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
-msgstr "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+#: ../C/evolution.xml:2752(None)
+msgid ""
+"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+msgstr ""
+"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2735(None)
-msgid "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
-msgstr "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+#: ../C/evolution.xml:2758(None)
+msgid ""
+"@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+msgstr ""
+"@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:2762(None)
-msgid "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
-msgstr "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+#: ../C/evolution.xml:2785(None)
+msgid ""
+"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+msgstr ""
+"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3010(None)
+#: ../C/evolution.xml:3033(None)
 msgid "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
-msgstr "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
+msgstr ""
+"@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3101(None)
+#: ../C/evolution.xml:3124(None)
 msgid ""
 "@@image: 'figures/evo_select_add_folder.png'; "
 "md5=01d57d01ff1650d91c1d73de1f4301ab"
@@ -339,7 +381,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3194(None)
+#: ../C/evolution.xml:3217(None)
 msgid ""
 "@@image: 'figures/evo_contacteditor_a.png'; "
 "md5=4f188bd5d34a9fea7d91fdf5fb943f28"
@@ -349,37 +391,45 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3235(None)
-msgid "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
-msgstr "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+#: ../C/evolution.xml:3255(None)
+msgid ""
+"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+msgstr ""
+"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3490(None)
-msgid "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
-msgstr "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+#: ../C/evolution.xml:3511(None)
+msgid ""
+"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+msgstr ""
+"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3645(None)
+#: ../C/evolution.xml:3666(None)
 msgid "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 msgstr "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3668(None)
-msgid "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
-msgstr "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+#: ../C/evolution.xml:3689(None)
+msgid ""
+"@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+msgstr ""
+"@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3700(None)
-msgid "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
-msgstr "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+#: ../C/evolution.xml:3721(None)
+msgid ""
+"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+msgstr ""
+"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3798(None)
+#: ../C/evolution.xml:3820(None)
 msgid ""
 "@@image: 'figures/evo_calender_appointmnt.png'; "
 "md5=730ed74addbca4b0638f03cbcde99e71"
@@ -389,21 +439,23 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:3865(None)
-msgid "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
-msgstr "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+#: ../C/evolution.xml:3888(None)
+msgid ""
+"@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+msgstr ""
+"@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:4059(None) ../C/evolution.xml:5382(None)
-#: ../C/evolution.xml:5766(None)
+#: ../C/evolution.xml:4084(None) ../C/evolution.xml:5359(None)
+#: ../C/evolution.xml:5745(None)
 msgid "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 msgstr "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:4155(None) ../C/evolution.xml:4469(None)
-#: ../C/evolution.xml:4707(None)
+#: ../C/evolution.xml:4180(None) ../C/evolution.xml:4494(None)
+#: ../C/evolution.xml:4732(None)
 msgid ""
 "@@image: 'figures/evo_cal_advsearch.png'; "
 "md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
@@ -413,25 +465,30 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:4618(None)
+#: ../C/evolution.xml:4643(None)
 msgid "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
-msgstr "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
+msgstr ""
+"@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5015(None)
-msgid "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+#: ../C/evolution.xml:5039(None)
+msgid ""
+"@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgstr ""
+"@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5025(None)
-msgid "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
-msgstr "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+#: ../C/evolution.xml:5044(None)
+msgid ""
+"@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+msgstr ""
+"@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5045(None)
+#: ../C/evolution.xml:5051(None)
 msgid ""
 "@@image: 'figures/exchng-rec-options.png'; "
 "md5=c3c759f902c2584ee218dc40d6e46806"
@@ -441,19 +498,23 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5068(None)
-msgid "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
-msgstr "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+#: ../C/evolution.xml:5065(None)
+msgid ""
+"@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+msgstr ""
+"@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5090(None)
-msgid "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
-msgstr "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+#: ../C/evolution.xml:5073(None)
+msgid ""
+"@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+msgstr ""
+"@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5107(None)
+#: ../C/evolution.xml:5081(None)
 msgid ""
 "@@image: 'figures/exchng-rec-option.png'; "
 "md5=6c0f84b7541a044e900d9d7c5fc4a49b"
@@ -463,13 +524,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5139(None) ../C/evolution.xml:5374(None)
-msgid "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
-msgstr "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+#: ../C/evolution.xml:5114(None) ../C/evolution.xml:5351(None)
+msgid ""
+"@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+msgstr ""
+"@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5181(None)
+#: ../C/evolution.xml:5156(None)
 msgid ""
 "@@image: 'figures/evo_send_option_a.png'; "
 "md5=c1cca904625d1a7de13c851cd15235f6"
@@ -479,13 +542,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5259(None)
+#: ../C/evolution.xml:5236(None)
 msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 msgstr "@@image: 'figures/delgt-add.png'; md5=c1ee3dd81e07610258461637d4834936"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5268(None)
+#: ../C/evolution.xml:5245(None)
 msgid ""
 "@@image: 'figures/evo_delegate_permission_a.png'; "
 "md5=05df38ad69b20f9bd7c1e14044ca10fd"
@@ -493,7 +556,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5303(None)
+#: ../C/evolution.xml:5280(None)
 msgid ""
 "@@image: 'figures/sub-others-folder.png'; "
 "md5=5e385ee9524f93b65b307f83e1888138"
@@ -503,13 +566,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5333(None)
-msgid "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
-msgstr "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
+#: ../C/evolution.xml:5310(None)
+msgid ""
+"@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
+msgstr ""
+"@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5662(None)
+#: ../C/evolution.xml:5639(None)
 msgid ""
 "@@image: 'figures/evo_identityedit_a.png'; "
 "md5=78418c3f6214b7494c323df12bc6921f"
@@ -519,7 +584,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5670(None)
+#: ../C/evolution.xml:5647(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveedit_a.png'; "
 "md5=3f5fc5b802eba3ef1a68e6ff675577b0"
@@ -529,7 +594,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5682(None)
+#: ../C/evolution.xml:5660(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
 "md5=1c9e818bb39bb288511cf1cebdd83569"
@@ -539,19 +604,22 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5727(None)
-msgid "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
+#: ../C/evolution.xml:5706(None)
+msgid ""
+"@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
 msgstr " "
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5759(None)
-msgid "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
-msgstr "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
+#: ../C/evolution.xml:5738(None)
+msgid ""
+"@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
+msgstr ""
+"@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5831(None)
+#: ../C/evolution.xml:5809(None)
 msgid ""
 "@@image: 'figures/evo_gwstatustrack.png'; "
 "md5=d4eb84e2d55870af1408c430ce8c0e66"
@@ -561,37 +629,43 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5889(None)
-msgid "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
-msgstr "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+#: ../C/evolution.xml:5864(None)
+msgid ""
+"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+msgstr ""
+"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:5954(None)
-msgid "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
-msgstr "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+#: ../C/evolution.xml:5922(None)
+msgid ""
+"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+msgstr ""
+"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6099(None)
-msgid "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
+#: ../C/evolution.xml:6063(None)
+msgid ""
+"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6121(None)
-msgid "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
+#: ../C/evolution.xml:6086(None)
+msgid ""
+"@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6130(None)
+#: ../C/evolution.xml:6095(None)
 msgid "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6290(None)
+#: ../C/evolution.xml:6255(None)
 msgid ""
 "@@image: 'figures/mailer_preferences.png'; "
 "md5=4141df4bf4b2dc4e82a0bad514714194"
@@ -601,41 +675,52 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6399(None)
-msgid "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
-msgstr "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+#: ../C/evolution.xml:6364(None)
+msgid ""
+"@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+msgstr ""
+"@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6494(None)
-msgid "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
-msgstr "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+#: ../C/evolution.xml:6459(None)
+msgid ""
+"@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+msgstr ""
+"@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6522(None)
-msgid "@@image: 'figures/evo_label_a.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr "@@image: 'figures/evo_label_a.png'; md5=THIS FILE DOESN'T EXIST"
+#: ../C/evolution.xml:6485(None)
+msgid ""
+"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+msgstr ""
+"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6567(None)
+#: ../C/evolution.xml:6530(None)
 msgid "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
-msgstr "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
+msgstr ""
+"@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:6910(None)
-msgid "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
-msgstr "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
+#: ../C/evolution.xml:6874(None)
+msgid ""
+"@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
+msgstr ""
+"@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/evolution.xml:7062(None)
-msgid "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
-msgstr "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+#: ../C/evolution.xml:7026(None)
+msgid ""
+"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+msgstr ""
+"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 
-#: ../C/evolution.xml:15(title) ../C/evolution.xml:7453(para)
+#: ../C/evolution.xml:15(title) ../C/evolution.xml:7416(para)
 msgid "Evolution 2.22 User Guide"
 msgstr "Manuel d'utilisation d'Evolution 2.22"
 
@@ -707,9 +792,10 @@ msgstr ""
 "fonctionnalités de courriels, de calendrier, de contacts et de gestion des "
 "tâches."
 
-#: ../C/evolution.xml:76(productname)
-msgid "Evolution™"
-msgstr "Evolution™"
+#: ../C/evolution.xml:76(productname) ../C/evolution.xml:5543(para)
+#: ../C/evolution.xml:7225(glossterm)
+msgid "Evolution"
+msgstr "Evolution"
 
 #: ../C/evolution.xml:78(invpartnumber)
 msgid "February 2008"
@@ -725,70 +811,71 @@ msgstr "À propos de ce guide"
 
 #: ../C/evolution.xml:85(para)
 msgid ""
-"This guide describes how to use and manage Evolution™ 2.22 client software. "
-"This guide is intended for users and is divided into the following sections:"
+"This guide describes how to use and manage <trademark>Evolution</trademark> "
+"2.22 client software. This guide is intended for users and is divided into "
+"the following sections:"
 msgstr ""
 "Ce guide explique comment utiliser et comment gérer le logiciel client "
-"Evolution&trade; 2.22. Ce guide est dédié aux utilisateurs et comporte les "
-"chapitres suivants :"
+"<trademark>Evolution</trademark> 2.22. Ce guide est dédié aux utilisateurs "
+"et comporte les chapitres suivants :"
 
-#: ../C/evolution.xml:88(link) ../C/evolution.xml:155(title)
+#: ../C/evolution.xml:88(link) ../C/evolution.xml:152(title)
 msgid "Getting Started"
 msgstr "Premiers pas"
 
-#: ../C/evolution.xml:91(link) ../C/evolution.xml:1117(title)
-msgid "Sending and Receiving E-Mail"
+#: ../C/evolution.xml:91(link) ../C/evolution.xml:1120(title)
+msgid "Sending and Receiving Email"
 msgstr "Réception et envoi de courriels"
 
-#: ../C/evolution.xml:94(link) ../C/evolution.xml:2242(title)
-msgid "Organizing Your E-Mail"
+#: ../C/evolution.xml:94(link) ../C/evolution.xml:2264(title)
+msgid "Organizing Your Email"
 msgstr "Organisation des courriels"
 
-#: ../C/evolution.xml:97(link) ../C/evolution.xml:3134(title)
+#: ../C/evolution.xml:97(link) ../C/evolution.xml:3158(title)
 msgid "Evolution Contacts: the Address Book"
 msgstr "Evolution Contacts : le carnet d'adresses"
 
-#: ../C/evolution.xml:100(link) ../C/evolution.xml:3546(title)
+#: ../C/evolution.xml:100(link) ../C/evolution.xml:3567(title)
 msgid "Evolution Calendar"
 msgstr "Calendrier Evolution"
 
-#: ../C/evolution.xml:103(link) ../C/evolution.xml:4836(title)
+#: ../C/evolution.xml:103(link) ../C/evolution.xml:4860(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Connexion aux serveurs Exchange"
 
-#: ../C/evolution.xml:106(link) ../C/evolution.xml:5438(title)
+#: ../C/evolution.xml:106(link) ../C/evolution.xml:5415(title)
 msgid "Connecting to GroupWise"
 msgstr "Connexion à GroupWise"
 
-#: ../C/evolution.xml:109(link) ../C/evolution.xml:6244(title)
+#: ../C/evolution.xml:109(link) ../C/evolution.xml:6209(title)
 msgid "Connecting to Hula"
 msgstr "Connexion à Hula"
 
-#: ../C/evolution.xml:112(link) ../C/evolution.xml:6261(title)
+#: ../C/evolution.xml:112(link) ../C/evolution.xml:6226(title)
 msgid "Advanced Configuration"
 msgstr "Configuration avancée"
 
-#: ../C/evolution.xml:115(link) ../C/evolution.xml:6924(title)
+#: ../C/evolution.xml:115(link) ../C/evolution.xml:6888(title)
 msgid "Synchronizing Your Handheld Device"
 msgstr "Synchronisation avec un PAD"
 
-#: ../C/evolution.xml:118(link) ../C/evolution.xml:6981(title)
+#: ../C/evolution.xml:118(link) ../C/evolution.xml:6945(title)
 msgid "Migration from Outlook to Evolution"
 msgstr "Migration d'Outlook à Evolution"
 
-#: ../C/evolution.xml:121(link) ../C/evolution.xml:7043(title)
+#: ../C/evolution.xml:121(link) ../C/evolution.xml:7007(title)
 msgid "Quick Reference"
 msgstr "Référence rapide"
 
-#: ../C/evolution.xml:124(link) ../C/evolution.xml:7157(title)
+#: ../C/evolution.xml:124(link) ../C/evolution.xml:7121(title)
 msgid "Known Bugs and Limitations"
 msgstr "Problèmes connus et limitations"
 
-#: ../C/evolution.xml:127(link) ../C/evolution.xml:7164(title)
+#: ../C/evolution.xml:127(link) ../C/evolution.xml:7127(title)
 msgid "Authors"
 msgstr "Auteurs"
 
-#: ../C/evolution.xml:130(link) ../C/evolution.xml:7223(title)
+#: ../C/evolution.xml:130(link) ../C/evolution.xml:7186(title)
 msgid "Glossary"
 msgstr "Glossaire"
 
@@ -802,134 +889,99 @@ msgstr "Vous pourrez trouver des aides supplémentaires dans ces trois sites :"
 
 #: ../C/evolution.xml:139(para)
 msgid ""
-"For information about command line options, open a terminal window and type "
+"Evolution has a number of command line options that you can use. For "
+"information about command line options, open a terminal window and type "
 "<command>evolution --help</command>."
 msgstr ""
-"Pour obtenir des informations concernant les options en ligne de commande, "
-"ouvrez un terminal et tapez <command>evolution --help</command>."
+"Evolution dispose de quelques options utilisables en ligne de commande. Pour "
+"obtenir des informations concernant ces options, ouvrez un terminal et tapez "
+"<command>evolution --help</command>."
 
 #: ../C/evolution.xml:142(para)
-msgid ""
-"For support, late-breaking news, and errata, visit the Novell® support "
-"center at <ulink url=\"http://support.novell.com\">support.novell.com</"
-"ulink>."
-msgstr ""
-"Pour obtenir de l'aide, les dernières nouvelles ou un état de situation des "
-"erreurs connues, visitez le centre d'aide Novell situé à <ulink·url=\"http://"
-"support.novell.com\">support.novell.com</ulink>."
-
-#: ../C/evolution.xml:145(para)
 msgid "In the Evolution interface, click Help &gt; Contents."
-msgstr "Dans l'interface graphique d'Evolution, cliquez sur Aide &gt; Sommaire."
+msgstr ""
+"Dans l'interface graphique d'Evolution, cliquez sur Aide &gt; Sommaire."
 
-#: ../C/evolution.xml:149(title)
+#: ../C/evolution.xml:146(title)
 msgid "Documentation Conventions:"
 msgstr "Conventions utilisées dans la documentation :"
 
-#: ../C/evolution.xml:150(para)
+#: ../C/evolution.xml:147(para)
 msgid ""
 "In Novell documentation, a greater-than symbol (&gt;) is used to separate "
 "actions within a step and items in a cross-reference path. A trademark "
-"symbol (®, TM, etc.) denotes a Novell trademark. An asterisk (*) denotes a "
-"third-party trademark."
+"symbol (<trademark class=\"registered\"/>, <trademark/>, etc.) denotes a "
+"Novell trademark. An asterisk (*) denotes a third-party trademark."
 msgstr ""
 "Dans la documentation Novell, un symbole « plus grand que » (&gt;) est "
 "utilisé pour séparer des actions à effectuer au sein d'une même étape "
 "d'exécution ou pour séparer des éléments dans un chemin de référence "
-"croisée. Le symbole marque déposée (&reg;, ™, etc.) désigne une marque "
-"déposée par Novell. Un astérisque (*) désigne une autre marque déposée."
-
-#: ../C/evolution.xml:156(para)
-msgid ""
-"Evolution™ makes the tasks of storing, organizing, and retrieving your "
-"personal information easy, so you can work and communicate more effectively "
-"with others. It is a highly evolved <link linkend=\"groupware\">groupware</"
-"link> program, an integral part of the Internet-connected desktop."
-msgstr ""
-"Evolution&trade; facilite la tâche du stockage, de l'organisation et de la "
-"récupération de vos informations personnelles, afin de vous permettre de "
-"travailler et de communiquer plus efficacement avec les autres. C'est un "
-"prgramme <link linkend=\"groupware\">synergiciel</link> évolué, faisant "
-"partie intégrale d'un bureau connecté à Internet."
-
-#: ../C/evolution.xml:157(para)
-msgid ""
-"Evolution can help you work in a group by handling e-mail, address, and "
-"other contact information, and one or more calendars. It can do that on one "
-"or several computers, connected directly or over a network, for one person "
-"or for large groups."
-msgstr ""
-"Evolution peut vous aider à travailler en groupe en gérer les courriels, les "
-"adresses et d'autres informations de contact, ainsi qu'un ou plusieurs "
-"agendas. Il peut le faire sur un ou plusieurs ordinateurs, connectés "
-"directement ou par un réseau, pour une personne seule ou pour de grands "
-"groupes."
-
-#: ../C/evolution.xml:158(para)
-msgid ""
-"With Evolution, you can accomplish your most common daily tasks quickly. For "
-"example, it takes only one or two clicks to enter appointment or contact "
-"information sent to you by e-mail, or to send e-mail to a contact or "
-"appointment. People who get lots of e-mail will appreciate advanced features "
-"like <link linkend=\"vfolder\">search folders</link>, which let you save "
-"searches as though they were ordinary e-mail folders."
-msgstr ""
-"Avec Evolution, vous pouvez accomplir rapidement vos tâches journalières les "
-"plus courantes. Par exemple, il vous suffit d'un ou deux clics pour saisir "
-"des rendez-vous ou des informations de contact reçues par courriel, ou "
-"encore pour envoyer des courriels à un contact ou concernant un rendez-vous. "
-"Ceux qui reçoivent beaucoup de courriels apprécieront les fonctionnalités "
-"avancées telles que les <link linkend=\"vfolder\">dossiers de recherche</"
-"link> qui vous permettent d'enregistrer vos recherches comme si c'était des "
-"dossiers de courriels ordinaires."
-
-#: ../C/evolution.xml:161(link) ../C/evolution.xml:169(title)
+"croisée. Le symbole marque déposée (<trademark class=\"registered\"/>, "
+"<trademark/>, etc.) désigne une marque déposée par Novell. Un astérisque (*) "
+"désigne une autre marque déposée."
+
+#: ../C/evolution.xml:153(para)
+msgid ""
+"<trademark>Evolution</trademark> is a <link linkend=\"groupware\">groupware</"
+"link> application that helps you work in a group by handling email, address, "
+"memos, tasks, and one or more calendars. This makes the tasks of storing, "
+"organizing, and retrieving your personal information easy, so you can work "
+"and communicate more effectively with others."
+msgstr ""
+"<trademark>Evolution</trademark> est un <link linkend=\"groupware"
+"\">synergiciel</link> apte à encourager le travail en équipe en gérant la "
+"messagerie, les adresses, les mémos, les tâches et un ou plusieurs "
+"calendriers. Cela facilite les tâches de stockage, d'organisation et de "
+"recherche des informations personnelles. La collaboration et la "
+"communication s'en trouvent renforcées dans le cadre du travail d'équipe."
+
+#: ../C/evolution.xml:156(link) ../C/evolution.xml:164(title)
 msgid "Starting Evolution for the First Time"
 msgstr "Premier lancement d'Evolution"
 
-#: ../C/evolution.xml:164(link) ../C/evolution.xml:754(title)
+#: ../C/evolution.xml:159(link) ../C/evolution.xml:758(title)
 msgid "Using Evolution: An Overview"
 msgstr "Utilisation d'Evolution : un aperçu"
 
-#: ../C/evolution.xml:172(para)
+#: ../C/evolution.xml:167(para)
 msgid "Start the Evolution client."
 msgstr "Démarrez le client Evolution."
 
-#: ../C/evolution.xml:180(para)
+#: ../C/evolution.xml:175(para)
 msgid "GNOME:"
 msgstr "GNOME :"
 
-#: ../C/evolution.xml:183(para)
+#: ../C/evolution.xml:178(para)
 msgid "Click Applications &gt; Office &gt; Evolution."
 msgstr "Cliquez sur Applications &gt; Bureautique &gt; Evolution."
 
-#: ../C/evolution.xml:188(para)
+#: ../C/evolution.xml:183(para)
 msgid "KDE:"
 msgstr "KDE :"
 
-#: ../C/evolution.xml:191(para)
+#: ../C/evolution.xml:186(para)
 msgid "Click the K menu &gt; Office &gt; More Programs &gt; Evolution."
 msgstr ""
 "Cliquez sur le menu K &gt; Bureautique &gt; Plus de programmes &gt; "
 "Evolution."
 
-#: ../C/evolution.xml:196(para)
+#: ../C/evolution.xml:191(para)
 msgid "Command Line:"
 msgstr "Ligne de commande :"
 
-#: ../C/evolution.xml:199(para)
+#: ../C/evolution.xml:194(para)
 msgid "Enter <command>evolution</command>."
 msgstr "Saisissez <command>evolution</command>."
 
-#: ../C/evolution.xml:209(title)
+#: ../C/evolution.xml:204(title)
 msgid "Using the First-Run Assistant"
 msgstr "Assistant de configuration"
 
-#: ../C/evolution.xml:210(para)
+#: ../C/evolution.xml:205(para)
 msgid ""
 "The first time you run Evolution, it creates a directory <emphasis>."
 "evolution</emphasis> in your home directory, where it stores all of its "
-"local data. Then, it opens a First-Run Assistant to help you set up e-mail "
+"local data. Then, it opens a First-Run Assistant to help you set up email "
 "accounts and import data from other applications."
 msgstr ""
 "Au premier lancement d'Evolution, celui-ci crée un répertoire nommé "
@@ -938,11 +990,12 @@ msgstr ""
 "configuration pour vous aider à configurer les comptes de messagerie et pour "
 "importer des données provenant d'autres applications."
 
-#: ../C/evolution.xml:211(para)
+#: ../C/evolution.xml:206(para)
 msgid "Using the first-run assistant takes two to five minutes."
-msgstr "L'utilisation de l'assistant de configuration prend de deux à cinq minutes."
+msgstr ""
+"L'utilisation de l'assistant de configuration prend de deux à cinq minutes."
 
-#: ../C/evolution.xml:212(para)
+#: ../C/evolution.xml:207(para)
 msgid ""
 "Later on, if you want to change this account, or if you want to create a new "
 "one, click Edit &gt; Preferences, then click Mail Accounts. Select the "
@@ -957,7 +1010,7 @@ msgstr ""
 "<link linkend=\"config-prefs-mail\">préférences de courrier</link> pour plus "
 "de détails."
 
-#: ../C/evolution.xml:213(para)
+#: ../C/evolution.xml:208(para)
 msgid ""
 "The First-Run Assistant helps you provide the information Evolution needs to "
 "get started."
@@ -965,37 +1018,37 @@ msgstr ""
 "L'assistant de configuration vous aide à fournir à Evolution toutes les "
 "informations nécessaires pour démarrer."
 
-#: ../C/evolution.xml:216(link) ../C/evolution.xml:236(title)
+#: ../C/evolution.xml:211(link) ../C/evolution.xml:231(title)
 msgid "Defining Your Identity"
 msgstr "Définition de votre identité"
 
-#: ../C/evolution.xml:219(link) ../C/evolution.xml:266(title)
+#: ../C/evolution.xml:214(link) ../C/evolution.xml:261(title)
 msgid "Receiving Mail"
 msgstr "Réception de courriel"
 
-#: ../C/evolution.xml:222(link) ../C/evolution.xml:364(title)
+#: ../C/evolution.xml:217(link) ../C/evolution.xml:360(title)
 msgid "Receiving Mail Options"
 msgstr "Options de réception des courriels"
 
-#: ../C/evolution.xml:225(link) ../C/evolution.xml:663(title)
+#: ../C/evolution.xml:220(link) ../C/evolution.xml:666(title)
 msgid "Sending Mail"
 msgstr "Envoi de courriel"
 
-#: ../C/evolution.xml:228(link) ../C/evolution.xml:717(title)
+#: ../C/evolution.xml:223(link) ../C/evolution.xml:720(title)
 msgid "Account Management"
 msgstr "Gestion de compte"
 
-#: ../C/evolution.xml:231(link) ../C/evolution.xml:723(title)
+#: ../C/evolution.xml:226(link) ../C/evolution.xml:726(title)
 msgid "Time Zone"
 msgstr "Fuseau horaire"
 
-#: ../C/evolution.xml:237(para)
+#: ../C/evolution.xml:232(para)
 msgid "The Identity window is the first step in the assistant."
 msgstr ""
 "La première étape de l'assistant se présente sous la forme de la fenêtre de "
 "saisie de l'identité."
 
-#: ../C/evolution.xml:239(para)
+#: ../C/evolution.xml:234(para)
 msgid ""
 "Here, you enter some basic personal information. You can define multiple "
 "identities later by clicking Edit &gt; Preferences, then clicking Mail "
@@ -1005,7 +1058,7 @@ msgstr ""
 "pouvez définir d'autres identités plus tard en cliquant sur Édition &gt; "
 "Préférences, puis sur Comptes de messagerie."
 
-#: ../C/evolution.xml:240(para)
+#: ../C/evolution.xml:235(para)
 msgid ""
 "When the First-Run Assistant starts, the Welcome page is displayed. Click "
 "Forward to proceed to the Identity window."
@@ -1013,62 +1066,63 @@ msgstr ""
 "Quand l'assistant de configuration démarre, la page de bienvenue apparaît. "
 "Cliquez sur « Suivant » pour activer la fenêtre d'identité."
 
-#: ../C/evolution.xml:243(para)
+#: ../C/evolution.xml:238(para)
 msgid "Type your full name in the Full Name field."
 msgstr "Saisissez votre nom complet dans le champ Nom complet."
 
-#: ../C/evolution.xml:246(para)
-msgid "Type your e-mail address in the E-Mail Address field."
+#: ../C/evolution.xml:241(para)
+msgid "Type your email address in the Email Address field."
 msgstr "Saisissez votre adresse de courriel dans le champ Courriel."
 
-#: ../C/evolution.xml:249(para)
+#: ../C/evolution.xml:244(para)
 msgid "(Optional) Select if this account is your default account."
 msgstr "Cochez si votre compte est le compte par défaut (facultatif)."
 
-#: ../C/evolution.xml:252(para)
+#: ../C/evolution.xml:247(para)
 msgid "(Optional) Type a reply to address in the Reply-To field."
 msgstr ""
 "Saisissez une adresse de réponse dans le champ Adresse de retour "
 "(facultatif)."
 
-#: ../C/evolution.xml:253(para)
-msgid "Use this field if you want replies to messages sent to a different address."
+#: ../C/evolution.xml:248(para)
+msgid ""
+"Use this field if you want replies to messages sent to a different address."
 msgstr ""
 "Utilisez ce champ si vous souhaitez que les réponses à vos courriels soient "
 "envoyés à une adresse différente."
 
-#: ../C/evolution.xml:256(para)
+#: ../C/evolution.xml:251(para)
 msgid "(Optional) Type your organization name in the Organization field."
 msgstr ""
 "Saisissez le nom de l'organisme auquel vous appartenez dans le champ "
 "« Organisme » (facultatif)."
 
-#: ../C/evolution.xml:257(para)
+#: ../C/evolution.xml:252(para)
 msgid ""
 "This is the company where you work, or the organization you represent when "
-"you send e-mail."
+"you send email."
 msgstr ""
 "C'est la société dans laquelle vous travaillez, ou l'organisme que vous "
 "représentez quand vous envoyez un courriel."
 
-#: ../C/evolution.xml:260(para) ../C/evolution.xml:350(para)
-#: ../C/evolution.xml:428(para) ../C/evolution.xml:471(para)
-#: ../C/evolution.xml:515(para) ../C/evolution.xml:536(para)
-#: ../C/evolution.xml:559(para) ../C/evolution.xml:573(para)
-#: ../C/evolution.xml:590(para) ../C/evolution.xml:610(para)
-#: ../C/evolution.xml:631(para) ../C/evolution.xml:653(para)
-#: ../C/evolution.xml:709(para) ../C/evolution.xml:2309(para)
-#: ../C/evolution.xml:2331(para)
+#: ../C/evolution.xml:255(para) ../C/evolution.xml:346(para)
+#: ../C/evolution.xml:424(para) ../C/evolution.xml:467(para)
+#: ../C/evolution.xml:511(para) ../C/evolution.xml:533(para)
+#: ../C/evolution.xml:557(para) ../C/evolution.xml:572(para)
+#: ../C/evolution.xml:590(para) ../C/evolution.xml:611(para)
+#: ../C/evolution.xml:633(para) ../C/evolution.xml:656(para)
+#: ../C/evolution.xml:712(para) ../C/evolution.xml:2331(para)
+#: ../C/evolution.xml:2353(para)
 msgid "Click Forward."
 msgstr "Cliquez sur le bouton Suivant."
 
-#: ../C/evolution.xml:267(para)
-msgid "The Receiving E-mail option lets you determine where you get your e-mail."
+#: ../C/evolution.xml:262(para)
+msgid "The Receiving Email option lets you determine where you get your email."
 msgstr ""
 "L'option des courriels en réception vous laisse la possibilité de définir où "
 "recevoir vos courriels."
 
-#: ../C/evolution.xml:269(para)
+#: ../C/evolution.xml:264(para)
 msgid ""
 "You need to specify the type of server you want to receive mail with. If you "
 "are unsure about the type of server to choose, ask your system administrator "
@@ -1078,39 +1132,40 @@ msgstr ""
 "courriels. Si vous ne savez pas quoi répondre, posez la question à votre "
 "administrateur système ou à votre fournisseur d'accès."
 
-#: ../C/evolution.xml:272(para)
+#: ../C/evolution.xml:267(para)
 msgid "Select a server type in the Server Type list."
 msgstr "Choisissez un type de serveur dans la liste des types de serveur."
 
-#: ../C/evolution.xml:273(para)
+#: ../C/evolution.xml:268(para)
 msgid "The following is a list of server types that are available:"
 msgstr "La liste suivante énumère les serveurs disponibles :"
 
-#: ../C/evolution.xml:275(title)
+#: ../C/evolution.xml:270(title)
 msgid "Novell GroupWise:"
 msgstr "Novell Groupwise :"
 
-#: ../C/evolution.xml:276(para)
+#: ../C/evolution.xml:271(para)
 msgid ""
-"Select this option if you connect to Novell GroupWise®. Novell GroupWise "
-"keeps e-mail, calendar, and contact information on the server. For "
-"configuration instructions, see <link linkend=\"bstfw13\">Remote "
-"Configuration Options</link>."
+"Select this option if you connect to Novell <trademark class=\"registered"
+"\">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and "
+"contact information on the server. For configuration instructions, see <link "
+"linkend=\"bstfw13\">Remote Configuration Options</link>."
 msgstr ""
-"Cette option est destinée aux connexions à Novell GroupWise&reg;. Ce type de "
-"serveur conserve les courriels, le calendrier et les contacts sur le "
-"serveur. Pour des instructions de configuration, consultez <link linkend="
-"\"bstfw13\">Options de configuration distantes</link>."
+"Cette option est destinée aux connexions à Novell <trademark class="
+"\"registered\">GroupWise</trademark>. Ce type de serveur conserve les "
+"courriels, le calendrier et les contacts sur le serveur. Pour des "
+"instructions de configuration, consultez <link linkend=\"bstfw13\">Options "
+"de configuration distantes</link>."
 
-#: ../C/evolution.xml:279(title)
+#: ../C/evolution.xml:274(title)
 msgid "Microsoft Exchange:"
 msgstr "Microsoft·Exchange :"
 
-#: ../C/evolution.xml:280(para)
+#: ../C/evolution.xml:275(para)
 msgid ""
 "Available only if you have installed the Connector for Microsoft* Exchange. "
 "It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which "
-"stores e-mail, calendar, and contact information on the server. For "
+"stores email, calendar, and contact information on the server. For "
 "configuration instructions, see <link linkend=\"bstfw13\">Remote "
 "Configuration Options</link>."
 msgstr ""
@@ -1120,13 +1175,13 @@ msgstr ""
 "de configuration, consultez <link linkend=\"bstfw13\">Options de "
 "configuration distantes</link>."
 
-#: ../C/evolution.xml:283(title)
+#: ../C/evolution.xml:278(title)
 msgid "IMAP:"
 msgstr "IMAP :"
 
-#: ../C/evolution.xml:284(para)
+#: ../C/evolution.xml:279(para)
 msgid ""
-"Keeps the e-mail on your server so you can access your e-mail from multiple "
+"Keeps the email on your server so you can access your email from multiple "
 "systems. For configuration instructions, see <link linkend=\"bstfw13"
 "\">Remote Configuration Options</link>."
 msgstr ""
@@ -1134,42 +1189,43 @@ msgstr ""
 "plusieurs endroits. Pour des instructions de configuration, consultez <link "
 "linkend=\"bstfw13\">Options de configuration distantes</link>."
 
-#: ../C/evolution.xml:287(title)
+#: ../C/evolution.xml:282(title)
 msgid "POP:"
 msgstr "POP :"
 
-#: ../C/evolution.xml:288(para)
+#: ../C/evolution.xml:283(para)
 msgid ""
-"Downloads your e-mail to your hard disk for permanent storage, freeing up "
-"space on the e-mail server. For configuration instructions, see <link "
-"linkend=\"bstfw13\">Remote Configuration Options</link>."
+"Downloads your email to your hard disk for permanent storage, freeing up "
+"space on the email server. For configuration instructions, see <link linkend="
+"\"bstfw13\">Remote Configuration Options</link>."
 msgstr ""
 "Télécharge les messages sur le disque dur comme stockage définitif, libérant "
 "l'espace sur le serveur de messagerie. Pour des instructions de "
 "configuration, consultez <link linkend=\"bstfw13\">Options de configuration "
 "distantes</link>."
 
-#: ../C/evolution.xml:291(title)
+#: ../C/evolution.xml:286(title)
 msgid "Hula:"
 msgstr "Hula :"
 
-#: ../C/evolution.xml:292(para)
+#: ../C/evolution.xml:287(para)
 msgid ""
-"Select this option if you want Hula account. Evolution provide you "
-"connectivity to Hula® servers through IMAP and calendaring support through "
-"CalDAV. For more information refer <link linkend=\"b1012tkg\">Connecting to "
-"Hula</link>"
+"Select this option if you want to use a Hula account. Evolution provides you "
+"connectivity to <trademark class=\"registered\">Hula</trademark> servers "
+"through IMAP and calendaring support through CalDAV. For more information "
+"refer <link linkend=\"b1012tkg\">Connecting to Hula</link>."
 msgstr ""
-"Cochez cette option si vou souhaitez un compte Hula. Evolution permet la "
-"connectivité aux serveurs Hula&reg; via IMAP et prend en charge le "
-"calendrier via CalDAV. Pour des instructions de configuration, consultez "
-"<link linkend=\"bstfw13\">Options de configuration distantes</link>."
+"Cochez cette option si vous souhaitez utiliser un compte Hula. Evolution "
+"permet la connectivité aux serveurs <trademark class=\"registered\">Hula</"
+"trademark> via IMAP et prend en charge le calendrier via CalDAV. Pour des "
+"instructions de configuration, consultez <link linkend=\"bstfw13\">Options "
+"de configuration distantes</link>."
 
-#: ../C/evolution.xml:295(title)
+#: ../C/evolution.xml:290(title)
 msgid "USENET News:"
 msgstr "Nouvelles USENET :"
 
-#: ../C/evolution.xml:296(para)
+#: ../C/evolution.xml:291(para)
 msgid ""
 "Connects to the news server and downloads a list of available news digests. "
 "For configuration instructions, see <link linkend=\"bstfw13\">Remote "
@@ -1179,16 +1235,16 @@ msgstr ""
 "nouvelles. Pour des instructions de configuration, consultez <link linkend="
 "\"bstfw13\">Options de configuration distantes</link>."
 
-#: ../C/evolution.xml:299(title)
+#: ../C/evolution.xml:294(title)
 msgid "Local Delivery:"
 msgstr "Distribution locale :"
 
-#: ../C/evolution.xml:300(para)
+#: ../C/evolution.xml:295(para)
 msgid ""
-"Choose this option if you want to move e-mail from the spool (the location "
+"Choose this option if you want to move email from the spool (the location "
 "where mail waits for delivery) and store it in your home directory. You need "
 "to provide the path to the mail spool you want to use. If you want to leave "
-"e-mail in your system's spool files, choose the Standard Unix Mbox Spool "
+"email in your system's spool files, choose the Standard Unix Mbox Spool "
 "option instead. For configuration instructions, see <link linkend=\"bstgbqn"
 "\">Local Configuration Options</link>."
 msgstr ""
@@ -1197,17 +1253,16 @@ msgstr ""
 "dans votre dossier personnel. Vous devez préciser le chemin vers le spool "
 "des messages à utiliser. Si vous souhaitez laisser les courriels dans les "
 "fichiers du spool de votre système, choisissez de préférence l'option "
-"« Répertoire ou stockage Unix Mbox ». Pour des instructions de "
-"configuration, consultez <link linkend=\"bstgbqn\">Options de configuration "
-"locales</link>."
+"« Répertoire ou stockage Unix Mbox ». Pour des instructions de configuration, "
+"consultez <link linkend=\"bstgbqn\">Options de configuration locales</link>."
 
-#: ../C/evolution.xml:303(title)
+#: ../C/evolution.xml:298(title)
 msgid "MH Format Mail Directories:"
 msgstr "Répertoires au format MH :"
 
-#: ../C/evolution.xml:304(para)
+#: ../C/evolution.xml:299(para)
 msgid ""
-"If you download your e-mail using mh or another MH-style program, you should "
+"If you download your email using mh or another MH-style program, you should "
 "use this option. You need to provide the path to the mail directory you want "
 "to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local "
 "Configuration Options</link>."
@@ -1218,16 +1273,16 @@ msgstr ""
 "configuration, consultez <link linkend=\"bstgbqn\">Options de configuration "
 "locales</link>."
 
-#: ../C/evolution.xml:307(title)
+#: ../C/evolution.xml:302(title)
 msgid "Maildir Format Mail Directories:"
 msgstr "Répertoires au format Maildir :"
 
-#: ../C/evolution.xml:308(para)
+#: ../C/evolution.xml:303(para)
 msgid ""
-"If you download your e-mail using Qmail or another maildir-style program, "
-"you should use this option. You need to provide the path to the mail "
-"directory you want to use. For configuration instructions, see <link linkend="
-"\"bstgbqn\">Local Configuration Options</link>."
+"If you download your email using Qmail or another maildir-style program, you "
+"should use this option. You need to provide the path to the mail directory "
+"you want to use. For configuration instructions, see <link linkend=\"bstgbqn"
+"\">Local Configuration Options</link>."
 msgstr ""
 "Si vous téléchargez vos courriels avec Qmail ou un autre programme du même "
 "style, vous devriez utiliser cette option. Vous devez fournir le chemin "
@@ -1235,13 +1290,13 @@ msgstr ""
 "configuration, consultez <link linkend=\"bstgbqn\">Options de configuration "
 "locales</link>."
 
-#: ../C/evolution.xml:311(title)
+#: ../C/evolution.xml:306(title)
 msgid "Standard Unix mbox spool file:"
 msgstr "Fichier de stockage Unix Mbox standard :"
 
-#: ../C/evolution.xml:312(para)
+#: ../C/evolution.xml:307(para)
 msgid ""
-"If you want to read and store e-mail in the mail spool file on your local "
+"If you want to read and store email in the mail spool file on your local "
 "system, choose this option. You need to provide the path to the mail spool "
 "file you want to use. For configuration instructions, see <link linkend="
 "\"bstgbqn\">Local Configuration Options</link>."
@@ -1252,13 +1307,13 @@ msgstr ""
 "instructions de configuration, consultez <link linkend=\"bstgbqn\">Options "
 "de configuration locales</link>."
 
-#: ../C/evolution.xml:315(title)
+#: ../C/evolution.xml:310(title)
 msgid "Standard Unix mbox spool directory:"
 msgstr "Répertoire de stockage Unix Mbox standard :"
 
-#: ../C/evolution.xml:316(para)
+#: ../C/evolution.xml:311(para)
 msgid ""
-"If you want to read and store e-mail in the mail spool directory on your "
+"If you want to read and store email in the mail spool directory on your "
 "local system, choose this option. You need to provide the path to the mail "
 "spool directory you want to use. For configuration instructions, see <link "
 "linkend=\"bstgbqn\">Local Configuration Options</link>."
@@ -1269,23 +1324,23 @@ msgstr ""
 "instructions de configuration, consultez <link linkend=\"bstgbqn\">Options "
 "de configuration locales</link>."
 
-#: ../C/evolution.xml:319(title) ../C/evolution.xml:5274(title)
+#: ../C/evolution.xml:314(title) ../C/evolution.xml:5251(title)
 msgid "None:"
 msgstr "Aucun :"
 
-#: ../C/evolution.xml:320(para)
+#: ../C/evolution.xml:315(para)
 msgid ""
-"Select this if you do not plan to check e-mail with this account. If you "
+"Select this if you do not plan to check email with this account. If you "
 "select this, there are no configuration options."
 msgstr ""
 "Cochez ceci si vous ne souhaitez pas relever vos courriels avec ce compte. "
 "Si vous choisissez cette option, aucune autre configuration n'est nécessaire."
 
-#: ../C/evolution.xml:326(title)
+#: ../C/evolution.xml:321(title)
 msgid "Remote Configuration Options"
 msgstr "Options de configuration distantes"
 
-#: ../C/evolution.xml:327(para)
+#: ../C/evolution.xml:322(para)
 msgid ""
 "If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, "
 "you need to specify additional information."
@@ -1293,89 +1348,91 @@ msgstr ""
 "Si vous choisissez un serveur parmi Novell GroupWise, IMAP, POP ou les news "
 "USENET, vous devez définir des informations supplémentaires."
 
-#: ../C/evolution.xml:330(para)
-msgid "Type the server name of your e-mail server in the Server field."
+#: ../C/evolution.xml:325(para) ../C/evolution.xml:688(para)
+msgid "Type the server name of your email server in the Server field."
 msgstr "Saisissez le nom du serveur de courriel dans le champ « Serveur »."
 
-#: ../C/evolution.xml:331(para)
-msgid "If you don't know the Server, contact your administrator."
-msgstr "Si vous ne connaissez pas le nom du serveur, contactez votre administrateur."
-
-#: ../C/evolution.xml:334(para)
-msgid "Type your username for the account in the Username field."
+#: ../C/evolution.xml:326(para) ../C/evolution.xml:689(para)
+msgid ""
+"If you are unsure what your Server address is, contact your system "
+"administrator."
 msgstr ""
-"Saisissez votre nom d'utilisateur pour le compte dans le champ « Nom "
-"d'utilisateur »."
+"Si vous n'êtes pas certain de l'adresse du serveur, contactez votre "
+"administrateur système."
+
+#: ../C/evolution.xml:329(para) ../C/evolution.xml:701(para)
+msgid "Type your username in the Username field."
+msgstr "Saisissez votre nom d'utilisateur dans le champ « Nom d'utilisateur »."
+
+#: ../C/evolution.xml:332(para) ../C/evolution.xml:709(para)
+msgid "Select if you want to use a secure connection (SSL or TLS)."
+msgstr "Cochez si vous voulez utiliser une connexion sécurisée (SSL ou TLS)."
 
-#: ../C/evolution.xml:337(para)
-msgid "Select to use a secure (SSL) connection."
-msgstr "Choisissez une option de connexion sécurisée (SSL)"
+#: ../C/evolution.xml:333(para)
+msgid "You should enable this option if your server supports it."
+msgstr "Vous devriez activer cette option si votre serveur la prend en charge."
 
-#: ../C/evolution.xml:338(para)
+#: ../C/evolution.xml:334(para) ../C/evolution.xml:340(para)
 msgid ""
-"If your server supports secure connections, you should enable this security "
-"option. If you are unsure if your server supports a secure connection, "
-"contact your system administrator."
+"Free webmail providers usually supply information about which of these "
+"options can be used. If you are in an organizational environment, you may "
+"want to contact your system administrator for more information."
 msgstr ""
-"Si votre serveur gère des connexions sécurisées, vous devriez activer cette "
-"option de sécurité. Si vous n'êtes pas sûr que votre serveur gère les "
-"connexions sécurisées, contacter votre administrateur système."
+"Les fournisseurs de messagerie Web gratuite fournissent en général des "
+"informations sur la possibilité d'utiliser ces options. Si vous êtes dans un "
+"environnement organisationnel, contactez votre administrateur système pour "
+"obtenir de plus amples informations."
 
-#: ../C/evolution.xml:341(para) ../C/evolution.xml:693(para)
+#: ../C/evolution.xml:337(para) ../C/evolution.xml:696(para)
+#: ../C/evolution.xml:5080(para)
 msgid "Select your authentication type in the Authentication list."
 msgstr ""
 "Choisissez le type d'authentification dans la liste des types "
 "d'authentification."
 
-#: ../C/evolution.xml:342(para) ../C/evolution.xml:694(para)
-#: ../C/evolution.xml:727(para) ../C/evolution.xml:1932(para)
-#: ../C/evolution.xml:2055(para) ../C/evolution.xml:2063(para)
-#: ../C/evolution.xml:2223(para) ../C/evolution.xml:3000(para)
-#: ../C/evolution.xml:3005(para) ../C/evolution.xml:3433(para)
-#: ../C/evolution.xml:3448(para) ../C/evolution.xml:3456(para)
-#: ../C/evolution.xml:3789(para) ../C/evolution.xml:3791(para)
-#: ../C/evolution.xml:3793(para) ../C/evolution.xml:3812(para)
-#: ../C/evolution.xml:3823(para) ../C/evolution.xml:3828(para)
-#: ../C/evolution.xml:3848(para) ../C/evolution.xml:3856(para)
-#: ../C/evolution.xml:3987(para) ../C/evolution.xml:3997(para)
-#: ../C/evolution.xml:4005(para) ../C/evolution.xml:4010(para)
-#: ../C/evolution.xml:4356(para) ../C/evolution.xml:4375(para)
-#: ../C/evolution.xml:4407(para) ../C/evolution.xml:4420(para)
-#: ../C/evolution.xml:4642(para) ../C/evolution.xml:6144(para)
-#: ../C/evolution.xml:6828(para) ../C/evolution.xml:6894(para)
+#: ../C/evolution.xml:338(para) ../C/evolution.xml:697(para)
+#: ../C/evolution.xml:730(para) ../C/evolution.xml:1946(para)
+#: ../C/evolution.xml:2070(para) ../C/evolution.xml:2078(para)
+#: ../C/evolution.xml:2245(para) ../C/evolution.xml:3023(para)
+#: ../C/evolution.xml:3028(para) ../C/evolution.xml:3454(para)
+#: ../C/evolution.xml:3469(para) ../C/evolution.xml:3477(para)
+#: ../C/evolution.xml:3810(para) ../C/evolution.xml:3812(para)
+#: ../C/evolution.xml:3814(para) ../C/evolution.xml:3834(para)
+#: ../C/evolution.xml:3845(para) ../C/evolution.xml:3850(para)
+#: ../C/evolution.xml:3871(para) ../C/evolution.xml:3879(para)
+#: ../C/evolution.xml:3995(para) ../C/evolution.xml:4006(para)
+#: ../C/evolution.xml:4011(para) ../C/evolution.xml:4022(para)
+#: ../C/evolution.xml:4030(para) ../C/evolution.xml:4035(para)
+#: ../C/evolution.xml:4381(para) ../C/evolution.xml:4400(para)
+#: ../C/evolution.xml:4432(para) ../C/evolution.xml:4445(para)
+#: ../C/evolution.xml:4667(para) ../C/evolution.xml:6109(para)
+#: ../C/evolution.xml:6792(para) ../C/evolution.xml:6858(para)
 msgid "or"
 msgstr "ou"
 
-#: ../C/evolution.xml:343(para) ../C/evolution.xml:695(para)
+#: ../C/evolution.xml:339(para) ../C/evolution.xml:698(para)
 msgid ""
 "Click Check for Supported Types to have Evolution check for supported types. "
 "Some servers do not announce the authentication mechanisms they support, so "
 "clicking this button is not a guarantee that available mechanisms actually "
 "work."
 msgstr ""
-"Cliquez sur « Vérifier les types supportés » pour que Evolution vérifie "
-"quels sont les types supportés. Certains serveurs ne signalent pas les "
-"mécanismes d'authentification qu'ils prennent en charge, ce qui signifie que "
-"cette fonction ne garantit pas que les mécanismes disponibles fonctionnent "
+"Cliquez sur « Vérifier les types supportés » pour que Evolution vérifie quels "
+"sont les types supportés. Certains serveurs ne signalent pas les mécanismes "
+"d'authentification qu'ils prennent en charge, ce qui signifie que cette "
+"fonction ne garantit pas que les mécanismes disponibles fonctionnent "
 "réellement."
 
-#: ../C/evolution.xml:344(para)
-msgid ""
-"If you are unsure what authentication type you need, contact your system "
-"administrator."
-msgstr ""
-"Si vous n'êtes pas sûr du type d'authentification dont vous avez besoin, "
-"contactez votre administrateur système."
-
-#: ../C/evolution.xml:347(para) ../C/evolution.xml:701(para)
+#: ../C/evolution.xml:343(para) ../C/evolution.xml:704(para)
 msgid "Select if you want Evolution to remember your password."
-msgstr "Cochez si vous souhaitez qu'Evolution se souvienne de votre mot de passe."
+msgstr ""
+"Cochez si vous souhaitez qu'Evolution se souvienne de votre mot de passe."
 
-#: ../C/evolution.xml:353(para)
+#: ../C/evolution.xml:349(para)
 msgid ""
 "(Conditional) If you chose Microsoft Exchange as the server type, provide "
 "your username in the Username field and your Outlook Web Access (OWA) URL in "
-"the OWA URL field. The URL and the usernames should use the Outlook format."
+"the OWA URL field. The URL and the usernames should use the Outlook format. "
 "If the mailbox path is different from the username, the OWA path should also "
 "include mailbox path, for example http://<varname>server name</varname>/"
 "exchange/<varname>mail box path</varname>."
@@ -1389,7 +1446,7 @@ msgstr ""
 "<varname>nom du serveur</varname>/exchange/<varname>chemin vers la boîte de "
 "messagerie</varname>."
 
-#: ../C/evolution.xml:354(para)
+#: ../C/evolution.xml:350(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -1397,17 +1454,17 @@ msgstr ""
 "Lorsque vous avez terminé, continuez avec <link linkend=\"more-mail-options"
 "\">Options de réception des messages</link>."
 
-#: ../C/evolution.xml:358(title)
+#: ../C/evolution.xml:354(title)
 msgid "Local Configuration Options"
 msgstr "Options de configuration locales"
 
-#: ../C/evolution.xml:359(para)
+#: ../C/evolution.xml:355(para)
 msgid ""
 "If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format "
-"Mail Directories, or Standard Unix mbox spool file and Standard Unix mbox "
-"spool directory, you must specify the path to the local files in the path "
-"field. Continue with<link linkend=\"more-mail-options\">Receiving Mail "
-"Options</link> ."
+"Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool "
+"directory, you must specify the path to the local files in the path field. "
+"Continue with<link linkend=\"more-mail-options\">Receiving Mail Options</"
+"link>."
 msgstr ""
 "Si vous avez choisi Distribution locale, Répertoires au format MH, "
 "Répertoires au format Maildir, fichier ou répertoire spool Unix Mbox "
@@ -1415,7 +1472,7 @@ msgstr ""
 "sous la rubrique Chemin. Poursuivez ensuite avec <link linkend=\"more-mail-"
 "options\">Options de réception des messages</link>."
 
-#: ../C/evolution.xml:365(para)
+#: ../C/evolution.xml:361(para)
 msgid ""
 "After you have selected a mail delivery mechanism, you can set some "
 "preferences for its behavior."
@@ -1423,43 +1480,43 @@ msgstr ""
 "Après avoir choisi un moyen de distribution des messages, vous pouvez "
 "définir certaines préférences de fonctionnement."
 
-#: ../C/evolution.xml:368(link) ../C/evolution.xml:397(title)
+#: ../C/evolution.xml:364(link) ../C/evolution.xml:393(title)
 msgid "Novell GroupWise Receiving Options"
 msgstr "Options de réception Novell GroupWise"
 
-#: ../C/evolution.xml:371(link) ../C/evolution.xml:437(title)
+#: ../C/evolution.xml:367(link) ../C/evolution.xml:433(title)
 msgid "Microsoft Exchange Receiving Options"
 msgstr "Options de réception Microsoft Exchange"
 
-#: ../C/evolution.xml:374(link) ../C/evolution.xml:478(title)
+#: ../C/evolution.xml:370(link) ../C/evolution.xml:474(title)
 msgid "IMAP Receiving Options"
 msgstr "Options de réception IMAP"
 
-#: ../C/evolution.xml:377(link) ../C/evolution.xml:522(title)
+#: ../C/evolution.xml:373(link) ../C/evolution.xml:518(title)
 msgid "POP Receiving Options"
 msgstr "Options de réception POP"
 
-#: ../C/evolution.xml:380(link) ../C/evolution.xml:543(title)
+#: ../C/evolution.xml:376(link) ../C/evolution.xml:540(title)
 msgid "USENET News Receiving Options"
 msgstr "Options de réception USENET News"
 
-#: ../C/evolution.xml:383(link) ../C/evolution.xml:566(title)
+#: ../C/evolution.xml:379(link) ../C/evolution.xml:564(title)
 msgid "Local Delivery Receiving Options"
 msgstr "Options de réception de la distribution locale des messages"
 
-#: ../C/evolution.xml:386(link) ../C/evolution.xml:580(title)
+#: ../C/evolution.xml:382(link) ../C/evolution.xml:579(title)
 msgid "MH-Format Mail Directories Receiving Options"
 msgstr "Options de réception utilisant le format de courrier MH"
 
-#: ../C/evolution.xml:389(link) ../C/evolution.xml:599(title)
+#: ../C/evolution.xml:385(link) ../C/evolution.xml:599(title)
 msgid "Maildir-Format Mail Directories Receiving Options"
 msgstr "Options de réception utilisant le format de courrier Maildir"
 
-#: ../C/evolution.xml:392(link) ../C/evolution.xml:619(title)
+#: ../C/evolution.xml:388(link) ../C/evolution.xml:620(title)
 msgid "Standard Unix mbox spool file Receiving Options"
 msgstr "Options de réception utilisant le standard Unix Mbox"
 
-#: ../C/evolution.xml:398(para)
+#: ../C/evolution.xml:394(para)
 msgid ""
 "If you select Novell GroupWise as your receiving server type, you need to "
 "specify the following options:"
@@ -1467,15 +1524,23 @@ msgstr ""
 "Si vous choisissez Novell GroupWise comme type de serveur pour la réception, "
 "vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:401(para) ../C/evolution.xml:442(para)
-#: ../C/evolution.xml:483(para)
+#: ../C/evolution.xml:397(para) ../C/evolution.xml:438(para)
+#: ../C/evolution.xml:479(para) ../C/evolution.xml:523(para)
+#: ../C/evolution.xml:545(para) ../C/evolution.xml:568(para)
+#: ../C/evolution.xml:583(para) ../C/evolution.xml:603(para)
+#: ../C/evolution.xml:623(para) ../C/evolution.xml:646(para)
+#: ../C/evolution.xml:5658(para)
 msgid "Select if you want Evolution to automatically check for new mail."
 msgstr ""
 "Choisissez si vous voulez qu'Evolution relève automatiquement les nouveaux "
 "messages."
 
-#: ../C/evolution.xml:402(para) ../C/evolution.xml:443(para)
-#: ../C/evolution.xml:484(para) ../C/evolution.xml:5681(para)
+#: ../C/evolution.xml:398(para) ../C/evolution.xml:439(para)
+#: ../C/evolution.xml:480(para) ../C/evolution.xml:524(para)
+#: ../C/evolution.xml:546(para) ../C/evolution.xml:569(para)
+#: ../C/evolution.xml:584(para) ../C/evolution.xml:604(para)
+#: ../C/evolution.xml:624(para) ../C/evolution.xml:647(para)
+#: ../C/evolution.xml:5659(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "check for new messages."
@@ -1483,23 +1548,26 @@ msgstr ""
 "Avec cette option, vous devez aussi indiquer la fréquence de la recherche de "
 "nouveaux messages."
 
-#: ../C/evolution.xml:405(para) ../C/evolution.xml:446(para)
-#: ../C/evolution.xml:5686(para)
+#: ../C/evolution.xml:401(para) ../C/evolution.xml:442(para)
+#: ../C/evolution.xml:5664(para)
 msgid "Select if you want to check for new messages in all folders."
 msgstr ""
 "Choisissez si vous voulez relever les nouveaux messages dans tous les "
 "dossiers."
 
-#: ../C/evolution.xml:408(para) ../C/evolution.xml:5689(para)
+#: ../C/evolution.xml:404(para) ../C/evolution.xml:460(para)
+#: ../C/evolution.xml:495(para) ../C/evolution.xml:607(para)
+#: ../C/evolution.xml:627(para) ../C/evolution.xml:650(para)
+#: ../C/evolution.xml:5667(para)
 msgid ""
-"Select if you want to apply filters to new messages in the Inbox on the "
-"server."
+"Select Apply filters to new messages in inbox on this server if you want to "
+"apply filters."
 msgstr ""
-"Choisissez si vous souhaitez que les filtres s'appliquent aux nouveaux "
-"messages dans la boîte de réception sur le serveur."
+"Cochez « Appliquer les filtres aux nouveaux messages dans la boîte de "
+"réception sur ce serveur »pour appliquer les filtres."
 
-#: ../C/evolution.xml:409(para) ../C/evolution.xml:500(para)
-#: ../C/evolution.xml:607(para) ../C/evolution.xml:5690(para)
+#: ../C/evolution.xml:405(para) ../C/evolution.xml:496(para)
+#: ../C/evolution.xml:608(para) ../C/evolution.xml:5668(para)
 msgid ""
 "For additional information on filtering, see <link linkend=\"usage-mail-org-"
 "filters-new\">Creating New Filter Rules</link>."
@@ -1508,36 +1576,40 @@ msgstr ""
 "<link linkend=\"usage-mail-org-filters-new\">Création de nouvelles règles de "
 "filtrage</link>."
 
-#: ../C/evolution.xml:412(para) ../C/evolution.xml:503(para)
-#: ../C/evolution.xml:5693(para)
+#: ../C/evolution.xml:408(para) ../C/evolution.xml:463(para)
+#: ../C/evolution.xml:499(para) ../C/evolution.xml:5671(para)
 msgid "Select if you want to check new messages for junk content."
 msgstr ""
 "Choisissez si vous voulez vérifier si les nouveaux messages contiennent du "
 "pourriel."
 
-#: ../C/evolution.xml:413(para)
+#: ../C/evolution.xml:409(para) ../C/evolution.xml:464(para)
+#: ../C/evolution.xml:500(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"usage-mail-"
 "organize-spam\">Stopping Junk Mail (Spam)</link> and <link linkend=\"mail-"
-"prefs-junk\">Junk Mail Preferences</link>."
+"prefs-junk\">Junk</link>."
 msgstr ""
 "Pour obtenir des informations supplémentaires sur le pourriel, consultez "
 "<link linkend=\"usage-mail-organize-spam\">Lutte contre le pourriel (spam)</"
-"link> et <link linkend=\"mail-prefs-junk\">Préférences du pourriel</link>."
+"link> et <link linkend=\"mail-prefs-junk\">Pourriel</link>."
 
-#: ../C/evolution.xml:416(para) ../C/evolution.xml:5697(para)
+#: ../C/evolution.xml:412(para) ../C/evolution.xml:5675(para)
 msgid "Select if you want to only check for junk messages in the Inbox folder."
 msgstr ""
 "Choisissez si vous ne souhaitez contrôler le pourriel que dans la boîte de "
 "réception."
 
-#: ../C/evolution.xml:419(para) ../C/evolution.xml:510(para)
-msgid "Select if you want to automatically synchronize remote mail locally."
+#: ../C/evolution.xml:415(para) ../C/evolution.xml:457(para)
+#: ../C/evolution.xml:506(para)
+msgid ""
+"Select Automatically synchronize remote mail locally to download the "
+"messages to your local system."
 msgstr ""
-"Choisissez si vous voulez synchroniser automatiquement les messages distants "
-"en local."
+"Cochez « Synchroniser automatiquement le compte en local » pour télécharger "
+"les messages sur votre système local."
 
-#: ../C/evolution.xml:420(para) ../C/evolution.xml:511(para)
+#: ../C/evolution.xml:416(para) ../C/evolution.xml:507(para)
 msgid ""
 "Evolution, by default downloads only the header information such as From, "
 "Subject, and Date. The body of the message and the attachments are "
@@ -1552,19 +1624,19 @@ msgstr ""
 "particulièrement utile lorsque vous ne lisez pas tous les messages que vous "
 "recevez."
 
-#: ../C/evolution.xml:421(para)
+#: ../C/evolution.xml:417(para) ../C/evolution.xml:508(para)
 msgid ""
 "If you check this option, evolution fetches the headers as well as the body "
 "of the message simultaneously. In this case, the time taken to open a "
-"message is comparitevely less. In addition to that, you can download the "
-"mails for reading them offline, when you have checked this option."
+"message is comparatively less. In addition to that, you can download the "
+"mail for reading them offline, when you have checked this option."
 msgstr ""
 "Si vous cochez cette option, Evolution récupère aussi bien les en-têtes que "
 "le corps du message. Dans ce cas, le temps nécessaire à l'ouverture d'un "
 "message est plus faible. De plus, avec cette option activée, il est alors "
 "possible de télécharger les messages afin de les lire en mode déconnecté."
 
-#: ../C/evolution.xml:424(para)
+#: ../C/evolution.xml:420(para)
 msgid ""
 "Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -1572,7 +1644,7 @@ msgstr ""
 "Saisissez le port SOAP de l'agent de bureau de poste dans le champ "
 "correspondant."
 
-#: ../C/evolution.xml:425(para) ../C/evolution.xml:5708(para)
+#: ../C/evolution.xml:421(para) ../C/evolution.xml:5686(para)
 msgid ""
 "If you are unsure what your Post Office Agent SOAP port is, contact your "
 "system administrator."
@@ -1580,11 +1652,11 @@ msgstr ""
 "Si vous n'êtes pas certain de ce qu'est le port SOAP de l'agent de bureau de "
 "poste, contactez votre administrateur système."
 
-#: ../C/evolution.xml:433(para) ../C/evolution.xml:474(para)
-#: ../C/evolution.xml:518(para) ../C/evolution.xml:539(para)
-#: ../C/evolution.xml:562(para) ../C/evolution.xml:576(para)
-#: ../C/evolution.xml:595(para) ../C/evolution.xml:615(para)
-#: ../C/evolution.xml:636(para) ../C/evolution.xml:658(para)
+#: ../C/evolution.xml:429(para) ../C/evolution.xml:470(para)
+#: ../C/evolution.xml:514(para) ../C/evolution.xml:536(para)
+#: ../C/evolution.xml:560(para) ../C/evolution.xml:575(para)
+#: ../C/evolution.xml:595(para) ../C/evolution.xml:616(para)
+#: ../C/evolution.xml:638(para) ../C/evolution.xml:661(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"third-step\">Sending "
 "Mail</link>."
@@ -1592,7 +1664,7 @@ msgstr ""
 "Lorsque vous avez terminé, poursuivez avec <link linkend=\"third-step"
 "\">Envoi de messages</link>."
 
-#: ../C/evolution.xml:438(para)
+#: ../C/evolution.xml:434(para)
 msgid ""
 "If you select Microsoft Exchange as your receiving server type, you need to "
 "specify the following options:"
@@ -1600,13 +1672,14 @@ msgstr ""
 "Si vous choisissez Microsoft Exchange comme type de serveur pour la "
 "réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:449(para)
+#: ../C/evolution.xml:445(para)
 msgid ""
 "Specify the Global Catalog server name in the Global Catalog Server Name "
 "field."
-msgstr "Indiquez le nom du serveur de catalogue global dans le champ correspondant."
+msgstr ""
+"Indiquez le nom du serveur de catalogue global dans le champ correspondant."
 
-#: ../C/evolution.xml:450(para)
+#: ../C/evolution.xml:446(para)
 msgid ""
 "The Global Catalog Server contains the user information for users. If you "
 "are unsure what your Global Catalog server name is, contact your system "
@@ -1616,28 +1689,28 @@ msgstr ""
 "utilisateurs. Si vous n'êtes pas certain de connaître le nom de ce serveur, "
 "contactez votre administrateur système."
 
-#: ../C/evolution.xml:453(para)
+#: ../C/evolution.xml:449(para)
 msgid "Select if you want to limit the number of Global Address Lists (GAL)."
 msgstr ""
 "Choisissez si vous souhaitez limiter le nombre de réponses de liste "
 "d'adresses globale (GAL)."
 
-#: ../C/evolution.xml:454(para)
+#: ../C/evolution.xml:450(para)
 msgid ""
-"The GAL contains a list of all e-mail addresses. If you select this option, "
+"The GAL contains a list of all email addresses. If you select this option, "
 "you need to specify the maximum number of responses."
 msgstr ""
 "La liste d'adresses globale contient la liste de toutes les adresses "
 "électroniques. Si vous choisissez cette option, vous devez indiquer le "
 "nombre maximum de réponses."
 
-#: ../C/evolution.xml:457(para)
+#: ../C/evolution.xml:453(para)
 msgid "Select if you want to use a password expire warning time period."
 msgstr ""
 "Choisissez si vous voulez activer une période d'avertissement d'expiration "
 "du mot de passe."
 
-#: ../C/evolution.xml:458(para)
+#: ../C/evolution.xml:454(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "send the password expire message."
@@ -1645,39 +1718,7 @@ msgstr ""
 "Si vous choisissez cette option, vous devez indiquer la fréquence de l'envoi "
 "par Evolution du message d'expiration du mot de passe."
 
-#: ../C/evolution.xml:461(para)
-msgid ""
-"Select automatically synchronize remote mail locally to download the "
-"messages to your local system."
-msgstr ""
-"Cochez « Synchroniser automatiquement le compte en local » pour télécharger "
-"les messages sur votre système local."
-
-#: ../C/evolution.xml:464(para)
-msgid ""
-"Select apply filters to new messages in inbox on this server to apply "
-"filters."
-msgstr ""
-"Cochez « Appliquer les filtres aux nouveaux messages dans la boîte de "
-"réception sur ce serveur »pour appliquer les filtres."
-
-#: ../C/evolution.xml:467(para)
-msgid ""
-"Select check new messages for junk contents to filter new messages for spam "
-"messages."
-msgstr ""
-"Cochez « Vérifier si les nouveaux messages contiennent du contenu "
-"indésirable » pour filtrer le pourriel dans les nouveaux messages."
-
-#: ../C/evolution.xml:468(para)
-msgid ""
-"For more information refer <link linkend=\"usage-mail-organize-spam"
-"\">Stopping Junk Mail (Spam)</link>"
-msgstr ""
-"Pour obtenir des informations supplémentaires, consultez <link linkend="
-"\"usage-mail-organize-spam\">Lutte contre le pourriel (spam)</link>."
-
-#: ../C/evolution.xml:479(para)
+#: ../C/evolution.xml:475(para)
 msgid ""
 "If you select IMAP as your receiving server type, you need to specify the "
 "following options:"
@@ -1685,13 +1726,15 @@ msgstr ""
 "Si vous choisissez IMAP comme type de serveur pour la réception, vous devez "
 "compléter les options suivantes :"
 
-#: ../C/evolution.xml:487(para)
-msgid "Select if you want Evolution to use custom commands to connect to Evolution."
+#: ../C/evolution.xml:483(para)
+msgid ""
+"Select if you want Evolution to use custom commands to connect to the IMAP "
+"server."
 msgstr ""
 "Choisissez si vous voulez qu'Evolution utilise une commande personnalisée "
-"pour se connecter au serveur."
+"pour se connecter au serveur IMAP."
 
-#: ../C/evolution.xml:488(para)
+#: ../C/evolution.xml:484(para)
 msgid ""
 "If you select this option, specify the custom command you want Evolution to "
 "use."
@@ -1699,11 +1742,12 @@ msgstr ""
 "Si vous choisissez cette option, indiquez la commande personnalisée "
 "qu'Evolution doit utiliser."
 
-#: ../C/evolution.xml:491(para)
+#: ../C/evolution.xml:487(para)
 msgid "Select if you want Evolution to show only subscribed folders."
-msgstr "Choisissez si vous voulez qu'Evolution n'affiche que les dossiers abonnés."
+msgstr ""
+"Choisissez si vous voulez qu'Evolution n'affiche que les dossiers abonnés."
 
-#: ../C/evolution.xml:492(para)
+#: ../C/evolution.xml:488(para)
 msgid ""
 "Subscribed folders are folders that you have chosen to receive mail from by "
 "subscribing to them."
@@ -1711,13 +1755,14 @@ msgstr ""
 "Les dossiers abonnés sont des dossiers dont vous avez choisi de recevoir les "
 "messages en vous y abonnant."
 
-#: ../C/evolution.xml:495(para)
-msgid "Select if you want Evolution to override server-supplied folder namespaces."
+#: ../C/evolution.xml:491(para)
+msgid ""
+"Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
 "Choisissez si vous voulez qu'Evolution outrepasse l'espace de noms de "
 "dossiers fourni par le serveur."
 
-#: ../C/evolution.xml:496(para)
+#: ../C/evolution.xml:492(para)
 msgid ""
 "By choosing this option you can rename the folders that the server provides. "
 "If you select this option, you need to specify the namespace to use."
@@ -1726,40 +1771,13 @@ msgstr ""
 "serveur. Si vous choisissez cette option, vous devez indiquer l'espace de "
 "nom à utiliser."
 
-#: ../C/evolution.xml:499(para) ../C/evolution.xml:606(para)
-#: ../C/evolution.xml:625(para) ../C/evolution.xml:647(para)
-msgid "Select if you want to apply filters to new messages in the Inbox."
-msgstr ""
-"Choisissez si vous voulez appliquer les filtres aux nouveaux messages dans "
-"la boîte de réception."
-
-#: ../C/evolution.xml:504(para) ../C/evolution.xml:5694(para)
-msgid ""
-"For additional information on junk content, see <link linkend=\"mail-prefs-"
-"junk\">Junk Mail Preferences</link>."
-msgstr ""
-"Pour plus d'informations sur le contenu indésirable, consultez les <link "
-"linkend=\"mail-prefs-junk\">Préférences du pourriel</link>."
-
-#: ../C/evolution.xml:507(para)
+#: ../C/evolution.xml:503(para)
 msgid "Select if you want to check for junk messages in the Inbox folder."
 msgstr ""
 "Choisissez si vous voulez activer la détection du pourriel dans la boîte de "
 "réception."
 
-#: ../C/evolution.xml:512(para)
-msgid ""
-"If you check this option, evolution fetches the headers as well as the body "
-"of the message simultaneously. In this case, the time taken to open a "
-"message is comparatively less. In addition to that, you can download the "
-"mails for reading them offline, when you have checked this option."
-msgstr ""
-"Si vous cochez cette option, Evolution récupère aussi bien les en-têtes que "
-"le corps du message. Dans ce cas, le temps nécessaire à l'ouverture d'un "
-"message est plus faible. De plus, avec cette option activée, il est alors "
-"possible de télécharger les messages afin de les lire en mode déconnecté."
-
-#: ../C/evolution.xml:524(para)
+#: ../C/evolution.xml:520(para)
 msgid ""
 "If you select POP as your receiving server type, you need to specify the "
 "following options:"
@@ -1767,32 +1785,18 @@ msgstr ""
 "Si vous choisissez POP comme type de serveur pour la réception, vous devez "
 "compléter les options suivantes :"
 
-#: ../C/evolution.xml:527(para) ../C/evolution.xml:548(para)
-#: ../C/evolution.xml:570(para) ../C/evolution.xml:584(para)
-#: ../C/evolution.xml:603(para) ../C/evolution.xml:622(para)
-#: ../C/evolution.xml:644(para)
-msgid ""
-"Select if you want Evolution to automatically check for new mail.If you "
-"select this option, you need to specify how often Evolution should check for "
-"new messages."
+#: ../C/evolution.xml:527(para)
+msgid "Select if you want to leave messages on the server."
 msgstr ""
-"Choisissez si vous voulez qu'Evolution relève automatiquement les nouveaux "
-"messages. Si vous choisissez cette option, vous devez indiquer la fréquence "
-"de vérification des nouveaux messages par Evolution."
+"Choisissez si vous voulez laisser une copie des messages sur le serveur."
 
 #: ../C/evolution.xml:530(para)
-msgid "Select if you want to leave messages on the server."
-msgstr "Choisissez si vous voulez laisser une copie des messages sur le serveur."
-
-#: ../C/evolution.xml:533(para)
-msgid ""
-"Select if you want to disable support for all POP3 extensions (support for "
-"POP3)."
+msgid "Select if you want to disable support for all POP3 extensions."
 msgstr ""
 "Choisissez si vous voulez désactiver la prise en charge de toutes les "
-"extensions POP3 (support POP3)."
+"extensions POP3."
 
-#: ../C/evolution.xml:545(para)
+#: ../C/evolution.xml:542(para)
 msgid ""
 "If you select USENET News as your receiving server type, you need to specify "
 "the following options:"
@@ -1800,15 +1804,16 @@ msgstr ""
 "Si vous choisissez Nouvelles USENET comme type de serveur pour la réception, "
 "vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:551(para)
+#: ../C/evolution.xml:549(para)
 msgid "Select if you want to show folders in short notation."
-msgstr "Choisissez si vous voulez que les dossiers s'affichent en notation abrégée."
+msgstr ""
+"Choisissez si vous voulez que les dossiers s'affichent en notation abrégée."
 
-#: ../C/evolution.xml:552(para)
+#: ../C/evolution.xml:550(para)
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr "Par exemple, comp.os.linux est affiché sous la forme c.o.linux."
 
-#: ../C/evolution.xml:555(para)
+#: ../C/evolution.xml:553(para)
 msgid ""
 "Select if you want to show relative folder names in the subscription dialog "
 "box."
@@ -1816,7 +1821,7 @@ msgstr ""
 "Choisissez si vous voulez afficher les noms de dossiers relatifs dans la "
 "boîte de dialogue d'abonnement."
 
-#: ../C/evolution.xml:556(para)
+#: ../C/evolution.xml:554(para)
 msgid ""
 "If you select to show relative folder names in the subscription page, only "
 "the name of the folder is displayed. For example the folder evolution.mail "
@@ -1826,7 +1831,7 @@ msgstr ""
 "d'abonnement, seuls les noms des dossiers sont affichés. Par exemple, le "
 "dossier « evolution.mail » apparaît sous la forme « evolution »."
 
-#: ../C/evolution.xml:567(para)
+#: ../C/evolution.xml:565(para)
 msgid ""
 "If you select Local Delivery as your receiving server type, you need to "
 "specify the following options:"
@@ -1834,7 +1839,7 @@ msgstr ""
 "Si vous choisissez Distribution locale comme type de serveur pour la "
 "réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:581(para)
+#: ../C/evolution.xml:580(para)
 msgid ""
 "If you select MH-Format Mail Directories as your receiving server type, you "
 "need to specify the following options:"
@@ -1843,7 +1848,8 @@ msgstr ""
 "serveur pour la réception, vous devez compléter les options suivantes :"
 
 #: ../C/evolution.xml:587(para)
-msgid "Select if you want to use the <emphasis>.folders</emphasis> summary file."
+msgid ""
+"Select if you want to use the <emphasis>.folders</emphasis> summary file."
 msgstr ""
 "Choisissez si vous voulez utiliser le fichier de résumé de dossiers "
 "<emphasis>.folders</emphasis>."
@@ -1856,25 +1862,26 @@ msgstr ""
 "Si vous choisissez Répertoires de courriels au format Maildir comme type de "
 "serveur pour la réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:628(para) ../C/evolution.xml:650(para)
-msgid "Select if you want to store status headers in Elm, Pine, and Mutt formats."
+#: ../C/evolution.xml:630(para) ../C/evolution.xml:653(para)
+msgid ""
+"Select if you want to store status headers in Elm, Pine, and Mutt formats."
 msgstr ""
 "Choisissez si vous voulez stocker les en-têtes de statut au format Elm, Pine "
 "et Mutt."
 
-#: ../C/evolution.xml:640(title)
+#: ../C/evolution.xml:642(title)
 msgid "Standard Unix mbox spool directory Receiving Options"
 msgstr "Options de réception utilisant le répertoire standard Unix Mbox"
 
-#: ../C/evolution.xml:641(para)
+#: ../C/evolution.xml:643(para)
 msgid ""
-"If you select Standard Unix Mbox Spool directory as your receiving server "
+"If you select Standard Unix mbox Spool directory as your receiving server "
 "type, you need to specify the following options:"
 msgstr ""
 "Si vous choisissez Répertoire spool au standard Unix Mbox comme type de "
 "serveur pour la réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:664(para)
+#: ../C/evolution.xml:667(para)
 msgid ""
 "Now that you have entered information about how you plan to get mail, "
 "Evolution needs to know about how you want to send it."
@@ -1882,19 +1889,19 @@ msgstr ""
 "Après avoir saisi les informations concernant la manière de recevoir les "
 "messages, Evolution doit être renseigné sur la manière de les envoyer."
 
-#: ../C/evolution.xml:667(para)
+#: ../C/evolution.xml:670(para)
 msgid "Select a server type from the Server Type list."
 msgstr "Sélectionnez un type de serveur dans la liste « Type de serveur »."
 
-#: ../C/evolution.xml:668(para)
+#: ../C/evolution.xml:671(para)
 msgid "The following server types are available:"
 msgstr "Voici les types de serveur disponibles :"
 
-#: ../C/evolution.xml:670(title)
+#: ../C/evolution.xml:673(title)
 msgid "Sendmail:"
 msgstr "Sendmail :"
 
-#: ../C/evolution.xml:671(para)
+#: ../C/evolution.xml:674(para)
 msgid ""
 "Uses the Sendmail program to send mail from your system. Sendmail is more "
 "flexible, but is not as easy to configure, so you should select this option "
@@ -1905,11 +1912,11 @@ msgstr ""
 "option ne devrait donc être choisie que si vous savez comment configurer un "
 "service Sendmail."
 
-#: ../C/evolution.xml:674(title)
+#: ../C/evolution.xml:677(title)
 msgid "SMTP:"
 msgstr "SMTP :"
 
-#: ../C/evolution.xml:675(para)
+#: ../C/evolution.xml:678(para)
 msgid ""
 "Sends mail using an outbound mail server. This is the most common choice for "
 "sending mail. If you choose SMTP, there are additional configuration "
@@ -1921,27 +1928,15 @@ msgstr ""
 "options de configuration supplémentaires s'offrent à vous. Consultez <link "
 "linkend=\"bsthwzo\">Configuration SMTP</link> pour en savoir plus à ce sujet."
 
-#: ../C/evolution.xml:681(title)
+#: ../C/evolution.xml:684(title)
 msgid "SMTP Configuration"
 msgstr "Configuration SMTP"
 
-#: ../C/evolution.xml:685(para)
-msgid "Type the Server address in the Server field."
-msgstr "Saisissez l'adresse du serveur dans le champ « Serveur »."
-
-#: ../C/evolution.xml:686(para)
-msgid ""
-"If you are unsure what your Server address is, contact your system "
-"administrator."
-msgstr ""
-"Si vous n'êtes pas certain de l'adresse du serveur, contactez votre "
-"administrateur système."
-
-#: ../C/evolution.xml:689(para)
+#: ../C/evolution.xml:692(para)
 msgid "Select if your server requires authentication."
 msgstr "Cochez si votre serveur demande une authentification."
 
-#: ../C/evolution.xml:690(para)
+#: ../C/evolution.xml:693(para)
 msgid ""
 "If you selected that your server requires authentication, you need to "
 "provide the following information:"
@@ -1949,21 +1944,13 @@ msgstr ""
 "Si vous avez indiqué que votre serveur demande une authentification, vous "
 "devez fournir les informations suivantes :"
 
-#: ../C/evolution.xml:698(para)
-msgid "Type your username in the Username field."
-msgstr "Saisissez votre nom d'utilisateur dans le champ « Nom d'utilisateur »."
-
-#: ../C/evolution.xml:706(para)
-msgid "Select if you use a secure connection (SSL)."
-msgstr "Cochez si vous utilisez une connexion sécurisée (SSL)."
-
-#: ../C/evolution.xml:712(para)
+#: ../C/evolution.xml:715(para)
 msgid "Continue with <link linkend=\"bsti1ty\">Account Management</link>."
 msgstr "Poursuivez avec <link linkend=\"bsti1ty\">Gestion du compte</link>."
 
-#: ../C/evolution.xml:718(para)
+#: ../C/evolution.xml:721(para)
 msgid ""
-"Now that you have finished the e-mail configuration process you need to give "
+"Now that you have finished the email configuration process you need to give "
 "the account a name. The name can be any name you prefer. Type your account "
 "name on the Name field, then click Forward."
 msgstr ""
@@ -1971,7 +1958,7 @@ msgstr ""
 "nommer le compte. Vous pouvez choisir le nom qui vous convient. Saisissez le "
 "nom du compte dans le champ « Nom », puis cliquez sur « Suivant »."
 
-#: ../C/evolution.xml:719(para)
+#: ../C/evolution.xml:722(para)
 msgid ""
 "Continue with <link linkend=\"step-three-b\">Time Zone</link><link linkend="
 "\"step-three-b\"/>."
@@ -1979,25 +1966,25 @@ msgstr ""
 "Poursuivez avec <link linkend=\"step-three-b\">Fuseau horaire</link><link "
 "linkend=\"step-three-b\"/>."
 
-#: ../C/evolution.xml:726(para)
+#: ../C/evolution.xml:729(para)
 msgid "Select your time zone on the map."
 msgstr "Sélectionnez votre fuseau horaire sur la carte."
 
-#: ../C/evolution.xml:728(para)
+#: ../C/evolution.xml:731(para)
 msgid "Select from the time zone drop-down list."
 msgstr "Faites un choix dans la zone de liste déroulante."
 
-#: ../C/evolution.xml:733(para)
+#: ../C/evolution.xml:736(para)
 msgid "Click OK, then click Apply."
 msgstr "Cliquez sur « Valider », puis sur « Appliquer »."
 
-#: ../C/evolution.xml:734(para)
+#: ../C/evolution.xml:737(para)
 msgid "Evolution opens with your new account created."
 msgstr "Evolution s'ouvre avec le nouveau compte créé."
 
-#: ../C/evolution.xml:737(para)
+#: ../C/evolution.xml:740(para)
 msgid ""
-"If you want to import e-mail from another e-mail client, continue with <link "
+"If you want to import email from another email client, continue with <link "
 "linkend=\"fourth-step\">Importing Mail (Optional)</link>. If not, skip to "
 "<link linkend=\"ui-intro\">Using Evolution: An Overview</link>."
 msgstr ""
@@ -2006,13 +1993,13 @@ msgstr ""
 "link>. Dans le cas contraire, allez directement à <link linkend=\"ui-intro"
 "\">Utilisation d'Evolution : un aperçu</link>."
 
-#: ../C/evolution.xml:741(title)
+#: ../C/evolution.xml:744(title)
 msgid "Importing Mail (Optional)"
 msgstr "Importation de courriels (facultatif)"
 
-#: ../C/evolution.xml:742(para)
+#: ../C/evolution.xml:745(para)
 msgid ""
-"After selecting your time zone, if Evolution finds e-mail or address files "
+"After selecting your time zone, if Evolution finds email or address files "
 "from another application, it offers to import them. For a full description "
 "of the import feature, see <link linkend=\"importing-mail\">Importing Single "
 "Files</link>."
@@ -2023,36 +2010,42 @@ msgstr ""
 "d'importation, consultez <link linkend=\"importing-mail\">Importation d'un "
 "seul fichier</link>."
 
-#: ../C/evolution.xml:743(para)
+#: ../C/evolution.xml:746(para) ../C/evolution.xml:2362(para)
 msgid ""
 "Microsoft Outlook* and versions of Outlook Express after version 4 use "
-"proprietary formats that Evolution cannot read or import. To import "
-"information, you might want to use the Export tool under Windows*. See the "
-"instructions in <link linkend=\"outlook-migration-mail\">Migrating Local "
-"Outlook Mail Folders</link>."
+"proprietary formats that Evolution cannot read or import."
 msgstr ""
 "Microsoft Outlook* et Outlook Express à partir de la version 4 utilisent des "
-"formats propriétaires qu'Evolution n'est pas en mesure de lire ou "
-"d'importer. Pour importer des informations, nous vous suggérons d'utiliser "
-"l'outil d'exportation sous Windows*. Consultez les instructions sous <link "
-"linkend=\"outlook-migration-mail\">Migration de fichiers de messages Outlook "
-"locaux</link>."
+"formats propriétaires qu'Evolution n'est pas en mesure de lire ou d'importer."
 
-#: ../C/evolution.xml:744(para)
+#: ../C/evolution.xml:747(para)
 msgid ""
-"Before importing e-mail from Netscape*, make sure you have selected File "
-"&gt; Compact All Folders. If you don't, Evolution will import and undelete "
-"the messages in your Trash folders."
+"To import information, you might want to use the Export tool under Windows*. "
+"See the instructions in <link linkend=\"outlook-migration-mail\">Migrating "
+"Local Outlook Mail Folders</link>."
 msgstr ""
-"Avant d'importer des courriels depuis Netscape*, prenez soin de sélectionner "
-"Fichier&gt; Compresser tous les dossiers. Sinon, Evolution va aussi "
-"récupérer et importer les messages de vos dossiers Corbeille."
+"Pour importer des informations, nous vous suggérons d'utiliser l'outil "
+"d'exportation sous Windows*. Consultez les instructions sous <link linkend="
+"\"outlook-migration-mail\">Migration de fichiers de messages Outlook locaux</"
+"link>."
 
-#: ../C/evolution.xml:746(para)
+#: ../C/evolution.xml:748(para) ../C/evolution.xml:2367(para)
 msgid ""
-"Evolution uses standard file types for e-mail and calendar information, so "
+"Before importing email from Netscape*, Mozilla and Netscape users need to "
+"click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla "
+"mail tool. Otherwise, Evolution imports and undeletes the messages in your "
+"Trash folders."
+msgstr ""
+"Avant d'importer des messages, les utilisateurs de Mozilla et Netscape* "
+"doivent cliquer sur Fichier &gt; Compresser &gt; Tous les dossiers dans le "
+"composant de messagerie de Netscape ou Mozilla. Sinon, Evolution importe et "
+"récupère les messages que vous aviez mis à la corbeille."
+
+#: ../C/evolution.xml:750(para)
+msgid ""
+"Evolution uses standard file types for email and calendar information, so "
 "you can copy those files from your <command>~/.evolution</command> "
-"directory. The file formats used are <command>mbox</command> for e-mail and "
+"directory. The file formats used are <command>mbox</command> for email and "
 "iCal for calendar information."
 msgstr ""
 "Evolution utilise des types de fichiers standard pour stocker les courriels "
@@ -2061,20 +2054,20 @@ msgstr ""
 "fichiers sont <command>mbox</command> pour les courriels et iCal pour le "
 "calendrier."
 
-#: ../C/evolution.xml:747(para)
+#: ../C/evolution.xml:751(para)
 msgid ""
 "Contacts files are stored in a database, but can be saved as a standard "
-"vCard*. To export contact data, open your contacts tool and select the "
-"contacts you want to export (press Ctrl+A to select them all). Click File "
-"&gt; Save Contact as VCard."
+"vCard*. To export an addressbook, click File &gt; Save Address Book As VCard"
+"\". If you want to export only one contact, click File &gt; Save Contact as "
+"VCard."
 msgstr ""
 "Les fichiers de contacts sont stockés dans une base de données, mais ils "
-"peuvent être enregistrés sous forme vCard* standard. Pour exporter vos "
-"données de contact, ouvrez l'outil « Contacts » et sélectionnez ceux que "
-"vous souhaitez exporter (appuyez sur Ctrl+A pour tous les sélectionner). "
-"Choisissez Fichier &gt; Enregistrer le contact comme VCard."
+"peuvent être enregistrés sous forme vCard* standard. Pour exporter un carnet "
+"d'adresses, choisissez Fichier &gt; Enregistrer le carnet d'adresses comme "
+"VCard. Si vous ne souhaitez exporter qu'un seul contact, choisissez Fichier "
+"&gt; Enregistrer le contact comme VCard."
 
-#: ../C/evolution.xml:755(para)
+#: ../C/evolution.xml:759(para)
 msgid ""
 "Now that the first-run configuration has finished, you're ready to begin "
 "using Evolution. Here's a quick explanation of what's happening in your main "
@@ -2084,11 +2077,11 @@ msgstr ""
 "utiliser Evolution. Voici une brève présentation de ce qui se trouve dans la "
 "fenêtre principale d'Evolution."
 
-#: ../C/evolution.xml:758(title)
+#: ../C/evolution.xml:762(title)
 msgid "Menu Bar:"
 msgstr "Barre de menus :"
 
-#: ../C/evolution.xml:759(para)
+#: ../C/evolution.xml:763(para)
 msgid ""
 "The menu bar gives you access to most Evolution features. For additional "
 "information, see <link linkend=\"usage-mainwindow-menubar\">The Menu Bar</"
@@ -2098,25 +2091,25 @@ msgstr ""
 "Pour des informations supplémentaires, consultez <link linkend=\"usage-"
 "mainwindow-menubar\">La barre de menus</link>."
 
-#: ../C/evolution.xml:762(title)
+#: ../C/evolution.xml:766(title)
 msgid "Folder List:"
 msgstr "Liste des dossiers :"
 
-#: ../C/evolution.xml:763(para)
+#: ../C/evolution.xml:767(para)
 msgid ""
 "The folder list gives you a list of the available folders for each account. "
 "To see the contents of a folder, click the folder name and the contents are "
-"displayed in the e-mail list."
+"displayed in the message list."
 msgstr ""
 "La liste des dossiers présente la liste des dossiers disponibles pour chaque "
 "compte. Pour voir le contenu d'un dossier, cliquez sur le nom du dossier et "
 "son contenu s'affiche dans la liste des messages."
 
-#: ../C/evolution.xml:766(title)
+#: ../C/evolution.xml:770(title)
 msgid "Toolbar:"
 msgstr "Barre d'outils :"
 
-#: ../C/evolution.xml:767(para)
+#: ../C/evolution.xml:771(para)
 msgid ""
 "The toolbar gives you fast and easy access to the frequently used features "
 "in each component."
@@ -2124,41 +2117,41 @@ msgstr ""
 "La barre d'outils offre un accès simple et rapide aux fonctionnalités "
 "couramment utilisées de chaque composant."
 
-#: ../C/evolution.xml:770(title)
+#: ../C/evolution.xml:774(title)
 msgid "Search Tool:"
 msgstr "Outil de recherche :"
 
-#: ../C/evolution.xml:771(para)
+#: ../C/evolution.xml:775(para)
 msgid ""
-"The search tool lets you search your e-mail, contacts, calendar, and tasks "
-"to easily find what you're looking for."
+"The search tool lets you search your email, contacts, calendar, and tasks to "
+"easily find what you're looking for."
 msgstr ""
 "L'outil de recherche permet de rechercher dans les courriels, les contacts, "
 "le calendrier et les tâches pour retrouver facilement ce que vous recherchez."
 
-#: ../C/evolution.xml:774(title) ../C/evolution.xml:933(title)
+#: ../C/evolution.xml:778(title) ../C/evolution.xml:937(title)
 msgid "Message List:"
 msgstr "Liste des messages :"
 
-#: ../C/evolution.xml:775(para)
+#: ../C/evolution.xml:779(para)
 msgid ""
-"The message list displays a list of e-mail that you have received. To view "
-"an e-mail in the preview pane, click the e-mail in the e-mail list."
+"The message list displays a list of email that you have received. To view an "
+"email in the preview pane, click the email in the message list."
 msgstr ""
 "La liste des messages affiche une liste de courriels reçus. Pour voir un "
 "courriel dans le panneau d'aperçu, cliquez sur le courriel dans la liste des "
 "messages."
 
-#: ../C/evolution.xml:778(title)
+#: ../C/evolution.xml:782(title)
 msgid "Side bar:"
 msgstr "Barre latérale :"
 
-#: ../C/evolution.xml:779(para)
+#: ../C/evolution.xml:783(para)
 msgid ""
 "The side bar lets you switch between folders and between Evolution tools. At "
 "the bottom of the side bar is the switcher that let you switch Evolution "
 "tools, and above that is a list of all the available folders for the current "
-"tool.For additional information, see <link linkend=\"usage-mainwindow-"
+"tool. For additional information, see <link linkend=\"usage-mainwindow-"
 "shortcutbar\">The Side Bar</link>."
 msgstr ""
 "La barre latérale permet de passer d'un dossier à un autre ou d'un composant "
@@ -2168,27 +2161,27 @@ msgstr ""
 "d'informations, consultez <link linkend=\"usage-mainwindow-shortcutbar\">La "
 "barre latérale</link>."
 
-#: ../C/evolution.xml:782(title)
+#: ../C/evolution.xml:786(title)
 msgid "Switcher:"
 msgstr "Sélecteur :"
 
-#: ../C/evolution.xml:783(para)
+#: ../C/evolution.xml:787(para)
 msgid ""
 "The switcher at the bottom of the side bar lets you switch between the "
-"Evolution tools - mail, contacts, Calendars, Memos and Tasks."
+"Evolution tools - Mail, Contacts, Calendars, Memos and Tasks."
 msgstr ""
 "Le sélecteur au bas de la barre latérale permet de passer d'un composant "
 "Evolution à un autre : Courriel, Contacts, Calendriers, Mémos et Tâches."
 
-#: ../C/evolution.xml:786(title)
+#: ../C/evolution.xml:790(title)
 msgid "Status Bar:"
 msgstr "Barre d'état :"
 
-#: ../C/evolution.xml:787(para)
+#: ../C/evolution.xml:791(para)
 msgid ""
 "The status bar periodically displays a message, or tells you the progress of "
-"a task. This most often happens when you're checking or sending e-mail. "
-"These progress queues are shown in the previous figure. The Online/Offline "
+"a task. This most often happens when you're checking or sending email. These "
+"progress queues are shown in the previous figure. The Online/Offline "
 "indicator is here, too, in the lower left of the window."
 msgstr ""
 "La barre d'état affiche parfois un message ou donne des informations sur la "
@@ -2197,29 +2190,28 @@ msgstr ""
 "figure précédente. L'indicateur en ligne/hors ligne se situe également à cet "
 "endroit, dans le coin inférieur gauche de la fenêtre."
 
-#: ../C/evolution.xml:790(title) ../C/evolution.xml:937(title)
+#: ../C/evolution.xml:794(title) ../C/evolution.xml:941(title)
 msgid "Preview Pane:"
 msgstr "Panneau d'aperçu :"
 
-#: ../C/evolution.xml:791(para)
+#: ../C/evolution.xml:795(para)
 msgid ""
-"The preview pane displays the contents of the e-mail that is selected in the "
-"e-mail list."
+"The preview pane displays the contents of the email that is selected in the "
+"message list."
 msgstr ""
 "Le panneau d'aperçu affiche le contenu du courriel sélectionné dans la liste "
 "des messages."
 
-#: ../C/evolution.xml:795(title)
+#: ../C/evolution.xml:799(title)
 msgid "The Menu Bar"
 msgstr "La barre de menus"
 
-#: ../C/evolution.xml:796(para)
+#: ../C/evolution.xml:800(para)
 msgid ""
 "The menu bar's contents always provide all the possible actions for any "
 "given view of your data. If you're looking at your Inbox, most of the menu "
-"items relate to e-mail. Some content relates to other components of "
-"Evolution and some, especially in the File menu, relates to the application "
-"as a whole."
+"items relate to email. Some content relates to other components of Evolution "
+"and some, especially in the File menu, relates to the application as a whole."
 msgstr ""
 "La contenu de la barre de menus offre toujours toutes les actions possibles "
 "pour chaque état précis de vos données. Si vous examinez votre boîte de "
@@ -2228,11 +2220,11 @@ msgstr ""
 "d'autres, particulièrement le menu Fichier, se rapportent à l'application "
 "dans son ensemble."
 
-#: ../C/evolution.xml:798(title)
+#: ../C/evolution.xml:802(title)
 msgid "File:"
 msgstr "Fichier :"
 
-#: ../C/evolution.xml:799(para)
+#: ../C/evolution.xml:803(para)
 msgid ""
 "Anything related to a file or to the operations of the application is listed "
 "in this menu, such as creating things, saving them to disk, printing them, "
@@ -2242,11 +2234,11 @@ msgstr ""
 "présent dans ce menu, comme la création d'éléments, leur enregistrement, "
 "leur impression ainsi que la fermeture de l'application elle-même."
 
-#: ../C/evolution.xml:802(title)
+#: ../C/evolution.xml:806(title)
 msgid "Edit:"
 msgstr "Édition :"
 
-#: ../C/evolution.xml:803(para)
+#: ../C/evolution.xml:807(para)
 msgid ""
 "Holds useful tools that help you edit text and move it around. Lets you "
 "access the settings and configuration options in the Edit menu."
@@ -2254,11 +2246,11 @@ msgstr ""
 "Contient des outils utiles à l'édition de texte et au déplacement. Le menu "
 "Édition vous donne accès aux paramètres et aux options de configuration."
 
-#: ../C/evolution.xml:806(title)
+#: ../C/evolution.xml:810(title)
 msgid "View:"
 msgstr "Affichage :"
 
-#: ../C/evolution.xml:807(para)
+#: ../C/evolution.xml:811(para)
 msgid ""
 "Lets you decide how Evolution should look. Some of the features control the "
 "appearance of Evolution as a whole, and others the way a particular kind of "
@@ -2268,11 +2260,11 @@ msgstr ""
 "affectent l'ensemble d'Evolution alors que d'autres gèrent l'apparence d'un "
 "type d'information bien précis."
 
-#: ../C/evolution.xml:810(title)
+#: ../C/evolution.xml:814(title)
 msgid "Folder:"
 msgstr "Dossier :"
 
-#: ../C/evolution.xml:811(para)
+#: ../C/evolution.xml:815(para)
 msgid ""
 "Holds actions that can be performed on folders. You can find things like "
 "copy, rename, delete, and so on."
@@ -2280,11 +2272,11 @@ msgstr ""
 "Contient des actions qui s'appliquent aux dossiers. Vous y trouvez des "
 "éléments comme copier, renommer, supprimer, etc."
 
-#: ../C/evolution.xml:814(title)
+#: ../C/evolution.xml:818(title)
 msgid "Message:"
 msgstr "Message :"
 
-#: ../C/evolution.xml:815(para)
+#: ../C/evolution.xml:819(para)
 msgid ""
 "Holds actions that can be applied to a message. If there is only one target "
 "for the action, such as replying to a message, you can normally find it in "
@@ -2294,11 +2286,11 @@ msgstr ""
 "l'action, comme par exemple répondre à un message, vous la trouvez "
 "normalement dans le menu Message."
 
-#: ../C/evolution.xml:818(title)
+#: ../C/evolution.xml:822(title)
 msgid "Search:"
 msgstr "Recherche :"
 
-#: ../C/evolution.xml:819(para)
+#: ../C/evolution.xml:823(para)
 msgid ""
 "Lets you search for messages, or for phrases within a message. You can also "
 "see previous searches you have made. In addition to the Search menu, there "
@@ -2311,112 +2303,112 @@ msgstr ""
 "de rechercher des messages. Il est aussi possible de créer un dossier de "
 "recherche à partir d'une recherche."
 
-#: ../C/evolution.xml:822(title)
+#: ../C/evolution.xml:826(title)
 msgid "Help:"
 msgstr "Aide :"
 
-#: ../C/evolution.xml:823(para)
+#: ../C/evolution.xml:827(para)
 msgid "Opens the Evolution Help files."
 msgstr "Ouvre les fichiers d'aide d'Evolution."
 
-#: ../C/evolution.xml:828(title)
-msgid "The Side Bar"
+#: ../C/evolution.xml:832(title)
+msgid "The Sidebar"
 msgstr "La barre latérale"
 
-#: ../C/evolution.xml:829(para)
-msgid ""
-"The most important job for Evolution is to give you access to your "
-"information and help you use it quickly. One way it does that is through the "
-"side bar, which is the column on the left side of the main window. The "
-"switcher at the bottom of the side bar let you switch between the Evolution "
-"tools, such as Mail and Contacts, are the shortcuts. Above them is a list of "
-"folders for the current Evolution tool."
-msgstr ""
-"La tâche principale d'Evolution est de vous donner accès à vos informations "
-"et de vous aider à les utiliser efficacement. La barre latérale, la colonne "
-"sur la gauche de la fenêtre principale, est une des manières de contribuer à "
-"cette efficacité. Le sélecteur, au bas de la barre latérale, permet de "
-"passer d'un composant Evolution à un autre, tels que Courriel et Contacts, "
-"qui sont des raccourcis. Au-dessus se trouve une liste de dossiers se "
-"rapportant au composant actuel d'Evolution."
-
-#: ../C/evolution.xml:830(para)
-msgid ""
-"The folder list organizes your e-mail, calendars, contact lists, and task "
-"lists in a tree, similar to a <link linkend=\"filetree\">file tree</link>. "
-"Most people find one to four folders at the base of the tree, depending on "
-"the tool and their system configuration. Each Evolution tool has at least "
-"one folder, called On This Computer, for local information. For example, the "
-"folder list for the e-mail tool shows any remote e-mail storage you have set "
-"up, plus local folders and search folders, which are discussed in <link "
-"linkend=\"usage-mail-organize-vfolders\">Using Search Folders</link>."
+#: ../C/evolution.xml:833(para)
+msgid ""
+"Sidebar is the vertical panel on the left side of the Evolution main window. "
+"At the bottom of the sidebar is the Switcher, that lets you switch between "
+"the Evolution tools like Mail, Memo,Tasks and Contacts. Above the Switcher "
+"you can see a list of folders for the current Evolution tool."
+msgstr ""
+"La barre latérale est le panneau vertical qui se trouve sur la gauche de la "
+"fenêtre principale d'Evolution. Le sélecteur, au bas de la barre latérale, "
+"permet de passer d'un composant Evolution à un autre (Courriel, Mémos, "
+"Tâches et Contacts. Au-dessus du sélecteur se trouve une liste de dossiers "
+"se rapportant au composant d'Evolution actuellement visible."
+
+#: ../C/evolution.xml:834(para)
+msgid ""
+"The folder list organizes your email, calendars, address books, task lists "
+"and memo lists in a tree, similar to a <link linkend=\"filetree\">file tree</"
+"link>. Most people find one to four folders at the base of the tree, "
+"depending on the tool and their system configuration. Each Evolution tool "
+"has at least one folder, called On This Computer, for local information. For "
+"example, the folder list for the email tool shows any remote email storage "
+"you have set up, plus local folders and search folders, which are discussed "
+"in <link linkend=\"usage-mail-organize-vfolders\">Using Search Folders</"
+"link>."
 msgstr ""
-"La liste des dossiers organise les courriels, les calendriers, les listes de "
-"contacts et les listes de tâches sous forme d'arborescence, comme pour les "
-"<link linkend=\"filetree\">arborescences de fichiers</link>. On trouve la "
-"plupart du temps de un à quatre dossiers à la base de l'arborescence, selon "
-"le composant et la configuration du système. Chaque composant d'Evolution "
-"dispose d'au moins un dossier, appelé « Sur cet ordinateur », contenant des "
-"informations locales. Par exemple, la liste des dossiers du composant "
-"Courriel affiche tout conteneur de courriels distants configuré, en plus des "
-"dossiers locaux et des dossiers de recherche, abordés à la section <link "
-"linkend=\"usage-mail-organize-vfolders\">Utilisation des dossiers de "
-"recherche</link>."
+"La liste des dossiers organise les courriels, les calendriers, les carnets "
+"d'adresses, les listes de tâches et les listes de mémos sous forme "
+"d'arborescence, comme pour les <link linkend=\"filetree\">arborescences de "
+"fichiers</link>. On trouve la plupart du temps de un à quatre dossiers à la "
+"base de l'arborescence, selon le composant et la configuration du système. "
+"Chaque composant d'Evolution dispose d'au moins un dossier, appelé « Sur cet "
+"ordinateur », contenant des informations locales. Par exemple, la liste des "
+"dossiers du composant Courriel affiche tout conteneur de courriels distants "
+"configuré, en plus des dossiers locaux et des dossiers de recherche, abordés "
+"à la section <link linkend=\"usage-mail-organize-vfolders\">Utilisation des "
+"dossiers de recherche</link>."
 
-#: ../C/evolution.xml:831(para)
+#: ../C/evolution.xml:835(para)
 msgid ""
-"If you get large amounts of e-mail, you might want more folders than just "
+"If you get large amounts of email, you might want more folders than just "
 "your Inbox. You can create multiple calendar, task, or contacts folders."
 msgstr ""
 "Si vous recevez une grande quantité de courriels, vous aurez probablement "
 "besoin de plus de dossiers qu'une simple boîte de réception. Vous pouvez "
 "créer plusieurs dossiers de calendrier, de tâches ou de contacts."
 
-#: ../C/evolution.xml:832(para)
+#: ../C/evolution.xml:836(para)
 msgid "To create a new folder:"
 msgstr "Pour créer un nouveau dossier :"
 
-#: ../C/evolution.xml:835(para)
+#: ../C/evolution.xml:839(para)
 msgid "Click Folder &gt; New."
 msgstr "Cliquez sur Dossier &gt; Nouveau."
 
-#: ../C/evolution.xml:838(para)
+#: ../C/evolution.xml:842(para)
 msgid "Type the name of the folder in the Folder Name field."
 msgstr "Sasisissez le nom du dossier dans le champ « Nom du dossier »."
 
-#: ../C/evolution.xml:841(para)
+#: ../C/evolution.xml:845(para)
 msgid "Select the location of the new folder."
 msgstr "Sélectionnez l'emplacement du nouveau dossier."
 
-#: ../C/evolution.xml:844(para) ../C/evolution.xml:1246(para)
-#: ../C/evolution.xml:1269(para) ../C/evolution.xml:1281(para)
-#: ../C/evolution.xml:1516(para) ../C/evolution.xml:1798(para)
-#: ../C/evolution.xml:1900(para) ../C/evolution.xml:1916(para)
-#: ../C/evolution.xml:2132(para) ../C/evolution.xml:2170(para)
-#: ../C/evolution.xml:2230(para) ../C/evolution.xml:2709(para)
-#: ../C/evolution.xml:2742(para) ../C/evolution.xml:2938(para)
-#: ../C/evolution.xml:2980(para) ../C/evolution.xml:3113(para)
-#: ../C/evolution.xml:3210(para) ../C/evolution.xml:3225(para)
-#: ../C/evolution.xml:3503(para) ../C/evolution.xml:4099(para)
-#: ../C/evolution.xml:4165(para) ../C/evolution.xml:4288(para)
-#: ../C/evolution.xml:4330(para) ../C/evolution.xml:4662(para)
-#: ../C/evolution.xml:4717(para) ../C/evolution.xml:5291(para)
-#: ../C/evolution.xml:5313(para) ../C/evolution.xml:5337(para)
-#: ../C/evolution.xml:5371(para) ../C/evolution.xml:5852(para)
-#: ../C/evolution.xml:5879(para) ../C/evolution.xml:5901(para)
-#: ../C/evolution.xml:5917(para) ../C/evolution.xml:5943(para)
-#: ../C/evolution.xml:5974(para) ../C/evolution.xml:6128(para)
-#: ../C/evolution.xml:6206(para) ../C/evolution.xml:6236(para)
-#: ../C/evolution.xml:6800(para) ../C/evolution.xml:6898(para)
-#: ../C/evolution.xml:7033(para)
+#: ../C/evolution.xml:848(para) ../C/evolution.xml:1257(para)
+#: ../C/evolution.xml:1283(para) ../C/evolution.xml:1295(para)
+#: ../C/evolution.xml:1530(para) ../C/evolution.xml:1812(para)
+#: ../C/evolution.xml:1914(para) ../C/evolution.xml:1930(para)
+#: ../C/evolution.xml:2147(para) ../C/evolution.xml:2186(para)
+#: ../C/evolution.xml:2252(para) ../C/evolution.xml:2732(para)
+#: ../C/evolution.xml:2765(para) ../C/evolution.xml:2961(para)
+#: ../C/evolution.xml:3003(para) ../C/evolution.xml:3136(para)
+#: ../C/evolution.xml:3230(para) ../C/evolution.xml:3245(para)
+#: ../C/evolution.xml:3263(para) ../C/evolution.xml:3310(para)
+#: ../C/evolution.xml:3524(para) ../C/evolution.xml:3528(para)
+#: ../C/evolution.xml:3755(para) ../C/evolution.xml:4124(para)
+#: ../C/evolution.xml:4190(para) ../C/evolution.xml:4312(para)
+#: ../C/evolution.xml:4355(para) ../C/evolution.xml:4687(para)
+#: ../C/evolution.xml:4742(para) ../C/evolution.xml:5193(para)
+#: ../C/evolution.xml:5268(para) ../C/evolution.xml:5290(para)
+#: ../C/evolution.xml:5314(para) ../C/evolution.xml:5348(para)
+#: ../C/evolution.xml:5692(para) ../C/evolution.xml:5827(para)
+#: ../C/evolution.xml:5854(para) ../C/evolution.xml:5874(para)
+#: ../C/evolution.xml:5889(para) ../C/evolution.xml:5912(para)
+#: ../C/evolution.xml:5938(para) ../C/evolution.xml:6070(para)
+#: ../C/evolution.xml:6093(para) ../C/evolution.xml:6171(para)
+#: ../C/evolution.xml:6201(para) ../C/evolution.xml:6764(para)
+#: ../C/evolution.xml:6862(para) ../C/evolution.xml:6997(para)
 msgid "Click OK."
 msgstr "Cliquez sur « Créer »."
 
-#: ../C/evolution.xml:849(title)
+#: ../C/evolution.xml:853(title)
 msgid "Changing Switcher Appearance:"
 msgstr "Modification de l'apparence du sélecteur :"
 
-#: ../C/evolution.xml:850(para)
+#: ../C/evolution.xml:854(para)
 msgid ""
 "To change the appearance of your switcher click <emphasis>View &gt; Switcher "
 "Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can "
@@ -2426,51 +2418,51 @@ msgstr ""
 "Apparence du sélecteur<emphasis> dans la barre de menus. Le sous-menu "
 "présente les options suivantes :"
 
-#: ../C/evolution.xml:852(title)
+#: ../C/evolution.xml:856(title)
 msgid "Icons and Text:"
 msgstr "Icônes et texte :"
 
-#: ../C/evolution.xml:853(para)
+#: ../C/evolution.xml:857(para)
 msgid "Displays buttons with the label and the icon corresponding to it."
 msgstr "Affiche les boutons avec l'icône et le texte correspondant."
 
-#: ../C/evolution.xml:856(title)
+#: ../C/evolution.xml:860(title)
 msgid "Icons Only:"
 msgstr "Icônes uniquement :"
 
-#: ../C/evolution.xml:857(para)
+#: ../C/evolution.xml:861(para)
 msgid "Shows only the icons."
 msgstr "Affiche uniquement les icônes."
 
-#: ../C/evolution.xml:860(title)
+#: ../C/evolution.xml:864(title)
 msgid "Texts Only:"
 msgstr "Texte uniquement :"
 
-#: ../C/evolution.xml:861(para)
+#: ../C/evolution.xml:865(para)
 msgid "Displays buttons with the label, not the icons."
 msgstr "Affiche les boutons avec le texte, sans les icônes."
 
-#: ../C/evolution.xml:864(title)
+#: ../C/evolution.xml:868(title)
 msgid "Toolbar Style:"
 msgstr "Style de la barre d'outils :"
 
-#: ../C/evolution.xml:865(para)
+#: ../C/evolution.xml:869(para)
 msgid "Shows buttons using the desktop toolbar settings."
 msgstr "Affiche les boutons avec les paramètres de barre d'outils du bureau."
 
-#: ../C/evolution.xml:868(title)
+#: ../C/evolution.xml:872(title)
 msgid "Hide Buttons:"
 msgstr "Masquer les boutons :"
 
-#: ../C/evolution.xml:869(para)
+#: ../C/evolution.xml:873(para)
 msgid "This option hides all the shortcut buttons of switcher."
 msgstr "Cette option masque tous les boutons de raccourcis du sélecteur."
 
-#: ../C/evolution.xml:874(title)
+#: ../C/evolution.xml:878(title)
 msgid "Folder Management"
 msgstr "Gestion des dossiers"
 
-#: ../C/evolution.xml:875(para)
+#: ../C/evolution.xml:879(para)
 msgid ""
 "Right-click a folder or subfolder to display a menu with the following "
 "options:"
@@ -2478,11 +2470,11 @@ msgstr ""
 "Faites un clic droit sur un dossier ou un sous-dossier pour afficher un menu "
 "avec les options suivantes :"
 
-#: ../C/evolution.xml:877(title)
+#: ../C/evolution.xml:881(title)
 msgid "Copy:"
 msgstr "Copier :"
 
-#: ../C/evolution.xml:878(para)
+#: ../C/evolution.xml:882(para)
 msgid ""
 "Copies the folder to a different location. When you select this item, "
 "Evolution offers a choice of locations to copy the folder to."
@@ -2490,59 +2482,59 @@ msgstr ""
 "Copie le dossier à un emplacement différent. Lorsque vous sélectionnez cet "
 "élément, Evolution présente un choix d'emplacements pour la copie."
 
-#: ../C/evolution.xml:881(title)
+#: ../C/evolution.xml:885(title)
 msgid "Move:"
 msgstr "Déplacer :"
 
-#: ../C/evolution.xml:882(para)
+#: ../C/evolution.xml:886(para)
 msgid "Moves the folder to another location."
 msgstr "Déplace le dossier à un autre emplacement."
 
-#: ../C/evolution.xml:885(title)
+#: ../C/evolution.xml:889(title)
 msgid "Mark Messages As Read:"
 msgstr "Marquer les messages comme lus :"
 
-#: ../C/evolution.xml:886(para)
+#: ../C/evolution.xml:890(para)
 msgid "Marks all the messages in the folder as read."
 msgstr "Marque tous les messages du dossier comme lus."
 
-#: ../C/evolution.xml:889(title)
+#: ../C/evolution.xml:893(title)
 msgid "New Folder:"
 msgstr "Nouveau dossier :"
 
-#: ../C/evolution.xml:890(para)
+#: ../C/evolution.xml:894(para)
 msgid "Creates another folder in the same location."
 msgstr "Crée un nouveau dossier au même endroit."
 
-#: ../C/evolution.xml:893(title) ../C/evolution.xml:2868(title)
+#: ../C/evolution.xml:897(title) ../C/evolution.xml:2891(title)
 msgid "Delete:"
 msgstr "Supprimer :"
 
-#: ../C/evolution.xml:894(para)
+#: ../C/evolution.xml:898(para)
 msgid "Deletes the folder and all its contents."
 msgstr "Supprime le dossier et tout son contenu."
 
-#: ../C/evolution.xml:897(title)
+#: ../C/evolution.xml:901(title)
 msgid "Rename:"
 msgstr "Renommer :"
 
-#: ../C/evolution.xml:898(para)
+#: ../C/evolution.xml:902(para)
 msgid "Lets you change the name of the folder."
 msgstr "Permet de changer le nom du dossier."
 
-#: ../C/evolution.xml:901(title)
+#: ../C/evolution.xml:905(title)
 msgid "Disable:"
 msgstr "Désactiver :"
 
-#: ../C/evolution.xml:902(para)
+#: ../C/evolution.xml:906(para)
 msgid "Disables the account."
 msgstr "Désactive le compte."
 
-#: ../C/evolution.xml:905(title)
+#: ../C/evolution.xml:909(title)
 msgid "Properties:"
 msgstr "Propriétés :"
 
-#: ../C/evolution.xml:906(para)
+#: ../C/evolution.xml:910(para)
 msgid ""
 "Checks the number of total and unread messages in a folder, and, for remote "
 "folders, lets you select whether to copy the folder to your local system for "
@@ -2552,75 +2544,76 @@ msgstr ""
 "et pour les dossiers distants, permet de choisir de copier le dossier en "
 "local pour des opérations hors ligne."
 
-#: ../C/evolution.xml:908(para)
-msgid "You can also rearrange folders and messages by dragging and dropping them."
+#: ../C/evolution.xml:912(para)
+msgid ""
+"You can also rearrange folders and messages by dragging and dropping them."
 msgstr ""
 "Il est aussi possible de réorganiser les dossiers et les messages par "
 "glisser-déposer."
 
-#: ../C/evolution.xml:909(para)
+#: ../C/evolution.xml:913(para)
 msgid ""
-"Any time new e-mail arrives in a e-mail folder, that folder label is "
-"displayed in bold text, along with the number of new messages in that folder."
+"Any time new email arrives in a email folder, that folder label is displayed "
+"in bold text, along with the number of new messages in that folder."
 msgstr ""
 "Chaque fois qu'un nouveau courriel arrive dans un dossier de messages, le "
 "nom de ce dossier apparaît en gras et le nombre de nouveaux messages "
 "s'affiche à la suite du nom."
 
-#: ../C/evolution.xml:914(title)
-msgid "E-Mail"
+#: ../C/evolution.xml:918(title)
+msgid "Email"
 msgstr "Courriel"
 
-#: ../C/evolution.xml:915(para)
-msgid "Evolution e-mail is like other e-mail programs in several ways:"
+#: ../C/evolution.xml:919(para)
+msgid "Evolution email is like other email programs in several ways:"
 msgstr ""
 "Le logiciel de messagerie Evolution est comparable à d'autres programmes de "
 "messagerie sous plusieurs aspects :"
 
-#: ../C/evolution.xml:918(para)
+#: ../C/evolution.xml:922(para)
 msgid ""
-"It can send and receive e-mail in HTML or as plain text, and makes it easy "
-"to send and receive multiple file attachments."
+"It can send and receive email in HTML or as plain text, and makes it easy to "
+"send and receive multiple file attachments."
 msgstr ""
 "Il peut envoyer et recevoir des courriels en HTML ou en texte brut et il "
 "permet d'envoyer et de recevoir facilement de multiples pièces jointes."
 
-#: ../C/evolution.xml:921(para)
+#: ../C/evolution.xml:925(para)
 msgid ""
-"It supports multiple e-mail sources, including <link linkend=\"imap\">IMAP</"
+"It supports multiple email sources, including <link linkend=\"imap\">IMAP</"
 "link>, <link linkend=\"pop\">POP3</link>, and local mbox or mh spools and "
-"files created by other e-mail programs."
+"files created by other email programs."
 msgstr ""
 "Il prend en charge de nombreuses sources de courriels, y compris <link "
 "linkend=\"imap\">IMAP</link>, <link linkend=\"pop\">POP3</link> ainsi que "
 "des boîtes locales mbox ou des ensembles de boîtes mh et des fichiers créés "
 "par d'autres logiciels de messagerie."
 
-#: ../C/evolution.xml:924(para)
+#: ../C/evolution.xml:928(para)
 msgid ""
-"It can sort and organize your e-mail in a wide variety of ways with folders, "
+"It can sort and organize your email in a wide variety of ways with folders, "
 "searches, and filters."
 msgstr ""
 "Il peut trier et organiser vos courriels de nombreuses manières avec des "
 "dossiers, des recherches et des filtres."
 
-#: ../C/evolution.xml:927(para)
+#: ../C/evolution.xml:931(para)
 msgid "It lets you guard your privacy with encryption."
 msgstr "Il vous permet de garantir la confidentialité par le chiffrement."
 
-#: ../C/evolution.xml:930(para)
+#: ../C/evolution.xml:934(para)
 msgid ""
-"However, Evolution has some important differences from other e-mail "
-"programs. First, It is built to handle very large amounts of e-mail. The "
-"<link linkend=\"usage-mail-organize-spam\">junk e-mail</link>, message <link "
-"linkend=\"usage-mail-organize-filters\">filtering</link> and <link linkend="
-"\"usage-mail-organize-search\">searching</link> functions were built for "
-"speed and efficiency. There's also the <link linkend=\"usage-mail-organize-"
-"vfolders\">search folder</link>, an advanced organizational feature not "
-"found in some e-mail clients. If you get a lot of e-mail, or if you keep "
-"every message you get in case you need to refer to it later, you'll find "
-"this feature especially useful. Here's a quick explanation of what's "
-"happening in your main Evolution e-mail window."
+"However, Evolution has some important differences from other email programs. "
+"First, It is built to handle very large amounts of email. The <link linkend="
+"\"usage-mail-organize-spam\">junk email</link>, message <link linkend="
+"\"usage-mail-organize-filters\">filtering</link> and <link linkend=\"usage-"
+"mail-organize-search\">searching</link> functions were built for speed and "
+"efficiency. There's also the <link linkend=\"usage-mail-organize-vfolders"
+"\">search folder</link>, an advanced organizational feature not found in "
+"some email clients. If you get a lot of email, or if you keep every message "
+"you get in case you need to refer to it later, you will find this feature "
+"especially useful. Here's a quick explanation of what's happening in your "
+"main Evolution email window."
 msgstr ""
 "Cependant, Evolution présente des différences importantes avec d'autres "
 "logiciels de messagerie. Tout d'abord, il est conçu pour gérer de grandes "
@@ -2636,19 +2629,23 @@ msgstr ""
 "particulièrement utile. Voici une explication rapide de ce qui se trouve "
 "dans la fenêtre principale de la messagerie Evolution."
 
-#: ../C/evolution.xml:934(para)
+#: ../C/evolution.xml:938(para)
 msgid ""
 "The message list displays all the messages that you have. This includes all "
-"your read and unread messages, and e-mail that is flagged to be deleted."
+"your read and unread messages, and email that is flagged to be deleted."
 msgstr ""
 "La liste des messages affiche tous vos courriels. Cela comprend tous les "
 "messages lus et non lus, ainsi que les messages marqués pour la suppression."
 
-#: ../C/evolution.xml:938(para)
-msgid "This is where your e-mail is displayed."
-msgstr "C'est l'endroit où les courriels sont affichés."
+#: ../C/evolution.xml:942(para)
+msgid ""
+"The preview pane displays the message that is currently chosen in the "
+"message list."
+msgstr ""
+"Le panneau d'aperçu affiche le contenu du courriel sélectionné dans la liste "
+"des messages."
 
-#: ../C/evolution.xml:940(para)
+#: ../C/evolution.xml:944(para)
 msgid ""
 "If you find the preview pane too small, you can resize the pane, enlarge the "
 "whole window, or double-click the message in the message list to have it "
@@ -2661,7 +2658,7 @@ msgstr ""
 "Pour modifier la taille d'un panneau, faites glisser la séparation entre les "
 "deux panneaux."
 
-#: ../C/evolution.xml:941(para)
+#: ../C/evolution.xml:945(para)
 msgid ""
 "As with folders, you can right-click messages in the message list and get a "
 "menu of possible actions, including moving or deleting them, creating "
@@ -2672,9 +2669,9 @@ msgstr ""
 "possibles, comprenant le déplacement, la suppression, la création de filtres "
 "ou de dossiers de recherche ou encore le marquage comme pourriel."
 
-#: ../C/evolution.xml:942(para)
+#: ../C/evolution.xml:946(para)
 msgid ""
-"Most of the e-mail-related actions you want to perform are listed in the "
+"Most of the email-related actions you want to perform are listed in the "
 "Message Menu and Folder Menu in the menu bar. The most frequently used ones, "
 "like Reply and Forward, also appear as buttons in the toolbar. Most of them "
 "are also located in the right-click menu and as keyboard shortcuts."
@@ -2685,20 +2682,20 @@ msgstr ""
 "boutons dans la barre d'outils. Pour la plupart, elles se trouvent également "
 "dans le menu contextuel et disposent de raccourcis clavier."
 
-#: ../C/evolution.xml:943(para)
+#: ../C/evolution.xml:947(para)
 msgid ""
-"For an in-depth guide to the e-mail capabilities of Evolution, read <link "
-"linkend=\"usage-mail\">Sending and Receiving E-Mail</link>."
+"For an in-depth guide to the email capabilities of Evolution, read <link "
+"linkend=\"usage-mail\">Sending and Receiving Email</link>."
 msgstr ""
 "Pour des instructions détaillées concernant les fonctionnalités de "
 "messagerie d'Evolution, consultez <link linkend=\"usage-mail\">Envoi et "
 "réception de courriels</link>."
 
-#: ../C/evolution.xml:947(title)
+#: ../C/evolution.xml:951(title)
 msgid "The Calendar"
 msgstr "Le calendrier"
 
-#: ../C/evolution.xml:948(para)
+#: ../C/evolution.xml:952(para)
 msgid ""
 "To begin using the calendar, click Calendar in the switcher. By default, the "
 "calendar shows today's schedule on a ruled background. At the left bottom, "
@@ -2713,21 +2710,21 @@ msgstr ""
 "permet de conserver une liste de tâches indépendamment des rendez-vous. En-"
 "dessous se trouve une liste de mémos."
 
-#: ../C/evolution.xml:951(title)
+#: ../C/evolution.xml:955(title)
 msgid "Appointment List:"
 msgstr "Liste des rendez-vous :"
 
-#: ../C/evolution.xml:952(para)
+#: ../C/evolution.xml:956(para)
 msgid "The appointment list displays all your scheduled appointments."
 msgstr ""
 "La liste des rendez-vous présente une liste de tous les rendez-vous "
 "planifiés."
 
-#: ../C/evolution.xml:955(title)
+#: ../C/evolution.xml:959(title)
 msgid "Month Pane:"
 msgstr "Panneau des mois :"
 
-#: ../C/evolution.xml:956(para)
+#: ../C/evolution.xml:960(para)
 msgid ""
 "The month pane is a small view of a calendar month. To display additional "
 "months, drag the column border to the right. You can also select a range of "
@@ -2740,21 +2737,21 @@ msgstr ""
 "mois pour afficher une sélection personnalisée de jours dans la liste des "
 "rendez-vous."
 
-#: ../C/evolution.xml:959(title)
+#: ../C/evolution.xml:963(title)
 msgid "Task List:"
 msgstr "Liste des tâches :"
 
-#: ../C/evolution.xml:960(para)
+#: ../C/evolution.xml:964(para)
 msgid ""
 "Tasks are distinct from appointments because they generally don't have times "
-"associated with them. You can see a larger view of your task list by "
-"clicking Tasks in the switcher."
+"associated with them. You can use the list in a larger window by clicking "
+"the Tasks button in the side bar."
 msgstr ""
 "Les tâches sont séparées des rendez-vous, car elles n'ont généralement pas "
 "de date associée. Vous pouvez obtenir un affichage plus grand des tâches en "
-"cliquant sur Tâches dans le sélecteur."
+"cliquant sur le bouton Tâches dans la barre latérale."
 
-#: ../C/evolution.xml:962(para)
+#: ../C/evolution.xml:966(para)
 msgid ""
 "For more information about the calendar, see <link linkend=\"usage-calendar"
 "\">Evolution Calendar</link>."
@@ -2762,11 +2759,11 @@ msgstr ""
 "Pour plus d'informations sur le calendrier, consultez <link linkend=\"usage-"
 "calendar\">Calendrier Evolution</link>."
 
-#: ../C/evolution.xml:966(title)
+#: ../C/evolution.xml:970(title)
 msgid "The Contacts"
 msgstr "Les contacts"
 
-#: ../C/evolution.xml:967(para)
+#: ../C/evolution.xml:971(para)
 msgid ""
 "The Evolution contacts can handle all of the functions of an address book or "
 "phone book. However, it is easier to update Evolution than it is to change "
@@ -2780,7 +2777,7 @@ msgstr ""
 "qu'Evolution peut se synchroniser avec des appareils PalmOS* et utiliser des "
 "annuaires <link linkend=\"ldap\">LDAP</link> sur un réseau."
 
-#: ../C/evolution.xml:968(para)
+#: ../C/evolution.xml:972(para)
 msgid ""
 "To use the contacts tool, click Contacts in the switcher. By default, the "
 "display shows all your contacts in alphabetical order, in a minicard view. "
@@ -2793,10 +2790,10 @@ msgstr ""
 "dans le menu Affichage et ajuster la largeur des colonnes en cliquant et "
 "glissant les séparateurs de colonnes grisés."
 
-#: ../C/evolution.xml:970(para)
+#: ../C/evolution.xml:974(para)
 msgid ""
 "Another advantage of the Evolution contacts is its integration with the rest "
-"of the application. For example, you can right-click an e-mail address in "
+"of the application. For example, you can right-click an email address in "
 "Evolution mail to instantly create a contact entry."
 msgstr ""
 "Un autre avantage des contacts Evolution est leur intégration avec le reste "
@@ -2804,22 +2801,22 @@ msgstr ""
 "adresse électronique dans la messagerie Evolution pour créer immédiatement "
 "un nouveau contact."
 
-#: ../C/evolution.xml:971(emphasis)
-msgid "Contact list"
+#: ../C/evolution.xml:975(emphasis)
+msgid "Contact List"
 msgstr "Liste de contacts"
 
-#: ../C/evolution.xml:972(para)
+#: ../C/evolution.xml:976(para)
 msgid ""
 "The largest section of the contacts display shows a list of individual "
-"contacts. You can also search the contacts in the same way that you search e-"
-"mail folders, using the search tool on the right side of the toolbar."
+"contacts. You can also search the contacts in the same way that you search "
+"email folders, using the search tool on the right side of the toolbar."
 msgstr ""
 "La plus grande partie de l'affichage des contacts montre une liste de "
 "contacts individuels. Il est aussi possible de rechercher des contacts de la "
 "même manière que l'on recherche dans les dossiers de courriels, à l'aide de "
 "l'outil de recherche à droite de la barre d'outils."
 
-#: ../C/evolution.xml:973(para)
+#: ../C/evolution.xml:977(para)
 msgid ""
 "For detailed instructions on how to use the address book, read <link linkend="
 "\"usage-contact\">Evolution Contacts: the Address Book</link>."
@@ -2828,15 +2825,15 @@ msgstr ""
 "consultez <link linkend=\"usage-contact\">Contacts Evolution : le carnet "
 "d'adresses</link>."
 
-#: ../C/evolution.xml:978(title)
-msgid "Backup And Restore Evolution"
-msgstr "Sauvegarder et restaurer Evolution"
+#: ../C/evolution.xml:982(title)
+msgid "Backing Up And Restoring Evolution"
+msgstr "Sauvegarde et restauration d'Evolution"
 
-#: ../C/evolution.xml:979(para)
+#: ../C/evolution.xml:983(para)
 msgid ""
-"With the Backup and Restore plugin enabled, you can successfully backup "
-"Evolution to your machine and restore it whenever it is required. The back "
-"up saves your Evolution gconf settings, mails, contacts, tasks, memos and "
+"With the Backup and Restore plug-in enabled, you can successfully back up "
+"Evolution to your machine and restore it whenever it is required. The backup "
+"saves your Evolution gconf settings, mail, contacts, tasks, memos, and "
 "calendars and creates an archive."
 msgstr ""
 "Si vous avez activé le greffon de sauvegarde et restauration, vous avez la "
@@ -2844,23 +2841,21 @@ msgstr ""
 "losrque vous en avez besoin. La sauvegarde enregistre vos paramètres "
 "Evolution dans GConf ainsi que vos courriels, puis crée une archive."
 
-#: ../C/evolution.xml:980(para)
-msgid "To take the backup,"
-msgstr "Pour effectuer la sauvegarde,"
-
-#: ../C/evolution.xml:983(para)
-msgid "Select File &gt; Backup Settings to select the folder to save the backup."
+#: ../C/evolution.xml:986(para)
+msgid ""
+"Select File &gt; Backup Settings to select the folder where you want to save "
+"the backup."
 msgstr ""
 "Choisissez Fichier &gt; Sauvegarder les paramètres afin de choisir le "
 "dossier de destination de la sauvegarde."
 
-#: ../C/evolution.xml:985(para)
+#: ../C/evolution.xml:988(para)
 msgid "Evolution is always backed up as evolution-backup.tar.gz."
 msgstr ""
 "Une sauvegarde d'Evolution se trouve toujours dans un fichier nommé "
 "evolution-backup.tar.gz."
 
-#: ../C/evolution.xml:986(para)
+#: ../C/evolution.xml:989(para)
 msgid ""
 "Before the backup process starts, it asks you to close Evolution and "
 "displays a warning as shown below:"
@@ -2868,120 +2863,124 @@ msgstr ""
 "Avant que le processus de sauvegarde ne démarre, vous devrez quitter "
 "Evolution et vous verrez apparaître un avertissement comme celui-ci :"
 
-#: ../C/evolution.xml:991(para)
+#: ../C/evolution.xml:994(para)
 msgid ""
-"Click Restart Evolution after backup to restart Evolution immediately after "
+"Select Restart Evolution after backup to restart Evolution immediately after "
 "the backup process."
 msgstr ""
-"Cliquez sur « Redémarrer Evolution après la sauvegarde » pour qu'Evolution "
+"Cochez « Redémarrer Evolution après la sauvegarde » pour qu'Evolution "
 "redémarre automatiquement dès la fin de la sauvegarde."
 
-#: ../C/evolution.xml:994(para)
-msgid "Click Yes to close Evolution and start backup."
+#: ../C/evolution.xml:997(para)
+msgid "Click Yes to close Evolution and start the backup."
 msgstr "Cliquez sur Oui pour fermer Evolution et démarrer la sauvegarde."
 
-#: ../C/evolution.xml:996(para) ../C/evolution.xml:1015(para)
+#: ../C/evolution.xml:999(para) ../C/evolution.xml:1017(para)
 msgid "Evolution will auto-restart after the process."
 msgstr "Evolution redémarre automatiquement après le processus."
 
-#: ../C/evolution.xml:1001(title)
-msgid "Restore Evolution"
+#: ../C/evolution.xml:1004(title)
+msgid "Restoring Evolution"
 msgstr "Restauration d'Evolution"
 
-#: ../C/evolution.xml:1002(para)
+#: ../C/evolution.xml:1005(para)
 msgid "This feature restores your settings from the archive."
 msgstr "Cette fonctionnalité restaure vos paramètres à partir de l'archive."
 
-#: ../C/evolution.xml:1003(para)
-msgid "To restore Evolution,"
-msgstr "Pour restaurer Evolution,"
-
-#: ../C/evolution.xml:1006(para)
+#: ../C/evolution.xml:1008(para)
 msgid ""
 "Select File &gt; Restore Settings to open the available evolution.tar.gz "
-"files"
+"files."
 msgstr ""
 "Choisissez Fichier &gt; Restaurer les paramètres pour ouvrir les fichiers "
 "evolution.tar.gz disponibles."
 
-#: ../C/evolution.xml:1009(para)
+#: ../C/evolution.xml:1011(para)
 msgid "Select the evolution.tar.gz and click Save."
 msgstr "Sélectionnez le fichier evolution.tar.gz et cliquez sur Enregistrer."
 
-#: ../C/evolution.xml:1010(para)
+#: ../C/evolution.xml:1012(para)
 msgid ""
-"Before the process starts, it asks you to close Evolution. Close the windows "
-"and click Restore to restore Evolution."
+"Before the process starts, a pop-up window appears and asks you to close "
+"Evolution. Close all the windows and then click Restore in the pop-up window."
 msgstr ""
-"Avant que le processus ne démarre, vous devrez fermer Evolution. Fermer les "
-"fenêtres et cliquez sur Restaurer pour lancer la restauration."
+"Avant que le processus ne démarre, une fenêtre surgit et vous demande de "
+"fermer Evolution. Fermez toutes les fenêtres et cliquez sur Restaurer pour "
+"lancer la restauration."
 
-#: ../C/evolution.xml:1012(para)
+#: ../C/evolution.xml:1014(para)
 msgid ""
-"If you are creating your first account via the startup-wizard, you have an "
-"option to restore from the archive if it is available locally."
+"If you are creating your first account via the Startup Wizard, you can use "
+"the option to restore from the archive if it is available locally."
 msgstr ""
 "Si vous êtes en train de créer votre premier compte à l'aide de l'assistant "
 "de démarrage, vous avez la possibilité de restaurer les paramètres d'un "
 "fichier archive si vous en avez un en local."
 
-#: ../C/evolution.xml:1022(title)
+#: ../C/evolution.xml:1024(title)
 msgid "Crash Recovery"
 msgstr "Récupération après un arrêt forcé"
 
-#: ../C/evolution.xml:1023(para)
+#: ../C/evolution.xml:1025(para)
 msgid ""
 "Evolution displays a crash detection message when you restart it after a "
 "crash."
-msgstr "Evolution affiche un message de détection d'arrêt brutal lorsque vous le redémarrez après un arrêt forcé (plantage)."
+msgstr ""
+"Evolution affiche un message de détection d'arrêt brutal lorsque vous le "
+"redémarrez après un arrêt forcé (plantage)."
 
-#: ../C/evolution.xml:1025(para)
+#: ../C/evolution.xml:1027(para)
 msgid ""
-"Click Ignore to restore the preview pane displayed when Evolution was "
-"crashed. If you click Recover, Evolution opens with all preview panes hidden."
-msgstr "Cliquez sur Ignorer pour rétablir le panneau d'aperçu affiché au moment de l'arrêt brutal d'Evolution. Si vous cliquez sur Récupérer, Evolution s'ouvre avec tous les panneaux d'aperçu masqués."
+"Click Ignore to restore the preview pane displayed when Evolution crashed. "
+"If you click Recover, Evolution opens with all preview panes hidden."
+msgstr ""
+"Cliquez sur Ignorer pour rétablir le panneau d'aperçu affiché au moment de "
+"l'arrêt brutal d'Evolution. Si vous cliquez sur Récupérer, Evolution s'ouvre "
+"avec tous les panneaux d'aperçu masqués."
 
-#: ../C/evolution.xml:1028(title)
+#: ../C/evolution.xml:1030(title)
 msgid "Command Line Options"
 msgstr "Options de ligne de commande"
 
-#: ../C/evolution.xml:1029(para)
+#: ../C/evolution.xml:1031(para)
 msgid ""
-"Evolution has a number of command line options that you can use. You can "
-"find the full list by entering the command <command>man evolution</command> "
-"or <command>evolution --help</command>. The most important command line "
-"options are:"
+"Evolution has a number of command line options that you can use. For more "
+"information about command line options, open a terminal window and type "
+"<command>evolution --help</command>."
 msgstr ""
-"Evolution contient un certain nombre d'options utilisables en ligne de "
-"commande. Vous pouvez trouver la liste complète en saisissant la commande "
-"<command>man evolution</command> ou <command>evolution --help</command>. Les "
-"options en ligne de commande les plus importantes sont :"
+"Evolution dispose de quelques options utilisables en ligne de commande. Pour "
+"obtenir des informations concernant ces options, ouvrez un terminal et tapez "
+"<command>evolution --help</command>."
 
-#: ../C/evolution.xml:1037(para)
+#: ../C/evolution.xml:1032(para)
+msgid "The most important command line options are:"
+msgstr "Les options en ligne de commande les plus importantes sont :"
+
+#: ../C/evolution.xml:1040(para)
 msgid "Command"
 msgstr "Commande"
 
-#: ../C/evolution.xml:1040(para) ../C/evolution.xml:1703(para)
+#: ../C/evolution.xml:1043(para) ../C/evolution.xml:1717(para)
 msgid "Description"
 msgstr "Description"
 
-#: ../C/evolution.xml:1047(para)
+#: ../C/evolution.xml:1050(para)
 msgid "evolution --offline"
 msgstr "evolution·--offline"
 
-#: ../C/evolution.xml:1050(para)
+#: ../C/evolution.xml:1053(para)
 msgid "Starts Evolution in offline mode."
 msgstr "Démarre Evolution en mode hors ligne."
 
-#: ../C/evolution.xml:1055(para)
+#: ../C/evolution.xml:1058(para)
 msgid "evolution --disable-preview"
 msgstr "evolution --disable-preview"
 
-#: ../C/evolution.xml:1058(para)
+#: ../C/evolution.xml:1061(para)
 msgid "Disables all the preview panes when you launch Evolution."
 msgstr "Désactive tous les panneaux d'aperçu lors du démarrage d'Evolution."
 
-#: ../C/evolution.xml:1059(para)
+#: ../C/evolution.xml:1062(para)
 msgid ""
 "It lets Evolution not to open the last crashed message, task or contact when "
 "you restart Evolution. Thus, it provides a way to avoid system crash caused "
@@ -2992,95 +2991,97 @@ msgstr ""
 "possibilité d'éviter le blocage du système causé par l'aperçu de messages, "
 "de tâches ou de contacts."
 
-#: ../C/evolution.xml:1064(para)
+#: ../C/evolution.xml:1067(para)
 msgid "evolution mailto:<varname>joe@somewhere.net</varname>"
 msgstr "evolution mailto:<varname>jean@quelquepart.net</varname>"
 
-#: ../C/evolution.xml:1067(para)
-msgid "Starts Evolution and begins composing a message to the e-mail address listed."
+#: ../C/evolution.xml:1070(para)
+msgid ""
+"Starts Evolution and begins composing a message to the email address listed."
 msgstr ""
 "Démarre Evolution et ouvre un nouveau message avec l'adresse électronique "
 "mentionnée comme destinataire."
 
-#: ../C/evolution.xml:1072(para)
+#: ../C/evolution.xml:1075(para)
 msgid "evolution -c mail"
 msgstr "evolution·-c·mail"
 
-#: ../C/evolution.xml:1075(para)
+#: ../C/evolution.xml:1078(para)
 msgid "Starts Evolution in mail mode."
 msgstr "Démarre Evolution en mode Courriel."
 
-#: ../C/evolution.xml:1080(para)
+#: ../C/evolution.xml:1083(para)
 msgid "evolution -c calendar"
 msgstr "evolution·-c·calendar"
 
-#: ../C/evolution.xml:1083(para)
+#: ../C/evolution.xml:1086(para)
 msgid "Starts Evolution in calendar mode."
 msgstr "Démarre Evolution en mode Calendriers."
 
-#: ../C/evolution.xml:1088(para)
+#: ../C/evolution.xml:1091(para)
 msgid "evolution -c contacts"
 msgstr "evolution·-c·contacts"
 
-#: ../C/evolution.xml:1091(para)
+#: ../C/evolution.xml:1094(para)
 msgid "Starts Evolution in contacts mode."
 msgstr "Démarre Evolution en mode Contacts."
 
-#: ../C/evolution.xml:1096(para)
+#: ../C/evolution.xml:1099(para)
 msgid "evolution --force-shutdown"
 msgstr "evolution·--force-shutdown"
 
-#: ../C/evolution.xml:1099(para)
+#: ../C/evolution.xml:1102(para)
 msgid "Forces every part of Evolution to shut down immediately."
 msgstr "Force tous les composants d'Evolution à se fermer immédiatement."
 
-#: ../C/evolution.xml:1104(para)
-msgid "evolution ‘%s’"
-msgstr "evolution ‘%s’"
-
 #: ../C/evolution.xml:1107(para)
+msgid "evolution <quote>%s</quote>"
+msgstr "evolution <quote>%s</quote>"
+
+#: ../C/evolution.xml:1110(para)
 msgid ""
-"Makes Evolution your default e-mail handler for your Web browser and in the "
+"Makes Evolution your default email handler for your Web browser and in the "
 "GNOME* Control Center."
 msgstr ""
 "Fait d'Evolution le gestionnaire de courriels par défaut pour votre "
 "navigateur Web et dans le Centre de contrôle GNOME*."
 
-#: ../C/evolution.xml:1118(para)
+#: ../C/evolution.xml:1121(para)
 msgid ""
-"This section, and <link linkend=\"usage-mail-organize\">Organizing Your E-"
-"Mail</link>, provide you with an in-depth guide to the capabilities of "
-"Evolution™ as a mail client. For information about how to customize your "
-"mail account, see <link linkend=\"config-prefs-mail\">Mail Preferences</"
-"link>."
+"This section, and <link linkend=\"usage-mail-organize\">Organizing Your "
+"Email</link>, provide you with an in-depth guide to the capabilities of "
+"<trademark>Evolution</trademark> as a mail client. For information about how "
+"to customize your mail account, see <link linkend=\"config-prefs-mail\">Mail "
+"Preferences</link>."
 msgstr ""
 "Cette section ainsi que la section <link linkend=\"usage-mail-organize"
 "\">Organisation des courriels</link> présente un guide approfondi des "
-"possibilités d'Evolution&trade; comme client de messagerie. Pour plus "
-"d'informations sur la manière de personnaliser votre compte de messagerie, "
-"consultez <link linkend=\"config-prefs-mail\">Préférences du courriel</link>."
+"possibilités d'<trademark>Evolution</trademark> comme client de messagerie. "
+"Pour plus d'informations sur la manière de personnaliser votre compte de "
+"messagerie, consultez <link linkend=\"config-prefs-mail\">Préférences du "
+"courriel</link>."
 
-#: ../C/evolution.xml:1121(link) ../C/evolution.xml:1138(title)
+#: ../C/evolution.xml:1124(link) ../C/evolution.xml:1141(title)
 msgid "Reading Mail"
 msgstr "Lectures des courriels"
 
-#: ../C/evolution.xml:1124(link) ../C/evolution.xml:1379(title)
-msgid "Composing New E-Mail Messages"
+#: ../C/evolution.xml:1127(link) ../C/evolution.xml:1393(title)
+msgid "Composing New Email Messages"
 msgstr "Écriture de nouveaux courriels"
 
-#: ../C/evolution.xml:1127(link) ../C/evolution.xml:1974(title)
+#: ../C/evolution.xml:1130(link) ../C/evolution.xml:1989(title)
 msgid "Sending Invitations by Mail"
 msgstr "Envoi d'invitations par courriel"
 
-#: ../C/evolution.xml:1130(link) ../C/evolution.xml:1997(title)
+#: ../C/evolution.xml:1133(link) ../C/evolution.xml:2012(title)
 msgid "IMAP Subscriptions Manager"
 msgstr "Gestionnaire d'abonnements IMAP"
 
-#: ../C/evolution.xml:1133(link) ../C/evolution.xml:2021(title)
+#: ../C/evolution.xml:1136(link) ../C/evolution.xml:2036(title)
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: ../C/evolution.xml:1139(para)
+#: ../C/evolution.xml:1142(para)
 msgid ""
 "If you are not already viewing mail, switch to the mail tool by clicking the "
 "Mail shortcut button, or press Ctrl+1. To read a message, select it in the "
@@ -3093,22 +3094,22 @@ msgstr ""
 "messages ; si vous préférez le voir dans une fenêtre indépendante, double-"
 "cliquez sur le message ou appyuez sur Entrée ou sur Ctrl+O."
 
-#: ../C/evolution.xml:1141(para)
+#: ../C/evolution.xml:1144(para)
 msgid ""
 "To read mail with the keyboard, you can click the Spacebar to page down and "
-"press Backspace to page up while reading an e-mail. Ensure that you use the "
-"keys when message list is enabled."
+"press Backspace to page up while reading an email. Ensure that you use the "
+"keys when the message list is enabled."
 msgstr ""
 "Pour lire le courriel à l'aide du clavier, vous pouvez appuyer sur la barre "
 "espace pour faire défiler vers le bas, et sur la touche Retour arrière pour "
 "faire défiler vers le haut. Prenez bien soin d'utiliser ces touches lorsque "
 "la liste des messages est active."
 
-#: ../C/evolution.xml:1142(para)
+#: ../C/evolution.xml:1145(para)
 msgid ""
 "Navigate the message list by using the arrow keys on the keyboard. To go to "
 "the next and previous unread messages, press the period (.) or comma (,) "
-"keys. On most keyboards, these keys are also marked with the &gt; and &lt; "
+"keys. On some keyboards, these keys are also marked with the &gt; and &lt; "
 "symbols, which is a convenient way to remember that they move you forward "
 "and backward in your message list. You can also use the right square bracket "
 "(]) for the next unread message, and the left square bracket ([) for the "
@@ -3116,86 +3117,103 @@ msgid ""
 msgstr ""
 "Naviguez dans la liste des messages à l'aide des touches flèches du clavier. "
 "Pour afficher le prochain ou le précédent message non lu, appuyez sur les "
-"touches point (.) ou virgule (,). Sur la plupart des claviers, ces touches "
+"touches point (.) ou virgule (,). Sur certains claviers, ces touches "
 "comportent aussi les symboles &gt; et &lt;, ce qui permet de se rappeler "
 "facilement qu'elles font avancer ou reculer dans la liste des messages. Vous "
 "pouvez aussi utiliser le crochet droit (]) pour le prochain message non lu "
 "et le crochet gauche ([) pour le message non lu précédent."
 
-#: ../C/evolution.xml:1146(title)
+#: ../C/evolution.xml:1149(title)
 msgid "Magic Spacebar For Reading Mail"
 msgstr "Barre d'espace magique pour la lecture des messages"
 
-#: ../C/evolution.xml:1147(para)
+#: ../C/evolution.xml:1150(para)
 msgid ""
 "With Magic Spacebar, you can easily read the unread messages in all the mail "
-"folders. You can read mail, scroll the mail and switch folders using the "
-"spacebar on your keyboard."
+"folders. You can read mail, scroll through mail and switch folders by using "
+"the Spacebar on your keyboard."
 msgstr ""
 "Avec la barre d'espace magique, vous pouvez facilement lire les messages non "
 "lus de tous les dossiers. Vous pouvez lire les messages, faire défiler le "
 "texte des messages et changer de dossier, tout cela à l'aide de la barre "
 "d'espace de votre clavier."
 
-#: ../C/evolution.xml:1148(para)
-msgid ""
-"When you are on the Mail view, the spacebar will give you the following "
-"behavior:"
+#: ../C/evolution.xml:1151(para)
+msgid "To enable Magic Spacebar:"
+msgstr "Pour activer la barre d'espace magique :"
+
+#: ../C/evolution.xml:1154(para) ../C/evolution.xml:1250(para)
+#: ../C/evolution.xml:2135(para) ../C/evolution.xml:2174(para)
+#: ../C/evolution.xml:2235(para) ../C/evolution.xml:5060(para)
+#: ../C/evolution.xml:5333(para) ../C/evolution.xml:5616(para)
+#: ../C/evolution.xml:5632(para) ../C/evolution.xml:6050(para)
+msgid "Select Edit &gt; Preferences, then select Mail Accounts."
+msgstr ""
+"Choisissez Édition &gt; Préférences, puis sélectionnez Comptes de messagerie."
+
+#: ../C/evolution.xml:1157(para)
+msgid "Select the Enable Magic Spacebar check box."
+msgstr "Cochez la case « Activer la barre d'espace magique »."
+
+#: ../C/evolution.xml:1160(para)
+msgid "When you are in the Mail view, the Spacebar has the following behavior:"
 msgstr ""
 "Lorsque vous vous trouvez dans le mode « Courriel », la barre d'espace "
 "présente le comportement suivant :"
 
-#: ../C/evolution.xml:1151(para)
+#: ../C/evolution.xml:1163(para)
 msgid ""
-"When you press the spacebar for the first time, it takes you to the next "
+"When you press the Spacebar for the first time, it takes you to the next "
 "unread message."
 msgstr ""
 "En appuyant sur la barre d'espace pour la première fois, vous arrivez sur le "
 "prochain message non lu."
 
-#: ../C/evolution.xml:1154(para)
-msgid "If the message is more than one screen long, the spacebar works as pagedown."
+#: ../C/evolution.xml:1166(para)
+msgid ""
+"If the message is more than one screen long, the Spacebar works as Page Down "
+"key."
 msgstr ""
 "Si le texte du message dépasse la hauteur d'un écran, la barre d'espace "
 "fonctionne comme la touche Page suivante."
 
-#: ../C/evolution.xml:1157(para)
+#: ../C/evolution.xml:1169(para)
 msgid ""
-"If you press the spacebar after you reach the bottom of the page, it takes "
-"you to the next unread message if any."
+"If you press the Spacebar after you reach the bottom of the page, it takes "
+"you to the next unread message."
 msgstr ""
 "Si vous appuyez sur la barre d'espace alors que vous vous trouvez en fin de "
-"message, vous arrivez sur le prochain message non lu, s'il y en a un."
+"message, vous arrivez sur le prochain message non lu."
 
-#: ../C/evolution.xml:1160(para)
+#: ../C/evolution.xml:1172(para)
 msgid ""
-"If there are no more unread messages in the mailbox, pressing spacebar takes "
-"you to the next unread message in the next folder."
+"If there are no more unread messages in the mailbox, pressing the Spacebar "
+"takes you to the next unread message in the next folder."
 msgstr ""
 "S'il n'y a plus de message non lu dans le dossier de messagerie actuel, un "
 "appui sur la barre d'espace vous amène au prochain message non lu du dossier "
 "suivant."
 
-#: ../C/evolution.xml:1163(para)
+#: ../C/evolution.xml:1175(para)
 msgid ""
-"If new messages arrive in a number of folders, spacebar toggles between "
+"If new messages arrive in a number of folders, the Spacebar toggles between "
 "those folders. This feature allows you to switch to the next unread message "
-"in a different folder without having to click the folder."
+"in a different folder without clicking the folder."
 msgstr ""
 "Si vous avez reçu des nouveaux messages dans plusieurs dossiers, la barre "
 "d'espace passe d'un dossier à l'autre. Cette fonctionnalité permet de passer "
 "au prochain message non lu dans un autre dossier sans devoir cliquer sur ce "
 "dossier."
 
-#: ../C/evolution.xml:1169(title)
+#: ../C/evolution.xml:1181(title)
 msgid "Checking for New Mail"
 msgstr "Relève des nouveaux messages"
 
-#: ../C/evolution.xml:1170(para)
+#: ../C/evolution.xml:1182(para)
 msgid ""
 "To check your mail, click Send/Receive in the toolbar. If you haven't "
 "created any mail accounts yet, the setup assistant asks you for the "
-"information it needs to check your e-mail. For information on creating mail "
+"information it needs to check your email. For information on creating mail "
 "accounts, see <link linkend=\"usage-mainwindow-starting\">Starting Evolution "
 "for the First Time</link>."
 msgstr ""
@@ -3206,23 +3224,17 @@ msgstr ""
 "messagerie, consultez <link linkend=\"usage-mainwindow-starting\">Premier "
 "lancement d'Evolution</link>."
 
-#: ../C/evolution.xml:1172(para)
-msgid "‘Get Mail' in the Evolution toolbar replaced with Send/Receive tool in SLED."
-msgstr ""
-"« Relever le courriel » dans la barre d'outils Evolution remplacé par "
-"l'outil Envoyer/Recevoir dans SLED."
-
-#: ../C/evolution.xml:1174(para)
+#: ../C/evolution.xml:1183(para)
 msgid ""
 "If this is your first time checking mail, or you haven't asked Evolution to "
 "store your password, you are prompted for the password. Enter your password "
-"to download your e-mail."
+"to download your email."
 msgstr ""
 "Si c'est la première fois que vous relevez vos courriels ou si vous n'avez "
 "pas demandé à Evolution de conserver votre mot de passe, vous devez le "
 "saisir. Saisissez votre mot de passe pour télécharger vos courriels."
 
-#: ../C/evolution.xml:1175(para)
+#: ../C/evolution.xml:1184(para)
 msgid ""
 "If you get an error message instead of mail, you probably need to check your "
 "network settings. To learn how to do that, see <link linkend=\"mail-prefs-"
@@ -3233,36 +3245,38 @@ msgstr ""
 "consultez les <link linkend=\"mail-prefs-headers\"/>Préférences des en-têtes "
 "de messages</link> ou demandez à votre administrateur système."
 
-#: ../C/evolution.xml:1179(title)
+#: ../C/evolution.xml:1188(title)
 msgid "New Mail Notification"
 msgstr "Notification des nouveaux courriels"
 
-#: ../C/evolution.xml:1180(para)
+#: ../C/evolution.xml:1189(para)
 msgid ""
-"Evolution notifies you of new e-mail arriving. When you receive a new mail "
-"in your inbox, a blinking icon appears on the Switcher."
+"Evolution notifies you of new email. When you receive a new mail in your "
+"inbox, a blinking icon appears on the Switcher."
 msgstr ""
 "Evolution vous avertit lorsque vous recevez de nouveaux courriels. Lorsqu'un "
-"nouveau courriel arrive dans votre boîte de réception, une icône se met à clignoter dans le sélecteur."
+"nouveau courriel arrive dans votre boîte de réception, une icône se met à "
+"clignoter dans le sélecteur."
 
-#: ../C/evolution.xml:1182(para)
+#: ../C/evolution.xml:1191(para)
 msgid ""
-"You can also view a blinking icon <inlinegraphic format=\"PNG\" fileref="
+"You can also see a blinking icon <inlinegraphic format=\"PNG\" fileref="
 "\"figures/evo_blink.png\"/> in the notification area that disappears when "
-"you open the new e-mail. You can keep the mose over the <inlinegraphic "
+"you open the new email. You can keep the mouse over the <inlinegraphic "
 "format=\"PNG\" fileref=\"figures/evo_blink.png\"/> icon to view the "
 "notification message."
 msgstr ""
-"Vous pouvez également voir une icône <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"evo_blink.png\"/> clignotante dans la zone de notification. Celle-ci disparaît au moment où vous ouvrez le nouveau "
-"courriel. Vous pouvez placer la souris sur l'icône <inlinegraphic format=\"PNG"
-"\" fileref=\"figures/evo_blink.png\"/> pour voir s'afficher la notification."
+"Vous pouvez également voir une icône <inlinegraphic format=\"PNG\" fileref="
+"\"figures/evo_blink.png\"/> clignotante dans la zone de notification. Celle-"
+"ci disparaît au moment où vous ouvrez le nouveau courriel. Vous pouvez "
+"placer la souris sur l'icône <inlinegraphic format=\"PNG\" fileref=\"figures/"
+"evo_blink.png\"/> pour voir s'afficher la notification."
 
-#: ../C/evolution.xml:1186(title)
-msgid "Vertical View Vs Classical View"
-msgstr "Affichage vertical ou classique"
+#: ../C/evolution.xml:1195(title)
+msgid "Vertical View Versus Classical View"
+msgstr "Affichage vertical ou affichage classique"
 
-#: ../C/evolution.xml:1187(para)
+#: ../C/evolution.xml:1196(para)
 msgid ""
 "Evolution provides you vertical view in addition to the classical view. In "
 "the vertical view, message preview pane is located at the right side of the "
@@ -3276,22 +3290,22 @@ msgstr ""
 "en-dessous de la liste des messages. L'affichage vertical vous permet "
 "d'exploiter la largeur supplémentaire des écrans au format écran large."
 
-#: ../C/evolution.xml:1189(title)
+#: ../C/evolution.xml:1198(title)
 msgid "Vertical View:"
 msgstr "Affichage vertical :"
 
-#: ../C/evolution.xml:1190(para)
+#: ../C/evolution.xml:1199(para)
 msgid "To switch to vertical view"
 msgstr "Pour passer à l'affichage vertical"
 
-#: ../C/evolution.xml:1194(para)
+#: ../C/evolution.xml:1203(para)
 msgid "Click View &gt; Preview &gt; Vertical View"
 msgstr "Choisissez Affichage &gt; Aperçu &gt; Affichage vertical"
 
-#: ../C/evolution.xml:1197(para)
+#: ../C/evolution.xml:1206(para)
 msgid ""
 "In Vertical view, default message list contains a double line compressed "
-"headers, which enables you to consume the extra width in the preview column."
+"headers, which enables you to consume the extra width in the preview column. "
 "The compressed columns have Sender Name and Email, Attachment Icon, Date and "
 "Subject in the second line."
 msgstr ""
@@ -3301,23 +3315,23 @@ msgstr ""
 "courriel de l'expéditeur, l'icône de pièces jointes, la date ainsi que le "
 "sujet en deuxième ligne."
 
-#: ../C/evolution.xml:1200(title)
+#: ../C/evolution.xml:1209(title)
 msgid "Classical View:"
 msgstr "Affichage classique :"
 
-#: ../C/evolution.xml:1201(para)
+#: ../C/evolution.xml:1210(para)
 msgid "To switch to classical view,"
 msgstr "Pour passer à l'affichage classique,"
 
-#: ../C/evolution.xml:1205(para)
+#: ../C/evolution.xml:1214(para)
 msgid "Click View &gt; Preview &gt; Classical View"
 msgstr "Choisissez Affichage &gt; Aperçu &gt; Affichage classique"
 
-#: ../C/evolution.xml:1211(title)
+#: ../C/evolution.xml:1220(title)
 msgid "Collapsible Message Headers"
 msgstr "En-têtes de message réduits"
 
-#: ../C/evolution.xml:1212(para)
+#: ../C/evolution.xml:1221(para)
 msgid ""
 "Evolution compresses the TO, CC, BCC headers of received mail and shows only "
 "limited addresses. You can set the limit of the number of addresses to be "
@@ -3327,36 +3341,41 @@ msgstr ""
 "qu'une partie des adresses. Vous pouvez définir la limite du nombre "
 "d'adresses affichées dans le panneau d'aperçu."
 
-#: ../C/evolution.xml:1214(para)
-msgid "Use the following procedure to set the limit of addresses to be displayed:"
+#: ../C/evolution.xml:1223(para)
+msgid ""
+"Use the following procedure to set the limit of addresses to be displayed:"
 msgstr ""
 "Utilisez la procédure suivante pour définir la limite des adresses à "
 "afficher :"
 
-#: ../C/evolution.xml:1217(para)
-msgid "Click Edit &gt; Preferences"
-msgstr "Choisissez Édition &gt; Préférences"
+#: ../C/evolution.xml:1226(para) ../C/evolution.xml:1884(para)
+#: ../C/evolution.xml:2211(para) ../C/evolution.xml:5035(para)
+#: ../C/evolution.xml:5229(para) ../C/evolution.xml:6357(para)
+msgid "Select Edit &gt; Preferences."
+msgstr "Choisissez Édition &gt; Préférences."
 
-#: ../C/evolution.xml:1220(para)
-msgid "Select Mail Preferences"
-msgstr "Sélectionnez Préférences du courriel"
+#: ../C/evolution.xml:1229(para)
+msgid "Select Mail Preferences."
+msgstr "Sélectionnez Préférences du courriel."
 
-#: ../C/evolution.xml:1223(para)
-msgid "Check ‘Shrink To/CC/Bcc headers to column’ to limit the address"
+#: ../C/evolution.xml:1232(para)
+msgid ""
+"Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
+"address."
 msgstr ""
 "Cochez « Réduire les en-têtes À / Cc / Cci à » pour limiter les adresses "
-"affichées"
+"affichées."
 
-#: ../C/evolution.xml:1226(para)
+#: ../C/evolution.xml:1235(para)
 msgid "Enter the limit in the field."
 msgstr "Saisissez la limite dans le champ correspondant."
 
-#: ../C/evolution.xml:1229(para)
+#: ../C/evolution.xml:1238(para)
 msgid ""
-"You can expand the message headers by click the <inlinegraphic format=\"PNG"
-"\" fileref=\"figures/plus.png\"/> icon or the ‘…’ in the message preview "
-"pane. To collapse click <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"minus.png\"/> icon in the preview pane."
+"You can expand the message headers by clicking the <inlinegraphic format="
+"\"PNG\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> "
+"in the message preview pane. To collapse click <inlinegraphic format=\"PNG\" "
+"fileref=\"figures/minus.png\"/> icon in the preview pane."
 msgstr ""
 "Vous pouvez étendre les en-têtes de message en cliquant sur l'icône "
 "<inlinegraphic format=\"PNG\" fileref=\"figures/plus.png\"/> ou sur « ... » "
@@ -3364,36 +3383,38 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/minus.png\"/> dans le "
 "panneau d'aperçu."
 
-#: ../C/evolution.xml:1233(title)
+#: ../C/evolution.xml:1242(title)
 msgid "Sharing Mailboxes with Other Mail Programs"
 msgstr "Partage de boîte aux lettres avec d'autres programmes"
 
-#: ../C/evolution.xml:1234(para)
+#: ../C/evolution.xml:1243(para)
 msgid ""
-"If you want to use Evolution and another e-mail client, such as Mutt, at the "
+"If you want to use Evolution and another email client, such as Mutt, at the "
 "same time, use the following procedure:"
 msgstr ""
 "Si vous voulez utiliser Evolution en même temps qu'un autre programme, comme "
 "Mutt par exemple, utilisez la procédure suivante :"
 
-#: ../C/evolution.xml:1237(para)
+#: ../C/evolution.xml:1246(para)
 msgid "Download your mail in the other application as you would normally."
 msgstr "Téléchargez vos courriels dans l'autre application, comme d'habitude."
 
-#: ../C/evolution.xml:1240(para)
+#: ../C/evolution.xml:1249(para)
+msgid "In Evolution:"
+msgstr "Dans Evolution :"
+
+#: ../C/evolution.xml:1251(para)
 msgid ""
-"In Evolution, click Edit &gt; Preferences, then click Mail Accounts. Select "
-"the account you want to use to share mail and click Edit. Instead of Edit, "
-"you might want to create a new account just for this source of mail by "
+"Select the account you want to use to share mail and click Edit. Instead of "
+"Edit, you might want to create a new account just for this source of mail by "
 "clicking New."
 msgstr ""
-"Dans Evolution, choisissez Édition &gt; Préférences, puis sélectionnez "
-"Comptes de messagerie. Sélectionnez le compte dont vous voulez partager les "
-"messages et cliquez sur Éditer. Au lieu d'éditer un compte existant, vous "
-"pouvez également créer un nouveau compte uniquement pour cette source de "
-"messages en cliquant sur Nouveau."
+"Sélectionnez le compte dont vous voulez partager les messages et cliquez sur "
+"Éditer. Au lieu d'éditer un compte existant, vous pouvez également créer un "
+"nouveau compte uniquement pour cette source de messages en cliquant sur "
+"Nouveau."
 
-#: ../C/evolution.xml:1243(para)
+#: ../C/evolution.xml:1254(para)
 msgid ""
 "Under the Receiving Mail tab, select the type of mail file that your other "
 "mail application uses, then specify the full path to that location. A "
@@ -3406,7 +3427,7 @@ msgstr ""
 "classique, avec un chemin d'accès vers /home/<varname>nom d'utilisateur</"
 "varname>/Mail/."
 
-#: ../C/evolution.xml:1249(para)
+#: ../C/evolution.xml:1260(para)
 msgid ""
 "You can only use one mail client at a time. The mail files are locked by the "
 "mail program that is currently using them, so the mail files can't be "
@@ -3417,11 +3438,11 @@ msgstr ""
 "actuellement, ils ne sont donc pas accessibles par un autre logiciel de "
 "messagerie."
 
-#: ../C/evolution.xml:1253(title)
+#: ../C/evolution.xml:1264(title)
 msgid "Working with Attachments and HTML Mail"
 msgstr "Gestion des pièces jointes et du courriel HTML"
 
-#: ../C/evolution.xml:1254(para)
+#: ../C/evolution.xml:1265(para)
 msgid ""
 "If someone sends you an <link linkend=\"attachment\">attachment</link>, "
 "Evolution displays a file icon at the end of the message to which it is "
@@ -3441,19 +3462,19 @@ msgstr ""
 "sur son icône. Cliquez sur le bouton Tout enregistrer pour enregistrer "
 "toutes les pièces jointes."
 
-#: ../C/evolution.xml:1257(title)
+#: ../C/evolution.xml:1268(title)
 msgid "Saving or Opening Attachments"
 msgstr "Enregistrement et ouverture des pièces jointes"
 
-#: ../C/evolution.xml:1258(para)
+#: ../C/evolution.xml:1269(para)
 msgid ""
-"If you get an e-mail message with an attachment, Evolution can help you save "
+"If you get an email message with an attachment, Evolution can help you save "
 "the attachment or open it with the appropriate applications."
 msgstr ""
 "Si vous recevez un courriel avec une pièce jointe, Evolution vous aide à "
 "l'enregistrer ou à l'ouvrir avec l'application appropriée."
 
-#: ../C/evolution.xml:1259(para)
+#: ../C/evolution.xml:1270(para)
 msgid ""
 "Evolution shows a right-arrow icon, the number of attachments, and a Save or "
 "Save All button to save all the attachments. Click the right-arrow icon to "
@@ -3463,40 +3484,35 @@ msgstr ""
 "bouton Enregistrer ou Tout enregistrer pour enregistrer les pièces jointes. "
 "Cliquez sur l'icône flèche droite pour afficher la barre des pièces jointes."
 
-#: ../C/evolution.xml:1260(para)
+#: ../C/evolution.xml:1271(para)
 msgid "To save an attachment to disk:"
 msgstr "Pour enregistrer une pièce jointe sur le disque :"
 
-#: ../C/evolution.xml:1263(para)
+#: ../C/evolution.xml:1274(para) ../C/evolution.xml:1289(para)
 msgid ""
-"Click the down-arrow on the attachment icon, or right-click the attachment "
-"icon in the attachment bar, then click Save As."
+"Click the down-arrow on the attachment icon or right-click the attachment "
+"icon in the attachment bar."
 msgstr ""
-"Cliquez sur la flèche bas sur l'icône de la pièce jointe ou faites un clic "
-"droit sur l'icône de la pièce jointe dans la barre des pièces jointes, puis "
-"cliquez sur Enregistrer sous."
+"Cliquez sur la flèche bas sur l'icône de pièce jointe ou faites un clic "
+"droit sur l'icône de la pièce jointe dans la barre des pièces jointes."
 
-#: ../C/evolution.xml:1266(para)
+#: ../C/evolution.xml:1277(para)
+msgid "Click Save As."
+msgstr "Cliquez sur « Enregistrer sous »."
+
+#: ../C/evolution.xml:1280(para)
 msgid "Select a location and name for the file."
 msgstr "Choisissez un emplacement et un nom pour le fichier."
 
-#: ../C/evolution.xml:1272(para)
+#: ../C/evolution.xml:1286(para)
 msgid "To open an attachment using another application:"
 msgstr "Pour ouvrir une pièce jointe avec une autre application :"
 
-#: ../C/evolution.xml:1275(para)
-msgid ""
-"Click the down-arrow on the attachment icon or right-click the attachment "
-"icon in the attachment bar."
-msgstr ""
-"Cliquez sur la flèche bas sur l'icône de pièce jointe ou faites un clic "
-"droit sur l'icône de la pièce jointe dans la barre des pièces jointes."
-
-#: ../C/evolution.xml:1278(para)
+#: ../C/evolution.xml:1292(para)
 msgid "Select the application to open the attachment."
 msgstr "Sélectionnez l'application qui ouvrira la pièce jointe."
 
-#: ../C/evolution.xml:1284(para)
+#: ../C/evolution.xml:1298(para)
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications your system has installed. For example, "
@@ -3510,11 +3526,11 @@ msgstr ""
 "par un autre traitement de texte, les fichiers d'archives compressées "
 "peuvent être ouverts par le Gestionnaire d'archives."
 
-#: ../C/evolution.xml:1288(title)
+#: ../C/evolution.xml:1302(title)
 msgid "Inline Images in HTML Mail"
 msgstr "Images intégrées dans les courriels HTML"
 
-#: ../C/evolution.xml:1289(para)
+#: ../C/evolution.xml:1303(para)
 msgid ""
 "When someone sends you HTML mail that includes an image in the body of the "
 "message (for example, the welcome message in your Inbox), Evolution displays "
@@ -3529,13 +3545,13 @@ msgstr ""
 "messages. Il est aussi possible de glisser une image dans la zone d'édition "
 "du message."
 
-#: ../C/evolution.xml:1290(para)
+#: ../C/evolution.xml:1304(para)
 msgid ""
 "Some images are links in a message, rather than being part of the message. "
 "Evolution can download those images from the Internet, but does not do so "
-"unless you request it. This is because remotely Servered images can be slow "
+"unless you request it. This is because remotely servered images can be slow "
 "to load and display, and can even be used by spammers to track who reads the "
-"e-mail. Not automatically loading images helps protect your privacy."
+"email. Not automatically loading images helps protect your privacy."
 msgstr ""
 "Certaines images sont des liens dans un message, au lieu de faire partie "
 "intégrante du message. Evolution peut télécharger ces images depuis "
@@ -3545,29 +3561,29 @@ msgstr ""
 "pour savoir qui lit les messages. Le chargement manuel des images favorise "
 "la protection de votre vie privée."
 
-#: ../C/evolution.xml:1291(para)
+#: ../C/evolution.xml:1305(para)
 msgid "To load the images for one message:"
 msgstr "Pour charger les images d'un message :"
 
-#: ../C/evolution.xml:1294(para)
+#: ../C/evolution.xml:1308(para)
 msgid "Click View &gt; Load Images."
 msgstr "Choisissez Affichage &gt; Charger les images."
 
-#: ../C/evolution.xml:1297(para)
+#: ../C/evolution.xml:1311(para)
 msgid "To set the default action for loading images:"
 msgstr "Pour définir l'action par défaut de chargement des images :"
 
-#: ../C/evolution.xml:1300(para)
-msgid "Click Edit &gt; Preferences, then click Mail Preferences."
+#: ../C/evolution.xml:1314(para)
+msgid "Select Edit &gt; Preferences, then select Mail Preferences."
 msgstr ""
 "Choisissez Édition &gt; Préférences, puis cliquez sur Préférences du "
 "courriel."
 
-#: ../C/evolution.xml:1303(para)
+#: ../C/evolution.xml:1317(para)
 msgid "Click the HTML Mail tab."
 msgstr "Cliquez sur l'onglet Courriel HTML."
 
-#: ../C/evolution.xml:1306(para)
+#: ../C/evolution.xml:1320(para)
 msgid ""
 "Select one of the items: Never Load Images Off the Net, Load Images in Mail "
 "From Contacts, or Always Load Images Off the Net."
@@ -3576,27 +3592,28 @@ msgstr ""
 "d'Internet, Ouvrir les images dans les courriels des contacts ou Toujours "
 "charger les images à partir d'Internet."
 
-#: ../C/evolution.xml:1309(para) ../C/evolution.xml:1357(para)
-#: ../C/evolution.xml:1783(para) ../C/evolution.xml:1817(para)
-#: ../C/evolution.xml:1840(para) ../C/evolution.xml:2135(para)
-#: ../C/evolution.xml:2173(para) ../C/evolution.xml:2204(para)
-#: ../C/evolution.xml:2233(para)
+#: ../C/evolution.xml:1323(para) ../C/evolution.xml:1371(para)
+#: ../C/evolution.xml:1562(para) ../C/evolution.xml:1797(para)
+#: ../C/evolution.xml:1831(para) ../C/evolution.xml:1854(para)
+#: ../C/evolution.xml:2150(para) ../C/evolution.xml:2189(para)
+#: ../C/evolution.xml:2223(para) ../C/evolution.xml:2255(para)
+#: ../C/evolution.xml:5693(para) ../C/evolution.xml:6071(para)
 msgid "Click Close."
 msgstr "Cliquez sur Fermer."
 
-#: ../C/evolution.xml:1312(para)
+#: ../C/evolution.xml:1326(para)
 msgid "To set your proxy in KDE:"
 msgstr "Pour définir votre proxy dans KDE :"
 
-#: ../C/evolution.xml:1315(para)
+#: ../C/evolution.xml:1329(para)
 msgid "Click the menu icon &gt; System &gt; Configuration &gt; Yast."
 msgstr "Cliquez sur l'icône du menu &gt; Système &gt; Configuration &gt; Yast."
 
-#: ../C/evolution.xml:1318(para) ../C/evolution.xml:1333(para)
+#: ../C/evolution.xml:1332(para) ../C/evolution.xml:1347(para)
 msgid "Click Network Services, then click Proxy."
 msgstr "Cliquez sur Services réseau, puis sur Proxy."
 
-#: ../C/evolution.xml:1321(para) ../C/evolution.xml:1336(para)
+#: ../C/evolution.xml:1335(para) ../C/evolution.xml:1350(para)
 msgid ""
 "Specify your proxy settings (if you don't know your proxy settings, contact "
 "your ISP or system administrator)."
@@ -3605,15 +3622,15 @@ msgstr ""
 "de votre proxy, contactez votre fournisseur d'accès ou votre administrateur "
 "système)."
 
-#: ../C/evolution.xml:1324(para) ../C/evolution.xml:1339(para)
+#: ../C/evolution.xml:1338(para) ../C/evolution.xml:1353(para)
 msgid "Click Finish, then click Close."
 msgstr "Cliquez sur Terminer, puis sur Fermer."
 
-#: ../C/evolution.xml:1327(para)
+#: ../C/evolution.xml:1341(para)
 msgid "To set your proxy in GNOME:"
 msgstr "Pour définir votre proxy dans GNOME :"
 
-#: ../C/evolution.xml:1330(para)
+#: ../C/evolution.xml:1344(para)
 msgid ""
 "Click System &gt; Administrative Settings (enter your root password if "
 "needed)."
@@ -3621,17 +3638,17 @@ msgstr ""
 "Cliquez sur Système &gt; Administration (saisissez le mot de passe "
 "d'administration si nécessaire)."
 
-#: ../C/evolution.xml:1346(title)
+#: ../C/evolution.xml:1360(title)
 msgid "Using Evolution for News"
 msgstr "Utilisation d'Evolution pour les nouvelles"
 
-#: ../C/evolution.xml:1347(para)
+#: ../C/evolution.xml:1361(para)
 msgid ""
 "USENET newsgroups are similar to mail, so it is often convenient to read "
 "news and mail side by side. You can add a news source, called an NNTP "
-"server, the same way you would add <link linkend=\"bse54o0\">new e-mail "
-"account</link>, selecting USENET News as the source type. The news server "
-"appear as a remote mail server, and each news group works like an IMAP "
+"server, the same way you would add <link linkend=\"bse54o0\">new email "
+"account</link>, selecting USENET News as the Server type. The news server "
+"appear as a remote mail server, and each newsgroup works like an IMAP "
 "folder. When you click Send/Receive, Evolution also checks for news messages."
 msgstr ""
 "Les groupes de nouvelles USENET sont comparables au courrier électronique, "
@@ -3639,24 +3656,24 @@ msgstr ""
 "à côte. Vous pouvez ajouter une source de nouvelles, appelée un serveur "
 "NNTP, de la même manière qu'on crée un <link linkend=\"bse54o0\">nouveau "
 "compte de messagerie</link>, en sélectionnant Nouvelles USENET comme type de "
-"source. Le serveur de nouvelles apparaît comme un serveur de messagerie "
+"serveur. Le serveur de nouvelles apparaît comme un serveur de messagerie "
 "distant, et chaque groupe de nouvelles fonctionne comme un dossier IMAP. "
 "Lorsque vous cliquez sur Envoyer/Recevoir, Evolution relève également les "
 "messages de nouvelles."
 
-#: ../C/evolution.xml:1348(para)
+#: ../C/evolution.xml:1362(para)
 msgid ""
-"When you create a news group account, you are not subscribed to any groups. "
-"To subscribe to a news group:"
+"When you create a newsgroup account, you are not subscribed to any groups. "
+"To subscribe to a newsgroup:"
 msgstr ""
 "Lorsque vous créez un compte de groupe de nouvelles, vous n'êtes inscrit à "
 "aucun groupe. Pour vous inscrire à un groupe de nouvelles :"
 
-#: ../C/evolution.xml:1351(para) ../C/evolution.xml:5326(para)
+#: ../C/evolution.xml:1365(para) ../C/evolution.xml:5303(para)
 msgid "Click Folder &gt; Subscriptions."
 msgstr "Choisissez Dossier &gt; Abonnements."
 
-#: ../C/evolution.xml:1354(para)
+#: ../C/evolution.xml:1368(para)
 msgid ""
 "Select your NNTP account, select the groups you want to subscribe to, then "
 "click Subscribe."
@@ -3664,11 +3681,11 @@ msgstr ""
 "Sélectionnez votre compte NNTP, sélectionnez les groupes auxquels vous "
 "voulez vous abonner, puis cliquez sur S'abonner."
 
-#: ../C/evolution.xml:1363(title)
+#: ../C/evolution.xml:1377(title)
 msgid "Deleting Mail"
 msgstr "Suppression de courriels"
 
-#: ../C/evolution.xml:1364(para)
+#: ../C/evolution.xml:1378(para)
 msgid ""
 "Evolution allows you to delete unwanted messages. To delete a message, "
 "select it and press the Delete key, or click the delete tool in the toolbar, "
@@ -3679,10 +3696,10 @@ msgstr ""
 "cliquez sur le bouton Supprimer de la barre d'outils ou appuyez sur Ctrl+D "
 "ou faites un clic droit sur le message et choisissez Supprimer."
 
-#: ../C/evolution.xml:1365(para)
+#: ../C/evolution.xml:1379(para)
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
-"deleted, but is marked for deletion. Your e-mail is recoverable until you "
+"deleted, but is marked for deletion. Your email is recoverable until you "
 "have expunged your mail. When you expunge a folder, you remove all the mail "
 "that you have marked for deletion.To show deleted messages, uncheck Hide "
 "Deleted Messages option from the View menu. You can view the messages "
@@ -3698,7 +3715,7 @@ msgstr ""
 "menu Affichage. Ces messages apparaissent barrés. Vous pouvez également "
 "afficher ces messages dans le dossier Corbeille."
 
-#: ../C/evolution.xml:1366(para)
+#: ../C/evolution.xml:1380(para)
 msgid ""
 "To permanently erase all the deleted messages in a folder, click Folder &gt; "
 "Expunge or press Ctrl+E."
@@ -3706,11 +3723,11 @@ msgstr ""
 "Pour effacer définitivement les messages supprimés d'un dossier, choisissez "
 "Dossier &gt; Nettoyer ou appuyez sur Ctrl+E."
 
-#: ../C/evolution.xml:1367(para)
+#: ../C/evolution.xml:1381(para)
 msgid ""
 "Trash folders in GroupWise, local and IMAP accounts are actually virtual "
 "search folders that display all messages you have marked for later deletion. "
-"Hence, emptying Trash is nothing but expunging deleted mails from all your "
+"Hence, emptying Trash is nothing but expunging deleted mail from all your "
 "folders in the account."
 msgstr ""
 "Les dossiers Corbeille dans les comptes GroupWise, locaux et IMAP sont en "
@@ -3719,7 +3736,7 @@ msgstr ""
 "n'est rien d'autre que le nettoyage des courriels supprimés dans tous les "
 "dossiers du compte."
 
-#: ../C/evolution.xml:1368(para)
+#: ../C/evolution.xml:1382(para)
 msgid ""
 "However, this is not true for the Trash folder on Exchange servers, which "
 "behaves just the same as it does in Outlook. It is a normal folder with "
@@ -3733,20 +3750,23 @@ msgstr ""
 "\"usage-mail-organize-vfolders\">Utilisation des dossiers de recherche</"
 "link>."
 
-#: ../C/evolution.xml:1372(title)
+#: ../C/evolution.xml:1386(title)
 msgid "Undeleting Messages"
 msgstr "Récupération de messages"
 
-#: ../C/evolution.xml:1373(para)
+#: ../C/evolution.xml:1387(para)
 msgid ""
 "You can undelete a message that has been deleted but not expunged. To "
-"undelete a message, select the message, click Edit &gt; Undelete."
+"undelete a message, select the message, click Edit &gt; Undelete. Note that "
+"View &gt; Hide Deleted messages in the menubar must be disabled for this."
 msgstr ""
 "Vous pouvez récupérer un message qui a été supprimé, mais pas nettoyé. Pour "
 "récupérer un message, sélectionnez le message et choisissez Édition &gt; "
-"Récupérer le message."
+"Récupérer le message. Notez que Affichage &gt; Masquer les messages "
+"supprimés dans la barre de menus doit être désactivé pour que cela "
+"fonctionne."
 
-#: ../C/evolution.xml:1374(para)
+#: ../C/evolution.xml:1388(para)
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is removed from the Trash folder."
@@ -3754,9 +3774,9 @@ msgstr ""
 "Si vous avez marqué un message pour la suppression, la récupération enlève "
 "cette marque et le message n'apparaît plus dans le dossier Corbeille."
 
-#: ../C/evolution.xml:1380(para)
+#: ../C/evolution.xml:1394(para)
 msgid ""
-"You can start writing a new e-mail message by clicking File &gt; New &gt; "
+"You can start writing a new email message by clicking File &gt; New &gt; "
 "Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking "
 "New in the toolbar."
 msgstr ""
@@ -3764,78 +3784,78 @@ msgstr ""
 "&gt; Nouveau &gt; Message, ou en appuyant sur Ctrl+N dans le composant "
 "Courriel ou en cliquant sur Nouveau dans la barre d'outils."
 
-#: ../C/evolution.xml:1381(para)
+#: ../C/evolution.xml:1395(para)
 msgid ""
 "Enter an address in the To field. If you want to enter multiple email "
-"addresses, type in the addresses separated by comma. You can also use "
-"contact list to send messages to multiple recipients.Enter a subject in the "
+"addresses, type in the addresses separated by comma. You can also use a "
+"contact list to send messages to multiple recipients. Enter a subject in the "
 "Subject field, and a message in the box at the bottom of the window. After "
 "you have written your message, click Send."
 msgstr ""
 "Saisissez une adresse dans le champ À. Si vous voulez saisir plusieurs "
 "adresses électroniques, séparez-les par des virgules. Vous pouvez aussi "
-"utiliser la liste des contacts pour envoyer des courriels à plusieurs "
+"utiliser une liste de contacts pour envoyer des courriels à plusieurs "
 "destinataires. Saisissez un sujet dans le champ Sujet et écrivez votre "
 "message dans la zone du bas de la fenêtre. Après avoir écrit votre message, "
 "cliquez sur Envoyer."
 
-#: ../C/evolution.xml:1382(para)
+#: ../C/evolution.xml:1396(para)
 msgid "New mail message window look like this:"
 msgstr "La fenêtre d'édition d'un nouveau message ressemble à ceci :"
 
-#: ../C/evolution.xml:1384(para) ../C/evolution.xml:5987(para)
+#: ../C/evolution.xml:1398(para) ../C/evolution.xml:5951(para)
 msgid "This section contains the following topics:"
 msgstr "Cette section contient les sujets suivants :"
 
-#: ../C/evolution.xml:1387(link) ../C/evolution.xml:1425(title)
+#: ../C/evolution.xml:1401(link) ../C/evolution.xml:1439(title)
 msgid "Unicode, ASCII, and Non-Latin Alphabets"
 msgstr "Unicode, ASCII et alphabets non latins"
 
-#: ../C/evolution.xml:1390(link) ../C/evolution.xml:1437(title)
+#: ../C/evolution.xml:1404(link) ../C/evolution.xml:1451(title)
 msgid "Sending Composed Messages Later"
 msgstr "Envoi différé de messages"
 
-#: ../C/evolution.xml:1393(link) ../C/evolution.xml:1453(title)
+#: ../C/evolution.xml:1407(link) ../C/evolution.xml:1467(title)
 msgid "Working Offline"
 msgstr "Travail hors ligne"
 
-#: ../C/evolution.xml:1396(link) ../C/evolution.xml:1506(title)
+#: ../C/evolution.xml:1410(link) ../C/evolution.xml:1520(title)
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: ../C/evolution.xml:1399(link) ../C/evolution.xml:1553(title)
-msgid "Specifying Additional Recipients for E-Mail"
+#: ../C/evolution.xml:1413(link) ../C/evolution.xml:1567(title)
+msgid "Specifying Additional Recipients for Email"
 msgstr "Ajout de destinataires supplémentaires"
 
-#: ../C/evolution.xml:1402(link) ../C/evolution.xml:1578(title)
+#: ../C/evolution.xml:1416(link) ../C/evolution.xml:1592(title)
 msgid "Choosing Recipients Quickly"
 msgstr "Sélection rapide de destinataires"
 
-#: ../C/evolution.xml:1405(link) ../C/evolution.xml:1586(title)
-msgid "Replying to E-Mail Messages"
+#: ../C/evolution.xml:1419(link) ../C/evolution.xml:1600(title)
+msgid "Replying to Email Messages"
 msgstr "Réponses aux courriels"
 
-#: ../C/evolution.xml:1408(link) ../C/evolution.xml:1652(title)
+#: ../C/evolution.xml:1422(link) ../C/evolution.xml:1666(title)
 msgid "Searching and Replacing with the Composer"
 msgstr "Recherche et remplacement avec l'éditeur"
 
-#: ../C/evolution.xml:1411(link) ../C/evolution.xml:1674(title)
-msgid "Enhancing Your E-Mail with HTML"
+#: ../C/evolution.xml:1425(link) ../C/evolution.xml:1688(title)
+msgid "Enhancing Your Email with HTML"
 msgstr "Amélioration des courriels avec le HTML"
 
-#: ../C/evolution.xml:1414(link) ../C/evolution.xml:1848(title)
+#: ../C/evolution.xml:1428(link) ../C/evolution.xml:1862(title)
 msgid "Mail Send Options"
 msgstr "Options d'envoi des messages"
 
-#: ../C/evolution.xml:1417(link) ../C/evolution.xml:1926(title)
+#: ../C/evolution.xml:1431(link) ../C/evolution.xml:1940(title)
 msgid "Forwarding Mail"
 msgstr "Transfert de courriels"
 
-#: ../C/evolution.xml:1420(link) ../C/evolution.xml:1946(title)
-msgid "Tips for E-Mail Courtesy"
+#: ../C/evolution.xml:1434(link) ../C/evolution.xml:1961(title)
+msgid "Tips for Email Courtesy"
 msgstr "Principes de politesse dans le courriel"
 
-#: ../C/evolution.xml:1426(para)
+#: ../C/evolution.xml:1440(para)
 msgid ""
 "If you want to write in a non-Latin alphabet while using a Latin keyboard, "
 "try selecting a different input method in the message composer. Right-click "
@@ -3843,8 +3863,9 @@ msgid ""
 "Methods menu, then begin typing. The actual keys vary by language and input "
 "style. For example, the Cyrillic input method uses transliterated Latin "
 "keyboard combinations to get the Cyrillic alphabet, combining letters where "
-"necessary. “Zh” and “ya” produce the appropriate single Cyrillic letters, "
-"and the single-quote (‘) produces a soft sign character."
+"necessary. <quote>Zh</quote> and <quote>ya</quote> produce the appropriate "
+"single Cyrillic letters, and the single-quote (') produces a soft sign "
+"character."
 msgstr ""
 "Si vous voulez écrire dans un alphabet non latin avec un clavier latin, "
 "essayez de choisir une méthode de saisie différente dans l'éditeur de "
@@ -3854,10 +3875,10 @@ msgstr ""
 "de saisie. Par exemple, la méthode de saisie Cyrillique utilise des "
 "combinaisons de clavier latin translittérées pour obtenir l'alphabet "
 "cyrillique, combinant des lettres si nécessaire. « Zh » et « ya » produisent "
-"les caractères cyrilliques uniques appropriés, et l'apostrophe simple "
-"(‘) produit un caractère doux."
+"les caractères cyrilliques uniques appropriés, et l'apostrophe simple (') "
+"produit un caractère doux."
 
-#: ../C/evolution.xml:1427(para)
+#: ../C/evolution.xml:1441(para)
 msgid ""
 "For greater language display capabilities, click Edit &gt; Preferences, then "
 "select the character set choices in the Mail Preferences and Composer "
@@ -3871,11 +3892,11 @@ msgstr ""
 "UTF-8, car c'est celui qui présente la plus grande gamme de caractères pour "
 "le plus grand nombre de langues."
 
-#: ../C/evolution.xml:1430(title)
+#: ../C/evolution.xml:1444(title)
 msgid "Using Character Sets"
 msgstr "Utilisation des jeux de caractères"
 
-#: ../C/evolution.xml:1431(para)
+#: ../C/evolution.xml:1445(para)
 msgid ""
 "A character set is a computer's version of an alphabet. In the past, the "
 "ASCII character set was used almost universally. However, it contains only "
@@ -3898,23 +3919,22 @@ msgstr ""
 "les organisations de standardisation ont développé le jeu de caractères "
 "Unicode* UTF-8 pour fournir un jeu de codes unique et compatible pour tous."
 
-#: ../C/evolution.xml:1432(para)
-msgid ""
-"Most e-mail messages state in advance which character set they use, so "
-"Evolution usually knows what to display for a given binary number. However, "
-"if you find that messages are displayed as rows of incomprehensible "
-"characters, try selecting a different character set in the mail settings "
-"screen. If your recipients can't read your messages, try selecting a "
-"different character set in the composer options dialog box. For some "
-"languages, such as Turkish or Korean, it might work best for you to select "
-"the language-specific character set. However, the best choice for most users "
-"is UTF-8, which offers the widest range of characters for the widest range "
-"of languages."
+#: ../C/evolution.xml:1446(para)
+msgid ""
+"Most email messages state in advance which character set they use, so "
+"Evolution usually can display those messages correctly. However, if you find "
+"that messages are displayed as rows of incomprehensible characters, try "
+"selecting a different character set in the mail settings screen. If your "
+"recipients can't read your messages, try selecting a different character set "
+"in the composer options dialog box. For some languages, such as Turkish or "
+"Korean, it might work best for you to select the language-specific character "
+"set. However, the best choice for most users is UTF-8, which offers the "
+"widest range of characters for the widest range of languages."
 msgstr ""
 "La plupart des courriels déclarent à l'avance le jeu de caractères qu'ils "
-"emploient. Evolution sait donc généralement ce qu'il doit afficher pour un "
-"nombre binaire donné. Cependant, si vous rencontrez dans des messages des "
-"lignes incompréhensibles de caractères, essayez de sélectionner un jeu de "
+"emploient. Evolution sait donc généralement afficher ces messages "
+"correctement. Cependant, si vous rencontrez dans des messages des lignes "
+"incompréhensibles de caractères, essayez de sélectionner un jeu de "
 "caractères différent dans les paramètres du message. Si vos destinataires ne "
 "peuvent pas lire vos messages, essayez de sélectionner un jeu de caractères "
 "différent dans la boîte de dialogue des options de l'éditeur. Pour certaines "
@@ -3924,7 +3944,7 @@ msgstr ""
 "propose la plus grande gamme de caractères pour le plus grand nombre de "
 "langues."
 
-#: ../C/evolution.xml:1438(para)
+#: ../C/evolution.xml:1452(para)
 msgid ""
 "Evolution normally sends mail as soon as you click Send. However, can save a "
 "message to be sent later:"
@@ -3932,7 +3952,7 @@ msgstr ""
 "Evolution envoie habituellement un message dès que vous cliquez sur Envoyer. "
 "Cependant, vous pouvez enregistrer un message pour un envoi ultérieur :"
 
-#: ../C/evolution.xml:1441(para)
+#: ../C/evolution.xml:1455(para)
 msgid ""
 "If you are offline when you click Send, Evolution adds your message to the "
 "Outbox queue. The next time you connect to the Internet and send or receive "
@@ -3943,7 +3963,7 @@ msgstr ""
 "prochaine connexion à Internet et de l'envoi/réception de messages, ce "
 "message sera envoyé."
 
-#: ../C/evolution.xml:1444(para)
+#: ../C/evolution.xml:1458(para)
 msgid ""
 "Click File &gt; Save Draft to store your messages in the drafts folder for "
 "later revision."
@@ -3951,7 +3971,7 @@ msgstr ""
 "Choisissez Fichier &gt; Enregistrer le brouillon pour stocker votre message "
 "dans le dossier Brouillons afin de le retravailler plus tard."
 
-#: ../C/evolution.xml:1447(para)
+#: ../C/evolution.xml:1461(para)
 msgid ""
 "If you prefer to save your message as a text file, click File &gt; Save As, "
 "then specify a filename."
@@ -3959,22 +3979,23 @@ msgstr ""
 "Si vous préférez enregistrer votre message dans un fichier texte, choisissez "
 "Fichier &gt; Enregistrer sous, puis indiquez un nom de fichier."
 
-#: ../C/evolution.xml:1454(para)
+#: ../C/evolution.xml:1468(para)
 msgid ""
-"Offline mode help you communicate with remote mail storage systems like "
-"GroupWise®, IMAP or Exchange, in situations where you are not connected to "
-"the network at all times. Evolution keeps a local copy of one or more "
-"folders to allow you to compose messages, storing them in your Outbox to be "
-"sent the next time you connect."
+"Offline mode helps you communicate with remote mail storage systems like "
+"<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
+"situations where you are not connected to the network at all times. "
+"Evolution keeps a local copy of one or more folders to allow you to compose "
+"messages, storing them in your Outbox to be sent the next time you connect."
 msgstr ""
 "Le mode hors ligne vous aide à communiquer avec des systèmes de stockage "
-"distant des messages comme GroupWise&reg;, IMAP ou Exchange, dans des "
-"situations où vous n'êtes pas connecté au réseau en permanence. Evolution "
-"conserve une copie locale d'un ou de plusieurs dossiers pour vous permettre "
-"de composer des messages et de les stocker dans la boîte d'envoi en vue de "
-"leur expédition lors de votre prochaine connexion."
+"distant des messages comme <trademark class=\"registered\">GroupWise</"
+"trademark>, IMAP ou Exchange, dans des situations où vous n'êtes pas "
+"connecté au réseau en permanence. Evolution conserve une copie locale d'un "
+"ou de plusieurs dossiers pour vous permettre de composer des messages et de "
+"les stocker dans la boîte d'envoi en vue de leur expédition lors de votre "
+"prochaine connexion."
 
-#: ../C/evolution.xml:1455(para)
+#: ../C/evolution.xml:1469(para)
 msgid ""
 "POP mail downloads all messages to your local system, but other connections "
 "usually download just the headers, and get the rest only when you want to "
@@ -3987,21 +4008,21 @@ msgstr ""
 "de se mettre hors ligne, Evolution télécharge les messages non lus se "
 "trouvant dans les dossiers que vous avez choisis de conserver."
 
-#: ../C/evolution.xml:1456(para)
+#: ../C/evolution.xml:1470(para)
 msgid "To mark a folder for offline use,"
 msgstr "Pour marquer un dossier apte à une utilisation hors ligne,"
 
-#: ../C/evolution.xml:1459(para)
+#: ../C/evolution.xml:1473(para)
 msgid "Right-click the folder, then click Properties."
 msgstr "Faites un clic droit sur le dossier, puis choisissez Propriétés."
 
-#: ../C/evolution.xml:1462(para)
+#: ../C/evolution.xml:1476(para)
 msgid "Click Copy Folder Content Locally for Offline Operation."
 msgstr ""
 "Cochez « Copier localement le contenu du dossier pour les opérations hors-"
 "ligne »."
 
-#: ../C/evolution.xml:1465(para)
+#: ../C/evolution.xml:1479(para)
 msgid ""
 "Your connection status is shown by the small icon in the lower left border "
 "of the Evolution main window. When you are online, it displays two connected "
@@ -4012,11 +4033,12 @@ msgstr ""
 "ligne, cette icône montre deux câbles connectés. Lorsque vous vous "
 "déconnectez, les deux câbles se séparent."
 
-#: ../C/evolution.xml:1466(para)
+#: ../C/evolution.xml:1480(para)
 msgid "To cache your selected folders and disconnect from the network,"
-msgstr "Pour mettre en cache les dossiers sélectionnés et vous déconnecter du réseau,"
+msgstr ""
+"Pour mettre en cache les dossiers sélectionnés et vous déconnecter du réseau,"
 
-#: ../C/evolution.xml:1469(para)
+#: ../C/evolution.xml:1483(para)
 msgid ""
 "Click File &gt; Work Offline, or click the connection status icon in the "
 "lower left of the screen."
@@ -4024,7 +4046,7 @@ msgstr ""
 "Choisissez Fichier &gt; Travailler hors ligne ou cliquez sur l'icône d'état "
 "de connexion dans le coin inférieur gauche de l'écran."
 
-#: ../C/evolution.xml:1470(para)
+#: ../C/evolution.xml:1484(para)
 msgid ""
 "A message pop-ups and asks you whether you want to go offline immediately or "
 "cache before you go offline."
@@ -4033,7 +4055,7 @@ msgstr ""
 "hors ligne ou si vous voulez mettre les données en cache avant de passer en "
 "mode hors ligne."
 
-#: ../C/evolution.xml:1475(para)
+#: ../C/evolution.xml:1489(para)
 msgid ""
 "Click Synchronize to download all the messages to the folders marked for "
 "offline."
@@ -4041,11 +4063,11 @@ msgstr ""
 "Cliquez sur Synchroniser pour télécharger tous les messages vers les "
 "dossiers marqués pour une utilisation hors ligne."
 
-#: ../C/evolution.xml:1476(para) ../C/evolution.xml:3682(para)
+#: ../C/evolution.xml:1490(para) ../C/evolution.xml:3703(para)
 msgid "Or"
 msgstr "Ou"
 
-#: ../C/evolution.xml:1477(para)
+#: ../C/evolution.xml:1491(para)
 msgid ""
 "Click Do not synchronize to go offline immediately, without downloading the "
 "messages locally for offline operations."
@@ -4053,7 +4075,7 @@ msgstr ""
 "Cliquez sur Ne pas synchroniser pour passer immédiatement hors ligne, sans "
 "télécharger localement les messages pour les opérations hors ligne."
 
-#: ../C/evolution.xml:1478(para)
+#: ../C/evolution.xml:1492(para)
 msgid ""
 "Select Do not show this message again to switch off this popup. The default "
 "is to not synchronize while going offline."
@@ -4062,21 +4084,21 @@ msgstr ""
 "comportement par défaut est de ne pas synchroniser au moment de passer hors "
 "ligne."
 
-#: ../C/evolution.xml:1481(para)
+#: ../C/evolution.xml:1495(para)
 msgid "When you want to reconnect,"
 msgstr "Lorsque vous voulez vous reconnecter,"
 
-#: ../C/evolution.xml:1484(para)
+#: ../C/evolution.xml:1498(para)
 msgid "Click File &gt; Work Online, or click the connection status icon again."
 msgstr ""
 "Choisissez Fichier &gt; Travailler en ligne ou cliquez à nouveau sur l'icône "
 "d'état de connexion."
 
-#: ../C/evolution.xml:1489(title)
+#: ../C/evolution.xml:1503(title)
 msgid "Download Messages for Offline Operations"
 msgstr "Téléchargement des messages pour les opérations hors ligne"
 
-#: ../C/evolution.xml:1490(para)
+#: ../C/evolution.xml:1504(para)
 msgid ""
 "This features prepares you for going offline and for offline operations. It "
 "helps you download all the messages locally before you go offline. If "
@@ -4089,19 +4111,20 @@ msgstr ""
 "passe en mode hors ligne dès que vous le lui demandez, sans télécharger les "
 "messages en local."
 
-#: ../C/evolution.xml:1491(para)
+#: ../C/evolution.xml:1505(para)
 msgid "To download messages for offline operations,"
 msgstr "Pour télécharger les messages en vue d'une utilisation hors ligne,"
 
-#: ../C/evolution.xml:1494(para)
+#: ../C/evolution.xml:1508(para)
 msgid "Select File &gt; Download messages for offline."
-msgstr "Choisissez Fichier &gt; Télécharger les messages pour utilisation hors ligne."
+msgstr ""
+"Choisissez Fichier &gt; Télécharger les messages pour utilisation hors ligne."
 
-#: ../C/evolution.xml:1500(title)
+#: ../C/evolution.xml:1514(title)
 msgid "Automatic Network State Handling"
 msgstr "Gestion automatique de l'état du réseau"
 
-#: ../C/evolution.xml:1501(para)
+#: ../C/evolution.xml:1515(para)
 msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
@@ -4114,30 +4137,31 @@ msgstr ""
 "opérationnel. Pour activer cette fonctionnalité, assurez-vous que Network "
 "Manager est installé sur votre système."
 
-#: ../C/evolution.xml:1507(para)
-msgid "To attach a file to your e-mail:"
+#: ../C/evolution.xml:1521(para)
+msgid "To attach a file to your email:"
 msgstr "Pour joindre un fichier à un courriel :"
 
-#: ../C/evolution.xml:1510(para)
+#: ../C/evolution.xml:1524(para)
 msgid "Click the Attach icon in the composer toolbar."
-msgstr "Cliquez sur l'icône de pièce jointe dans la barre d'outils de l'éditeur."
+msgstr ""
+"Cliquez sur l'icône de pièce jointe dans la barre d'outils de l'éditeur."
 
-#: ../C/evolution.xml:1513(para)
+#: ../C/evolution.xml:1527(para)
 msgid "Select the file you want to attach."
 msgstr "Sélectionnez le fichier à joindre."
 
-#: ../C/evolution.xml:1519(para)
+#: ../C/evolution.xml:1533(para)
 msgid ""
-"You can also drag a file into the composer window. If you want to send it as "
-"an inline attachment, right-click the attachment and click Properties, then "
-"select Automatic Display of Attachments."
+"You can also drag a file to the attachment bar of the composer window. If "
+"you want to send it as an inline attachment, right-click the attachment and "
+"click Properties, then select Automatic Display of Attachments."
 msgstr ""
-"Vous pouvez également glisser un fichier dans la fenêtre de l'éditeur. Si "
-"vous voulez l'envoyer comme pièce jointe intégrée, faites un clic droit sur "
-"la pièce jointe, choisissez Propriétés et cochez « Suggérer l'affichage "
-"automatique de la pièce jointe »."
+"Vous pouvez également glisser un fichier sur la barre des pièces jointes de "
+"la fenêtre de l'éditeur. Si vous voulez l'envoyer comme pièce jointe "
+"intégrée, faites un clic droit sur la pièce jointe, choisissez Propriétés et "
+"cochez « Suggérer l'affichage automatique de la pièce jointe »."
 
-#: ../C/evolution.xml:1520(para)
+#: ../C/evolution.xml:1534(para)
 msgid ""
 "When you send the message, a copy of the attached file goes with it. Be "
 "aware that large attachments can take a long time to send and receive."
@@ -4146,82 +4170,88 @@ msgstr ""
 "envoyée. Il faut être conscient que de gros fichiers joints peuvent prendre "
 "beaucoup de temps à envoyer et à recevoir."
 
-#: ../C/evolution.xml:1523(title)
+#: ../C/evolution.xml:1537(title)
 msgid "Attachment Reminder:"
 msgstr "Oubli des pièces jointes :"
 
-#: ../C/evolution.xml:1524(para)
+#: ../C/evolution.xml:1538(para)
 msgid ""
-"With Attachment Reminder plugin enabled, Evolution reminds you to attach a "
-"file to your email if it appears that you have not. If it finds that you "
-"have missed to attach a file, a message is displayed as shown below:"
+"Evolution has an Attachment Reminder plugin you can use to remind yourself "
+"to attach a file to an email. If it determines that you have not attached "
+"the file, it displays the following message:"
 msgstr ""
-"Si le greffon « Oubli des pièces jointes » est activé, Evolution vous signale de "
-"joindre un fichier à votre courriel s'il lui semble que vous ne l'avez pas "
-"fait. S'il découvre que vous avez oublié de joindre un fichier, le message "
-"ci-dessous apparaît :"
+"Evolution possède un greffon « Oubli des pièces jointes » qui peut vous "
+"rappeler d'ajouter un fichier à un courriel. S'il détermine que vous avez "
+"oublié de joindre un fichier, le message ci-dessous apparaît :"
 
-#: ../C/evolution.xml:1528(para)
+#: ../C/evolution.xml:1542(para)
 msgid ""
-"Click Continue Editing to attach the missing file you are reminded of, or "
-"click Send to send the message without any attachment."
+"Click Continue Editing to attach the missing file, or click Send to send the "
+"message without any attachment."
 msgstr ""
 "Cliquez sur Continuer l'édition pour joindre un fichier manquant, ou cliquez "
 "sur Envoyer pour envoyer le message sans pièce jointe."
 
-#: ../C/evolution.xml:1531(para)
-msgid "To enable the Attachment Reminder,"
-msgstr "Pour activer le greffon Oubli des pièces jointes,"
+#: ../C/evolution.xml:1545(para)
+msgid "To enable the Attachment Reminder:"
+msgstr "Pour activer le greffon Oubli des pièces jointes :"
 
-#: ../C/evolution.xml:1534(para)
+#: ../C/evolution.xml:1548(para)
 msgid "Select Edit &gt; Plugins &gt; Attachment Reminder."
 msgstr "Choisissez Édition &gt; Greffons &gt; Greffon de pièce jointe."
 
-#: ../C/evolution.xml:1537(para)
-msgid "Click Configure to add the keywords."
-msgstr "Cliquez sur Configurer pour ajouter des mots-clés."
+#: ../C/evolution.xml:1551(para)
+msgid ""
+"Click Configuration, then make sure that Remind Missing Attachments is "
+"selected."
+msgstr ""
+"Cliquez sur Configuration, puis assurez-vous que « Signaler les pièces "
+"jointes manquantes » est coché."
 
-#: ../C/evolution.xml:1542(para)
+#: ../C/evolution.xml:1555(para)
 msgid ""
-"Click Add to add keywords such as &ldquo;Attach&rdquo; or &ldquo;"
-"Attachment&rdquo;."
+"Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> "
+"and click Add."
 msgstr ""
-"Cliquez sur Ajouter pour ajouter des mots-clés tels que &ldquo;Ci-"
-"joint&rdquo; ou &ldquo;Fichier joint&rdquo;."
+"Choisissez des mots-clés tels que <quote>Ci-joint</quote> ou <quote>Fichier "
+"joint</quote>, ou cliquez sur Ajouter pour en ajouter de nouveaux."
 
-#: ../C/evolution.xml:1543(para)
+#: ../C/evolution.xml:1556(para)
 msgid ""
-"Based on the keywords you have added here, it searches every email you are "
-"sending. If it finds the keywords such as &ldquo;attach&rdquo; in your e-"
-"mail and no actual attached file, you are reminded of missing attachments."
+"Based on the keywords you have added here, it searches every mail you are "
+"sending. If it finds the keywords such as <quote>attach</quote> in your mail "
+"and there is no actual attached file, you are reminded of missing "
+"attachments."
 msgstr ""
 "En fonction des mots-clés que vous avez ajoutés, Evolution parcourt chaque "
 "message que vous envoyez. S'il trouve un des mots-clés dans un message et "
-"qu'aucune pièce jointe n'a été choisie, il vous avertit que des pièces "
+"qu'aucune pièce jointe n'a été ajoutée, il vous avertit que des pièces "
 "jointes sont peut-être manquantes."
 
-#: ../C/evolution.xml:1546(para)
+#: ../C/evolution.xml:1559(para)
 msgid ""
-"To edit any of the existing keywords, select the keyword and click Edit and "
-"modify."
-msgstr "Pour éditer un des mots-clés, sélectionnez-le, cliquez sur Édition et modifiez-le."
+"To edit any of the existing keywords, select the keyword, click Edit, then "
+"modify the word as desired."
+msgstr ""
+"Pour modifier un des mots-clés existants, sélectionnez-le, cliquez sur "
+"Modifier et modifiez le mot comme vous le souhaitez."
 
-#: ../C/evolution.xml:1554(para)
+#: ../C/evolution.xml:1568(para)
 msgid ""
-"Evolution, like most e-mail programs, recognizes three types of addressee: "
-"primary recipients, secondary recipients, and hidden (blind) recipients. The "
-"simplest way to direct a message is to put the e-mail address or addresses "
-"in the To: field, which denotes primary recipients. Use the Cc: field to "
-"send a message to secondary recipients."
+"<trademark>Evolution</trademark>, like most email programs, recognizes three "
+"types of addresses: primary recipients, secondary recipients, and hidden "
+"(blind) recipients. The simplest way to direct a message is to put the email "
+"address or addresses in the To: field, which denotes primary recipients. Use "
+"the Cc: field to send a message to secondary recipients."
 msgstr ""
-"Evolution, comme la plupart des logiciels de messagerie, distingue trois "
-"types de destinataires : les destinataires principaux, secondaires et "
-"masqués (invisibles). La manière la plus simple d'adresser un message est de "
-"placer la ou les adresses électroniques dans le champ « À: », qui correspond "
-"aux destinataires principaux. Utilisez le champ « Cc: » pour envoyer un "
-"message à des destinataires secondaires."
+"<trademark>Evolution</trademark>, comme la plupart des logiciels de "
+"messagerie, distingue trois types de destinataires : les destinataires "
+"principaux, secondaires et masqués (invisibles). La manière la plus simple "
+"d'adresser un message est de placer la ou les adresses électroniques dans le "
+"champ « À: », qui correspond aux destinataires principaux. Utilisez le champ "
+"« Cc: » pour envoyer un message à des destinataires secondaires."
 
-#: ../C/evolution.xml:1555(para)
+#: ../C/evolution.xml:1569(para)
 msgid ""
 "Addresses on the Bcc: list are hidden from the other recipients of the "
 "message. You can use it to send mail to large groups of people, especially "
@@ -4234,9 +4264,9 @@ msgstr ""
 "pas ou si la confidentialité est importante. Si le champ « Cci: » n'apparaît "
 "pas, choisissez Affichage &gt; Champ Cci."
 
-#: ../C/evolution.xml:1556(para)
+#: ../C/evolution.xml:1570(para)
 msgid ""
-"If you frequently write e-mail to the same groups of people, you can create "
+"If you frequently write email to the same groups of people, you can create "
 "address lists in the contacts tool, and then send them mail as though they "
 "have a single address. To learn how to do that, see <link linkend=\"usage-"
 "contact-organize-group-list\">Creating a List of Contacts</link>."
@@ -4248,43 +4278,44 @@ msgstr ""
 "\"usage-contact-organize-group-list\">Création d'une liste de contacts</"
 "link>."
 
-#: ../C/evolution.xml:1557(para)
+#: ../C/evolution.xml:1571(para)
 msgid ""
-"Evolution has the ability to let you specify the Reply-To in an e-mail. "
-"Using this, you can set up a special Reply-To for an e-mail.To do this:"
+"Evolution has the ability to let you specify the Reply-To in an email. Using "
+"this, you can set up a special Reply-To for an email.To do this:"
 msgstr ""
 "Evolution donne la possibilité de spécifier l'adresse de réponse d'un "
 "courriel. Ainsi, vous pouvez définir une adresse de réponse spécifique pour "
 "un courriel. Pour faire cela :"
 
-#: ../C/evolution.xml:1560(para)
+#: ../C/evolution.xml:1574(para)
 msgid "Open a compose window."
 msgstr "Ouvrez une fenêtre d'édition."
 
-#: ../C/evolution.xml:1563(para)
+#: ../C/evolution.xml:1577(para)
 msgid "Open the Reply-To field by clicking View &gt; Reply To."
 msgstr ""
-"Affichez le champ « Répondre à » en choisissant Affichage &gt; Champ "
-"Répondre à."
+"Affichez le champ « Répondre à » en choisissant Affichage &gt; Champ Répondre "
+"à."
 
-#: ../C/evolution.xml:1566(para)
+#: ../C/evolution.xml:1580(para)
 msgid ""
 "Specify the address you want as the Reply-To address in the new Reply-To "
 "field."
 msgstr "Indiquez l'adresse de réponse souhaitée dans le champ « Répondre à »."
 
-#: ../C/evolution.xml:1569(para)
+#: ../C/evolution.xml:1583(para)
 msgid "Complete the rest of your message."
 msgstr "Complétez le reste de votre message."
 
-#: ../C/evolution.xml:1572(para)
+#: ../C/evolution.xml:1586(para) ../C/evolution.xml:1954(para)
+#: ../C/evolution.xml:2168(para) ../C/evolution.xml:5213(para)
 msgid "Click Send."
 msgstr "Cliquez sur Envoyer."
 
-#: ../C/evolution.xml:1579(para)
+#: ../C/evolution.xml:1593(para)
 msgid ""
 "Address auto completion is by default enabled in Evolution when you create "
-"contacts.Evolution makes it easy for you to quickly fill in the address "
+"contacts. Evolution makes it easy for you to quickly fill in the address "
 "field without having to remember the email address of recipients. You can "
 "type nicknames or other portions of address data in the address field and "
 "Evolution will display a drop-down list of possible address completions from "
@@ -4300,21 +4331,21 @@ msgstr ""
 "nom ou un pseudonyme correspondant à plus d'une adresse, Evolution ouvre une "
 "boîte de dialogue pour vous demander de préciser la personne exacte."
 
-#: ../C/evolution.xml:1580(para)
+#: ../C/evolution.xml:1594(para)
 msgid ""
 "If Evolution does not complete addresses automatically, click Edit &gt; "
-"Preferences, then click Autocompletion. There, select the groups of contacts "
-"you want to use for address autocompletion in the mailer."
+"Preferences, then click Autocompletion. There, select the address book you "
+"want to use for address autocompletion in the mailer."
 msgstr ""
 "Si Evolution ne complète pas automatiquement les adresses, choisissez "
 "Édition &gt; Préférences, puis cliquez sur Complétion automatique. Là, "
-"sélectionnez les groupes de contacts à utiliser pour la complétion "
-"automatique des adresses dans l'éditeur."
+"sélectionnez le carnet d'adresses à utiliser pour la complétion automatique "
+"des adresses dans l'éditeur."
 
-#: ../C/evolution.xml:1581(para)
+#: ../C/evolution.xml:1595(para)
 msgid ""
 "Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of "
-"the e-mail addresses in your contacts. Select addresses and click the arrows "
+"the email addresses in your contacts. Select addresses and click the arrows "
 "to move them into the appropriate address columns."
 msgstr ""
 "Il est également possible de cliquer sur les boutons À:, Cc: ou Cci: pour "
@@ -4322,9 +4353,9 @@ msgstr ""
 "les adresses et cliquez sur les flèches pour les placer dans les cases "
 "d'adresses adéquates."
 
-#: ../C/evolution.xml:1582(para)
+#: ../C/evolution.xml:1596(para)
 msgid ""
-"For more information about using e-mail with the contact manager and the "
+"For more information about using email with the contact manager and the "
 "calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: "
 "Adding New Cards Quickly</link> and <link linkend=\"usage-calendar-apts"
 "\">Scheduling With the Evolution Calendar</link>."
@@ -4335,28 +4366,28 @@ msgstr ""
 "link> et <link linkend=\"usage-calendar-apts\">Planification avec le "
 "Calendrier d'Evolution</link>."
 
-#: ../C/evolution.xml:1587(para)
+#: ../C/evolution.xml:1601(para)
 msgid ""
-"To reply to a message, click the message to reply to in the e-mail list and "
-"click Reply, or right-click within the message and select Reply to Sender. "
-"This opens the message composer. The To: and Subject: fields are already "
-"filled, although you can alter them if you prefer. In addition, the full "
-"text of the old message is inserted into the new message, either in grey "
-"with a blue line on one side (for HTML display) or with the &gt; character "
-"before each line (in plain text mode), to indicate that it is part of the "
-"previous message."
+"To reply to a message, click the message to reply to in the message list and "
+"click the Reply button in the toolbar, or right-click within the message and "
+"select Reply to Sender. This opens the message composer. The To: and "
+"Subject: fields are already filled, although you can alter them if you "
+"prefer. In addition, the full text of the old message is inserted into the "
+"new message, either in grey with a blue line on one side (for HTML display) "
+"or with the &gt; character before each line (in plain text mode), to "
+"indicate that it is part of the previous message."
 msgstr ""
 "Pour répondre à un message, cliquez sur le message concerné dans la liste "
-"des messages et cliquez sur Répondre, ou faites un clic droit dans le "
-"message et choisissez Répondre à l'expéditeur. L'éditeur de message "
-"apparaît. Les champs À: et Sujet: sont déjà remplis, mais vous pouvez les "
-"modifier si nécessaire. De plus, le texte complet de l'ancien message est "
-"inséré dans le nouveau, soit en gris avec une ligne bleue sur le côté (en "
-"cas d'affichage HTML), soit avec le caractère « &gt; » devant chaque ligne "
-"(en mode texte brut), pour indiquer que cela fait partie du message "
-"précédent."
+"des messages et cliquez sur le bouton Répondre dans la barre d'outils, ou "
+"faites un clic droit dans le message et choisissez Répondre à l'expéditeur. "
+"L'éditeur de message apparaît. Les champs À: et Sujet: sont déjà remplis, "
+"mais vous pouvez les modifier si nécessaire. De plus, le texte complet de "
+"l'ancien message est inséré dans le nouveau, soit en gris avec une ligne "
+"bleue sur le côté (en cas d'affichage HTML), soit avec le caractère « &gt; » "
+"devant chaque ligne (en mode texte brut), pour indiquer que cela fait partie "
+"du message précédent."
 
-#: ../C/evolution.xml:1588(para)
+#: ../C/evolution.xml:1602(para)
 msgid ""
 "If you're reading a message with several recipients, you can use Reply to "
 "All instead of Reply. If there are large numbers of people in the Cc: or To: "
@@ -4367,13 +4398,13 @@ msgstr ""
 "Cc: comportent un grand nombre de personnes, cela peut vous faire gagner un "
 "temps non négligeable."
 
-#: ../C/evolution.xml:1591(title)
+#: ../C/evolution.xml:1605(title)
 msgid "Using the Reply To All Feature"
 msgstr "Utilisation de la fonctionnalité Répondre à tous"
 
-#: ../C/evolution.xml:1592(para)
+#: ../C/evolution.xml:1606(para)
 msgid ""
-"Susan sends an e-mail to a client and sends copies to Tim and to an internal "
+"Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
 "of them to read, he uses Reply to All, but if he just wants to tell Susan "
 "that he agrees with her, he uses Reply. His reply does not reach anyone that "
@@ -4387,7 +4418,7 @@ msgstr ""
 "mentionnée dans le champ Cci: du message de Susanne, car le contenu de ce "
 "champ n'est partagé avec personne."
 
-#: ../C/evolution.xml:1593(para)
+#: ../C/evolution.xml:1607(para)
 msgid ""
 "If you subscribe to a mailing list, and want your reply to go just to the "
 "list, rather than to the sender, select Reply to List instead of Reply or "
@@ -4397,99 +4428,102 @@ msgstr ""
 "qu'à la liste, plutôt qu'à l'expéditeur, cliquez sur « Répondre à la liste » "
 "au lieu de « Répondre » ou « Répondre à tous »."
 
-#: ../C/evolution.xml:1597(title)
+#: ../C/evolution.xml:1611(title)
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: ../C/evolution.xml:1605(para)
+#: ../C/evolution.xml:1619(para)
 msgid "Tools"
 msgstr "Outils"
 
-#: ../C/evolution.xml:1608(para)
+#: ../C/evolution.xml:1622(para)
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: ../C/evolution.xml:1615(para)
+#: ../C/evolution.xml:1629(para)
 msgid "Reply to sender"
 msgstr "Répondre à l'expéditeur"
 
-#: ../C/evolution.xml:1618(para)
+#: ../C/evolution.xml:1632(para)
 msgid "Ctrl+R"
 msgstr "Ctrl+R"
 
-#: ../C/evolution.xml:1623(para)
+#: ../C/evolution.xml:1637(para)
 msgid "Reply to List"
 msgstr "Répondre à la liste"
 
-#: ../C/evolution.xml:1626(para)
+#: ../C/evolution.xml:1640(para)
 msgid "Clrl+L"
 msgstr "Ctrl+L"
 
-#: ../C/evolution.xml:1631(para)
+#: ../C/evolution.xml:1645(para)
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: ../C/evolution.xml:1634(para)
+#: ../C/evolution.xml:1648(para)
 msgid "Shift+Ctrl+R"
 msgstr "Maj+Ctrl+R"
 
-#: ../C/evolution.xml:1639(para)
+#: ../C/evolution.xml:1653(para)
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: ../C/evolution.xml:1642(para)
+#: ../C/evolution.xml:1656(para)
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
-#: ../C/evolution.xml:1653(para)
-msgid "The message composer makes several text searching features available to you."
+#: ../C/evolution.xml:1667(para)
+msgid ""
+"The message composer makes several text searching features available to you."
 msgstr ""
 "L'éditeur de messages met à votre disposition plusieurs fonctions de "
 "recherche de texte."
 
-#: ../C/evolution.xml:1655(title)
+#: ../C/evolution.xml:1669(title)
 msgid "Find:"
 msgstr "Rechercher :"
 
-#: ../C/evolution.xml:1656(para)
+#: ../C/evolution.xml:1670(para)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
-msgstr "Saisissez un mot ou une phrase et Evolution la recherche dans votre message."
+msgstr ""
+"Saisissez un mot ou une phrase et Evolution la recherche dans votre message."
 
-#: ../C/evolution.xml:1659(title)
+#: ../C/evolution.xml:1673(title)
 msgid "Find Regex:"
 msgstr "Rechercher une expression régulière :"
 
-#: ../C/evolution.xml:1660(para)
+#: ../C/evolution.xml:1674(para)
 msgid ""
 "You can search for a complex pattern of characters, called a <link linkend="
-"\"regular-expression\">regular expression</link> or “regex” in your composer "
-"window. If you're not sure what a regular expression is, you should ignore "
-"this feature."
+"\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
+"your composer window. If you're not sure what a regular expression is, you "
+"should ignore this feature."
 msgstr ""
 "Vous pouvez rechercher un motif complexe de caractères, appelé une <link "
 "linkend=\"regular-expression\">expression régulière</link> ou « regex » dans "
 "la fenêtre d'édition. Si vous ne savez pas ce qu'est une expression "
 "régulière, vous pouvez ignorer cette fonctionnalité."
 
-#: ../C/evolution.xml:1663(title)
+#: ../C/evolution.xml:1677(title)
 msgid "Find Again:"
 msgstr "Rechercher de nouveau :"
 
-#: ../C/evolution.xml:1664(para)
+#: ../C/evolution.xml:1678(para)
 msgid "Select this item to repeat the last search you performed."
-msgstr "Sélectionnez cet élément pour répéter la recherche que vous venez de faire."
+msgstr ""
+"Sélectionnez cet élément pour répéter la recherche que vous venez de faire."
 
-#: ../C/evolution.xml:1667(title)
+#: ../C/evolution.xml:1681(title)
 msgid "Replace:"
 msgstr "Remplacer :"
 
-#: ../C/evolution.xml:1668(para)
+#: ../C/evolution.xml:1682(para)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr ""
 "Recherche un mot ou une phrase et le ou la remplace par quelque chose "
 "d'autre."
 
-#: ../C/evolution.xml:1670(para)
+#: ../C/evolution.xml:1684(para)
 msgid ""
 "For all of these menu items, you can choose whether to search backwards in "
 "the document from the point where your cursor is. You can also determine "
@@ -4500,10 +4534,10 @@ msgstr ""
 "aussi déterminer si la recherche doit tenir compte de la casse (minuscules/"
 "majuscules) dans la recherche d'une correspondance."
 
-#: ../C/evolution.xml:1675(para)
+#: ../C/evolution.xml:1689(para)
 msgid ""
-"Normally, you can't set text styles or insert pictures in e-mail. However, "
-"most newer e-mail programs can display images and text styles in addition to "
+"Normally, you can't set text styles or insert pictures in email. However, "
+"most newer email programs can display images and text styles in addition to "
 "basic alignment and paragraph formatting. They do this with <link linkend="
 "\"html\">HTML</link>, just like Web pages do."
 msgstr ""
@@ -4513,7 +4547,7 @@ msgstr ""
 "plus de l'alignement de base et du formatage des paragraphes. Ils le font "
 "avec le <link linkend=\"html\">HTML</link>, à la manière des pages Web."
 
-#: ../C/evolution.xml:1676(para)
+#: ../C/evolution.xml:1690(para)
 msgid ""
 "Some people do not have HTML-capable mail clients, or prefer not to receive "
 "HTML-enhanced mail because it is slower to download and display. Because of "
@@ -4525,19 +4559,19 @@ msgstr ""
 "envoie les messages en texte simple, sauf si vous lui demandez explicitement "
 "d'utiliser le HTML."
 
-#: ../C/evolution.xml:1679(title)
+#: ../C/evolution.xml:1693(title)
 msgid "Basic HTML Formatting"
 msgstr "Formatage HTML de base"
 
-#: ../C/evolution.xml:1680(para)
+#: ../C/evolution.xml:1694(para)
 msgid ""
-"You can change the format of an e-mail message from plain text to HTML by "
-"choosing Format HTML."
+"You can change the format of an email message from plain text to HTML by "
+"choosing Format &gt; HTML from the menu bar."
 msgstr ""
 "Vous pouvez modifier le format d'un courriel et passer du format texte "
-"simple au HTML en choisissant Format HTML."
+"simple au HTML en choisissant Format &gt; HTML dans la barre de menus."
 
-#: ../C/evolution.xml:1681(para)
+#: ../C/evolution.xml:1695(para)
 msgid ""
 "To send all your mail as HTML by default, set your mail format preferences "
 "in the mail configuration dialog box. See <link linkend=\"config-prefs-mail-"
@@ -4548,7 +4582,7 @@ msgstr ""
 "configuration des messages. Voir <link linkend=\"config-prefs-mail-composer"
 "\">Préférences de l'éditeur</link> pour plus d'informations."
 
-#: ../C/evolution.xml:1682(para)
+#: ../C/evolution.xml:1696(para)
 msgid ""
 "HTML formatting tools are located in the toolbar just above the space where "
 "you actually compose the message. They also appear in the Insert and Format "
@@ -4558,7 +4592,7 @@ msgstr ""
 "dessus de la zone d'édition des messages. Ils apparaissent également dans "
 "les menus Insérer et Format."
 
-#: ../C/evolution.xml:1683(para)
+#: ../C/evolution.xml:1697(para)
 msgid ""
 "The icons in the toolbar are explained in <link linkend=\"tooltip\">tool-"
 "tips</link>, which appear when you hold your mouse pointer over the buttons. "
@@ -4569,11 +4603,11 @@ msgstr ""
 "le pointeur de la souris au-dessus des boutons. Les boutons peuvent être "
 "classés dans cinq catégories :"
 
-#: ../C/evolution.xml:1685(title)
+#: ../C/evolution.xml:1699(title)
 msgid "Headers and Lists:"
 msgstr "En-têtes et listes :"
 
-#: ../C/evolution.xml:1686(para)
+#: ../C/evolution.xml:1700(para)
 msgid ""
 "At the left edge of the toolbar, you can choose Normal for a default text "
 "style or Header 1 through Header 6 for varying sizes of header from large "
@@ -4586,7 +4620,7 @@ msgstr ""
 "aussi le style Préformaté qui correspond à la balise HTML utilisée pour les "
 "blocs de texte préformatés, et trois types de listes à puces."
 
-#: ../C/evolution.xml:1688(para)
+#: ../C/evolution.xml:1702(para)
 msgid ""
 "For instance, instead of using asterisks to mark a bulleted list, you can "
 "use the Bulleted List style from the style drop-down list. Evolution uses "
@@ -4598,13 +4632,13 @@ msgstr ""
 "styles. Evolution propose différents styles de listes et gère les retours de "
 "ligne et plusieurs niveaux d'indentation."
 
-#: ../C/evolution.xml:1690(title)
+#: ../C/evolution.xml:1704(title)
 msgid "Text Styles:"
 msgstr "Styles de texte :"
 
-#: ../C/evolution.xml:1691(para)
+#: ../C/evolution.xml:1705(para)
 msgid ""
-"Use these buttons to determine the way your e-mail looks. If you have text "
+"Use these buttons to determine the way your email looks. If you have text "
 "selected, the style applies to the selected text. If you do not have text "
 "selected, the style applies to whatever you type next."
 msgstr ""
@@ -4612,15 +4646,15 @@ msgstr ""
 "est sélectionné, le style s'applique à ce texte. Dans le cas contraire, le "
 "style s'applique à tout le texte que vous allez saisir ensuite."
 
-#: ../C/evolution.xml:1700(para)
+#: ../C/evolution.xml:1714(para)
 msgid "Button"
 msgstr "Bouton"
 
-#: ../C/evolution.xml:1710(para)
+#: ../C/evolution.xml:1724(para)
 msgid "TT"
 msgstr "TT"
 
-#: ../C/evolution.xml:1713(para)
+#: ../C/evolution.xml:1727(para)
 msgid ""
 "Typewriter text, which is approximately the same as the Courier monospace "
 "font."
@@ -4628,43 +4662,43 @@ msgstr ""
 "Texte de machine à écrire, qui correspond à peu près à la police à largeur "
 "fixe Courier."
 
-#: ../C/evolution.xml:1718(para)
+#: ../C/evolution.xml:1732(para)
 msgid "Bold A"
 msgstr "A gras"
 
-#: ../C/evolution.xml:1721(para)
+#: ../C/evolution.xml:1735(para)
 msgid "Bolds the text."
 msgstr "Met le texte en gras."
 
-#: ../C/evolution.xml:1726(para)
+#: ../C/evolution.xml:1740(para)
 msgid "Italic A"
 msgstr "A italique"
 
-#: ../C/evolution.xml:1729(para)
+#: ../C/evolution.xml:1743(para)
 msgid "Italicizes the text."
 msgstr "Met le texte en italique."
 
-#: ../C/evolution.xml:1734(para)
+#: ../C/evolution.xml:1748(para)
 msgid "Underlined A"
 msgstr "A souligné"
 
-#: ../C/evolution.xml:1737(para)
+#: ../C/evolution.xml:1751(para)
 msgid "Underlines the text."
 msgstr "Souligne le texte."
 
-#: ../C/evolution.xml:1742(para)
+#: ../C/evolution.xml:1756(para)
 msgid "Strike through A"
 msgstr "A barré"
 
-#: ../C/evolution.xml:1745(para)
+#: ../C/evolution.xml:1759(para)
 msgid "Marks a line through the text."
 msgstr "Trace une ligne par-dessus le texte."
 
-#: ../C/evolution.xml:1752(title)
+#: ../C/evolution.xml:1766(title)
 msgid "Alignment:"
 msgstr "Alignement :"
 
-#: ../C/evolution.xml:1753(para)
+#: ../C/evolution.xml:1767(para)
 msgid ""
 "Located next to the text style buttons, the three paragraph icons should be "
 "familiar to users of most word processing software. The left most button "
@@ -4677,11 +4711,11 @@ msgstr ""
 "marge gauche, le bouton du milieu centre le texte et le bouton de droite "
 "aligne le texte sur la marge droite."
 
-#: ../C/evolution.xml:1756(title)
+#: ../C/evolution.xml:1770(title)
 msgid "Indentation Rules:"
 msgstr "Règles d'indentation :"
 
-#: ../C/evolution.xml:1757(para)
+#: ../C/evolution.xml:1771(para)
 msgid ""
 "The button with the arrow pointing left decreases a paragraph's indentation, "
 "and the right arrow increases its indentation."
@@ -4689,18 +4723,18 @@ msgstr ""
 "Le bouton comportant une flèche gauche diminue l'indentation d'un "
 "paragraphe, et celui comportant une flèche droite augmente l'indentation."
 
-#: ../C/evolution.xml:1760(title)
+#: ../C/evolution.xml:1774(title)
 msgid "Color Selection:"
 msgstr "Sélection de couleur :"
 
-#: ../C/evolution.xml:1761(para)
+#: ../C/evolution.xml:1775(para)
 msgid ""
 "At the far right is the color section tool, where a box displays the current "
 "text color. To choose a new color, click the arrow button to the right. If "
 "you have text selected, the color applies to the selected text. If you do "
 "not have text selected, the color applies to whatever you type next. You can "
 "select a background color or image by right-clicking the message background, "
-"then selecting Style Page."
+"then selecting Style &gt; Page Style."
 msgstr ""
 "Tout à droite se trouve l'outil de sélection de couleur, composé d'une boîte "
 "affichant la couleur de texte actuelle. Pour choisir une nouvelle couleur, "
@@ -4708,28 +4742,28 @@ msgstr ""
 "couleur s'applique à ce texte. Dans le cas contraire, la couleur s'applique "
 "à tout le texte que vous allez saisir ensuite. Vous pouvez choisir une "
 "couleur ou une image d'arrière-plan en cliquant avec le bouton droit sur "
-"l'arrière-plan du message, puis en choisissant Style de la page."
+"l'arrière-plan du message, puis en choisissant Style &gt; Style de la page."
 
-#: ../C/evolution.xml:1766(title)
+#: ../C/evolution.xml:1780(title)
 msgid "Advanced HTML Formatting"
 msgstr "Formatage HTML avancé"
 
-#: ../C/evolution.xml:1767(para)
+#: ../C/evolution.xml:1781(para)
 msgid ""
 "Under the Insert menu, there are several more items you can use to style "
-"your e-mail. To use these and other HTML formatting tools, make sure you "
-"have enabled HTML mode by using Format HTML."
+"your email. To use these and other HTML formatting tools, make sure you have "
+"enabled HTML mode by using Format &gt; HTML from the menu bar."
 msgstr ""
 "Dans le menu Insérer se trouvent plusieurs éléments supplémentaires "
 "utilisables pour mettre en forme vos courriels. Pour les exploiter, ainsi "
 "que les autres outils de formatage HTML, assurez-vous d'avoir activé le mode "
-"HTML en choisissant Format HTML."
+"HTML en choisissant Format &gt; HTML dans la barre de menus."
 
-#: ../C/evolution.xml:1770(title)
+#: ../C/evolution.xml:1784(title)
 msgid "Inserting a Link"
 msgstr "Insertion d'un lien"
 
-#: ../C/evolution.xml:1771(para)
+#: ../C/evolution.xml:1785(para)
 msgid ""
 "Use the Insert a Link tool to put hyperlinks in your HTML messages. If you "
 "don't want special link text, you can just enter the address directly, and "
@@ -4740,99 +4774,100 @@ msgstr ""
 "texte du lien, vous pouvez simplement saisir l'adresse telle quelle et "
 "Evolution reconnaît qu'il s'agit d'un lien."
 
-#: ../C/evolution.xml:1774(para)
+#: ../C/evolution.xml:1788(para)
 msgid "Select the text you want to link from."
 msgstr "Sélectionnez le texte qui formera le contenu du lien."
 
-#: ../C/evolution.xml:1777(para)
+#: ../C/evolution.xml:1791(para)
 msgid "Right-click in the text, then click Insert Link."
 msgstr "Faites un clic droit sur le texte, puis choisissez Insérer un lien."
 
-#: ../C/evolution.xml:1780(para)
+#: ../C/evolution.xml:1794(para)
 msgid "Type the URL in the URL field."
 msgstr "Saisissez l'URL dans le champ URL."
 
-#: ../C/evolution.xml:1789(title)
+#: ../C/evolution.xml:1803(title)
 msgid "Inserting an Image"
 msgstr "Insertion d'une image"
 
-#: ../C/evolution.xml:1792(para)
-msgid "Click Image."
-msgstr "Cliquez sur Image."
+#: ../C/evolution.xml:1806(para)
+msgid "Click Insert &gt; Image in the menubar."
+msgstr "Choisissez Insertion &gt; Image dans la barre de menus."
 
-#: ../C/evolution.xml:1795(para)
+#: ../C/evolution.xml:1809(para)
 msgid "Browse to and select the image file."
 msgstr "Parcourez vos fichiers pour choisir une image."
 
-#: ../C/evolution.xml:1804(title)
+#: ../C/evolution.xml:1818(title)
 msgid "Inserting a Rule"
-msgstr "Insertion d'une barre"
+msgstr "Insertion d'un filet"
 
-#: ../C/evolution.xml:1805(para)
-msgid "You can insert a horizontal line into the text to help divide two sections:"
+#: ../C/evolution.xml:1819(para)
+msgid ""
+"You can insert a horizontal line into the text to help divide two sections:"
 msgstr ""
 "Vous pouvez insérer une ligne horizontale dans le texte pour aider à diviser "
 "deux sections :"
 
-#: ../C/evolution.xml:1808(para)
-msgid "Click Rule."
-msgstr "Cliquez sur Barre."
+#: ../C/evolution.xml:1822(para)
+msgid "Click Insert &gt; Rule in the menubar."
+msgstr "Choisissez Insertion &gt; Filet dans la barre de menus."
 
-#: ../C/evolution.xml:1811(para)
+#: ../C/evolution.xml:1825(para)
 msgid "Select the width, size, and alignment."
 msgstr "Choisissez la largeur, la taille et l'alignement."
 
-#: ../C/evolution.xml:1814(para)
+#: ../C/evolution.xml:1828(para)
 msgid "Select Shade if necessary."
 msgstr "Cochez Ombragé si vous le souhaitez."
 
-#: ../C/evolution.xml:1823(title)
+#: ../C/evolution.xml:1837(title)
 msgid "Inserting a Table"
 msgstr "Insertion d'un tableau"
 
-#: ../C/evolution.xml:1824(para)
+#: ../C/evolution.xml:1838(para)
 msgid "You can insert a table into the text:"
 msgstr "Vous pouvez insérer un tableau dans le texte :"
 
-#: ../C/evolution.xml:1827(para)
-msgid "Click Table."
-msgstr "Cliquez sur Tableau."
+#: ../C/evolution.xml:1841(para)
+msgid "Click Insert &gt; Table in the menubar."
+msgstr "Choisissez Insertion &gt; Tableau dans la barre de menus."
 
-#: ../C/evolution.xml:1830(para)
+#: ../C/evolution.xml:1844(para)
 msgid "Select the number of rows and columns."
 msgstr "Choisissez le nombre de lignes et de colonnes."
 
-#: ../C/evolution.xml:1833(para)
+#: ../C/evolution.xml:1847(para)
 msgid "Select the type of layout for the table."
 msgstr "Choisissez le type de disposition du tableau."
 
-#: ../C/evolution.xml:1836(para)
+#: ../C/evolution.xml:1850(para)
 msgid "Select a background for the table."
 msgstr "Choisissez un arrière-plan pour le tableau."
 
-#: ../C/evolution.xml:1837(para)
+#: ../C/evolution.xml:1851(para)
 msgid ""
-"To insert a picture for the background, click Browse and select the desired "
-"image."
+"To insert a picture for the background, click the filechooser button and "
+"select the desired image."
 msgstr ""
-"Pour insérer une image en tant qu'arrière-plan, cliquez sur Parcourir et "
-"choisissez l'image souhaitée."
+"Pour insérer une image en tant qu'arrière-plan, cliquez sur le bouton de "
+"sélection de fichiers et choisissez l'image souhaitée."
 
-#: ../C/evolution.xml:1849(para)
-msgid "You can set the following options when sending mails in Evolution."
+#: ../C/evolution.xml:1863(para)
+msgid "You can set the following options when sending mail in Evolution."
 msgstr ""
 "Vous pouvez définir les options ci-après lorsque vous envoyez des courriels "
 "avec Evolution."
 
-#: ../C/evolution.xml:1851(title)
+#: ../C/evolution.xml:1865(title)
 msgid "Read Receipts:"
 msgstr "Accusés de lecture :"
 
-#: ../C/evolution.xml:1852(para)
+#: ../C/evolution.xml:1866(para)
 msgid ""
 "Evolution allows you to request a receipt for your sent messages to indicate "
 "when your message is being viewed by the recipient. Receipts are useful when "
-"sending e-mail that is time-sensitive. To request a receipt, click Insert "
+"sending email that is time-sensitive. To request a receipt, click Insert "
 "&gt; Request Read Receipt in the composer window."
 msgstr ""
 "Evolution vous permet de demander un accusé pour signaler que vos messages "
@@ -4841,11 +4876,11 @@ msgstr ""
 "demander un accusé, choisissez Insérer &gt; Demander un accusé de lecture "
 "dans la fenêtre de l'éditeur."
 
-#: ../C/evolution.xml:1855(title)
+#: ../C/evolution.xml:1869(title)
 msgid "Prioritize Message:"
 msgstr "Priorité des messages :"
 
-#: ../C/evolution.xml:1856(para)
+#: ../C/evolution.xml:1870(para)
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
 "relative importance.To prioritize a message, click Insert &gt; Prioritize "
@@ -4856,7 +4891,7 @@ msgstr ""
 "d'un message, choisissez Insérer &gt; Prioriser le message dans la fenêtre "
 "de l'éditeur."
 
-#: ../C/evolution.xml:1859(para)
+#: ../C/evolution.xml:1873(para)
 msgid ""
 "Evolution will ignore the message priority, because it assumes that the "
 "recipient should decide whether the message is important or not."
@@ -4864,11 +4899,11 @@ msgstr ""
 "Evolution ignore la priorité d'un message, parce qu'il estime que c'est au "
 "destinataire de décider si le message est important ou non."
 
-#: ../C/evolution.xml:1864(title)
+#: ../C/evolution.xml:1878(title)
 msgid "Default Settings"
 msgstr "Paramètres par défaut"
 
-#: ../C/evolution.xml:1865(para)
+#: ../C/evolution.xml:1879(para)
 msgid ""
 "Evolution allows you to change the default settings. You can organize your "
 "draft folder and sent folder, set the addresses to which you want to sent "
@@ -4881,31 +4916,25 @@ msgstr ""
 "aussi changer les paramètres d'accusés de réception des messages dans la "
 "fenêtre des Valeurs par défaut."
 
-#: ../C/evolution.xml:1867(para)
+#: ../C/evolution.xml:1881(para)
 msgid "To change your default settings,"
 msgstr "Pour modifier vos paramètres par défaut,"
 
-#: ../C/evolution.xml:1870(para)
-msgid "Select Edit &gt;Preferences to open Evolution Preferences window."
-msgstr ""
-"Choisissez Édition &gt; Préférences pour ouvrir la fenêtre des préférences "
-"d'Evolution."
-
-#: ../C/evolution.xml:1873(para)
-msgid "Select the mail account you want to change the default settings."
+#: ../C/evolution.xml:1887(para)
+msgid "Select the mail account whose default settings you want to change."
 msgstr ""
 "Sélectionnez le compte de messagerie dont vous voulez modifier les "
 "paramètres par défaut."
 
-#: ../C/evolution.xml:1876(para)
+#: ../C/evolution.xml:1890(para)
 msgid "Click Edit to open Account Editor window."
 msgstr "Cliquez sur Édition pour ouvrir la fenêtre d'édition du compte."
 
-#: ../C/evolution.xml:1879(para)
+#: ../C/evolution.xml:1893(para)
 msgid "Click Default tab."
 msgstr "Cliquez sur l'onglet Valeurs par défaut."
 
-#: ../C/evolution.xml:1882(para)
+#: ../C/evolution.xml:1896(para)
 msgid ""
 "Click the respective check boxes and enter the email addresses you want CC "
 "and BCC to."
@@ -4913,19 +4942,20 @@ msgstr ""
 "Cochez les cases adéquates et saisissez les adresses électroniques "
 "souhaitées pour les copies et les copies cachées. "
 
-#: ../C/evolution.xml:1885(para)
-msgid "Select the desired option for send message receipts from the drop-down list."
+#: ../C/evolution.xml:1899(para)
+msgid ""
+"Select the desired option for send message receipts from the drop-down list."
 msgstr ""
 "Choisissez l'option souhaitée pour les accusés de réception des messages "
 "dans la liste déroulante correspondante."
 
-#: ../C/evolution.xml:1890(title)
+#: ../C/evolution.xml:1904(title)
 msgid "Changing Default Folder for Sent and Draft Items"
 msgstr ""
 "Changement des dossiers par défaut pour les éléments envoyés et les "
 "brouillons"
 
-#: ../C/evolution.xml:1891(para)
+#: ../C/evolution.xml:1905(para)
 msgid ""
 "By default, all the sent messages directly goes to Sent folder and those "
 "messages marked as drafts are saved in Draft folder. To change the default "
@@ -4936,39 +4966,40 @@ msgstr ""
 "dans le dossier Brouillons. Pour modifier le dossier par défaut pour les "
 "brouillons,"
 
-#: ../C/evolution.xml:1894(para)
+#: ../C/evolution.xml:1908(para)
 msgid "Click Drafts button to open Folder view."
 msgstr "Cliquez sur le bouton Brouillons pour ouvrir l'affichage des dossiers."
 
-#: ../C/evolution.xml:1897(para)
+#: ../C/evolution.xml:1911(para)
 msgid "Select the folder you want to save the drafts to."
-msgstr "Sélectionnez le dossier dans lequel vous voulez enregistrer les brouillons."
+msgstr ""
+"Sélectionnez le dossier dans lequel vous voulez enregistrer les brouillons."
 
-#: ../C/evolution.xml:1903(para) ../C/evolution.xml:1919(para)
+#: ../C/evolution.xml:1917(para) ../C/evolution.xml:1933(para)
 msgid "Click Revert button to revert back to previous settings."
 msgstr "Cliquez sur le bouton Rétablir pour revenir aux réglages précédents."
 
-#: ../C/evolution.xml:1907(para)
+#: ../C/evolution.xml:1921(para)
 msgid "To change the default folder for sent items,"
 msgstr "Pour modifier le dossier par défaut pour les éléments envoyés,"
 
-#: ../C/evolution.xml:1910(para)
+#: ../C/evolution.xml:1924(para)
 msgid "Click Sent button to open the Folder view."
 msgstr "Cliquez sur le bouton Envoyé pour ouvrir l'affichage des dossiers."
 
-#: ../C/evolution.xml:1913(para)
+#: ../C/evolution.xml:1927(para)
 msgid "Select the desired folder for sent items."
 msgstr "Sélectionnez le dossier souhaité pour les éléments envoyés."
 
-#: ../C/evolution.xml:1927(para)
+#: ../C/evolution.xml:1941(para)
 msgid ""
-"When you receive an e-mail, you can forward it to other individuals or "
-"groups that might be interested. You can forward a message as an attachment "
-"to a new message (this is the default) or you can send it <link linkend="
-"\"inline\">in line</link> as a quoted portion of the message you are "
-"sending. Attachment forwarding is best if you want to send the full, "
-"unaltered message to someone else. Inline forwarding is best if you want to "
-"send portions of a message, or if you have a large number of comments on "
+"When you receive an email, you can forward it to other individuals or groups "
+"that might be interested. You can forward a message as an attachment to a "
+"new message (this is the default) or you can send it <link linkend=\"inline"
+"\">in line</link> as a quoted portion of the message you are sending. "
+"Attachment forwarding is best if you want to send the full, unaltered "
+"message to someone else. Inline forwarding is best if you want to send "
+"portions of a message, or if you have a large number of comments on "
 "different sections of the message you are forwarding. Remember to note from "
 "whom the message came, and whether you have removed or altered content."
 msgstr ""
@@ -4984,15 +5015,15 @@ msgstr ""
 "du message original. N'oubliez pas d'indiquer l'expéditeur original du "
 "message et si vous avez enlevé ou modifié du contenu."
 
-#: ../C/evolution.xml:1928(para)
+#: ../C/evolution.xml:1942(para)
 msgid "To forward a message you are reading:"
 msgstr "Pour faire suivre un message que vous êtes en train de lire :"
 
-#: ../C/evolution.xml:1931(para)
+#: ../C/evolution.xml:1945(para)
 msgid "Click Forward on the toolbar."
 msgstr "Cliquez sur Faire suivre dans la barre d'outils."
 
-#: ../C/evolution.xml:1933(para)
+#: ../C/evolution.xml:1947(para)
 msgid ""
 "If you prefer to forward the message <link linkend=\"inline\">inline</link> "
 "instead of attached, click Message &gt; Forward As &gt; Inline from the menu."
@@ -5001,7 +5032,7 @@ msgstr ""
 "link> au lieu de joint, choisissez Message &gt; Faire suivre comme &gt; Dans "
 "le corps."
 
-#: ../C/evolution.xml:1936(para)
+#: ../C/evolution.xml:1950(para)
 msgid ""
 "Select an addressee as you would when sending a new message; the subject is "
 "already entered, although you can alter it if you want."
@@ -5009,13 +5040,11 @@ msgstr ""
 "Sélectionnez un destinataire comme pour l'envoi d'un nouveau message ; le "
 "sujet figure déjà, mais vous pouvez le modifier si nécessaire."
 
-#: ../C/evolution.xml:1939(para)
-msgid "Add your comments on the message in the composition frame, then click Send."
-msgstr ""
-"Ajoutez vos commentaires sur le message dans la zone d'édition, puis cliquez "
-"sur Envoyer."
+#: ../C/evolution.xml:1953(para)
+msgid "Add your comments on the message in the composition frame"
+msgstr "Ajoutez vos commentaires sur le message dans la zone d'édition."
 
-#: ../C/evolution.xml:1942(para)
+#: ../C/evolution.xml:1957(para)
 msgid ""
 "Attachments to a message you are forwarding are forwarded only when you send "
 "the original message as an attachment. Inline messages do not forward any "
@@ -5025,7 +5054,7 @@ msgstr ""
 "message original en tant que pièce jointe. Pour les messages intégrés, les "
 "pièces jointes ne sont pas retransmises."
 
-#: ../C/evolution.xml:1949(para)
+#: ../C/evolution.xml:1964(para)
 msgid ""
 "Don't forward chain letters. If you must, watch out for hoaxes and urban "
 "legends, and make sure the message doesn't have multiple layers of greater-"
@@ -5037,17 +5066,17 @@ msgstr ""
 "« plus grand que » (&gt;), ce qui révélerait plusieurs couches de transferts "
 "négligents."
 
-#: ../C/evolution.xml:1952(para)
+#: ../C/evolution.xml:1967(para)
 msgid ""
-"Always begin and close with a salutation. Say “please” and “thank you,” just "
-"like you do in real life. You can keep your pleasantries short, but be "
-"polite."
+"Always begin and close with a salutation. Say <quote>please</quote> and "
+"<quote>thank you,</quote> just like you do in real life. You can keep your "
+"pleasantries short, but be polite."
 msgstr ""
 "Veillez à toujours commencer et terminer par une salutation. Dites « s'il "
 "vous plaît » et « merci », comme dans la vie de tous les jours. Vous pouvez "
 "placer de courtes plaisanteries, mais restez poli."
 
-#: ../C/evolution.xml:1955(para)
+#: ../C/evolution.xml:1970(para)
 msgid ""
 "WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole "
 "message in capital letters. It hurts people's ears."
@@ -5055,7 +5084,7 @@ msgstr ""
 "ÉCRIRE EN MAJUSCULES SIGNIFIE QUE VOUS CRIEZ ! N'écrivez pas un message "
 "complet en majuscules. Cela fait mal aux oreilles."
 
-#: ../C/evolution.xml:1958(para)
+#: ../C/evolution.xml:1973(para)
 msgid ""
 "Check your spelling and use complete sentences. By default, Evolution puts a "
 "red line beneath words it doesn't recognize, as you type them."
@@ -5064,13 +5093,13 @@ msgstr ""
 "Evolution souligne en rouge les mots qu'il ne reconnaît pas, au fur et à "
 "mesure de la frappe."
 
-#: ../C/evolution.xml:1961(para)
-msgid "Don't send nasty e-mails (flames). If you get one, don't write back."
+#: ../C/evolution.xml:1976(para)
+msgid "Don't send nasty emails (flames). If you get one, don't write back."
 msgstr ""
 "N'envoyez pas de courriels désagréables (disputes). Si vous en recevez un, "
 "ne répondez pas."
 
-#: ../C/evolution.xml:1964(para)
+#: ../C/evolution.xml:1979(para)
 msgid ""
 "When you reply or forward, include enough of the previous message to provide "
 "context."
@@ -5078,14 +5107,14 @@ msgstr ""
 "Lorsque vous répondez ou que vous faites suivre, laissez assez de contenu du "
 "message précédent afin de garder le contexte."
 
-#: ../C/evolution.xml:1967(para)
+#: ../C/evolution.xml:1982(para)
 msgid "Don't send spam."
 msgstr "N'envoyez pas de pourriel (spam)."
 
-#: ../C/evolution.xml:1975(para)
+#: ../C/evolution.xml:1990(para)
 msgid ""
 "If you create an event in the calendar component, you can then send "
-"invitations to the attendee list through the Evolution e-mail tool. The "
+"invitations to the attendee list through the Evolution email tool. The "
 "invitation card is sent as an attachment in iCal format."
 msgstr ""
 "Si vous créez un événement dans le composant Calendriers, vous pouvez "
@@ -5093,23 +5122,23 @@ msgstr ""
 "Courriel d'Evolution. La carte d'invitation est envoyée comme pièce jointe "
 "au format iCal."
 
-#: ../C/evolution.xml:1976(para)
+#: ../C/evolution.xml:1991(para)
 msgid ""
-"To send an invitation in GroupWise, right click on the calendar item and "
-"click Forward as iCalendar."
+"To send an invitation, right click on the calendar item and click Forward as "
+"iCalendar."
 msgstr ""
-"Pour envoyer une invitation dans GroupWise, faites un clic droit sur "
-"l'élément de calendrier et choisissez Faire suivre comme iCalendar."
+"Pour envoyer une invitation, faites un clic droit sur l'élément de "
+"calendrier et choisissez Faire suivre comme iCalendar."
 
-#: ../C/evolution.xml:1977(para)
+#: ../C/evolution.xml:1992(para)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Lorsque vous recevez une invitation, vous avez plusieurs options :"
 
-#: ../C/evolution.xml:1979(title)
+#: ../C/evolution.xml:1994(title)
 msgid "Accept:"
 msgstr "Accepter :"
 
-#: ../C/evolution.xml:1980(para)
+#: ../C/evolution.xml:1995(para)
 msgid ""
 "Indicates you will attend the meeting. When you click the OK button, the "
 "meeting is entered into your calendar."
@@ -5117,11 +5146,11 @@ msgstr ""
 "Indique que vous allez participer à la rencontre. Au moment de cliquer sur "
 "le bouton Valider, le rendez-vous est ajouté à votre calendrier."
 
-#: ../C/evolution.xml:1983(title)
+#: ../C/evolution.xml:1998(title)
 msgid "Tentatively Accept:"
 msgstr "Accepter provisoirement :"
 
-#: ../C/evolution.xml:1984(para)
+#: ../C/evolution.xml:1999(para)
 msgid ""
 "Indicates you will probably attend the meeting. When you click the OK "
 "button, the meeting is entered into your calendar, but is marked as "
@@ -5131,32 +5160,33 @@ msgstr ""
 "cliquer sur le bouton Valider, le rendez-vous est ajouté à votre calendrier, "
 "mais il reçoit l'attribut Provisoire."
 
-#: ../C/evolution.xml:1987(title)
+#: ../C/evolution.xml:2002(title)
 msgid "Decline:"
 msgstr "Refuser :"
 
-#: ../C/evolution.xml:1988(para)
+#: ../C/evolution.xml:2003(para)
 msgid ""
 "Indicates you are unable to attend the meeting. The meeting is not entered "
 "into your calendar when you click OK, although your response is sent to the "
-"meeting host if you have selected the RSVP option."
+"meeting host if you have selected the Send reply to sender option."
 msgstr ""
 "Indique que vous n'êtes pas en mesure de participer à la rencontre. Le "
 "rendez-vous n'est pas ajouté à votre calendrier lorsque vous cliquez sur "
 "Valider, bien que votre réponse est envoyée au créateur du rendez-vous si "
-"vous avez coché l'option RSVP."
+"vous avez coché l'option « Répondre à l'expéditeur »."
 
-#: ../C/evolution.xml:1991(title)
-msgid "RSVP:"
-msgstr "RSVP :"
+#: ../C/evolution.xml:2006(title)
+msgid "Send reply to sender:"
+msgstr "Répondre à l'expéditeur :"
 
-#: ../C/evolution.xml:1992(para)
-msgid "Select this option if you want your response sent to the meeting organizers."
+#: ../C/evolution.xml:2007(para)
+msgid ""
+"Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 "Cochez cette option si vous souhaitez que votre réponse soit envoyée aux "
 "organisateurs des rendez-vous."
 
-#: ../C/evolution.xml:1998(para)
+#: ../C/evolution.xml:2013(para)
 msgid ""
 "Because IMAP folders exist on the server, and opening them or checking them "
 "takes time, you need fine-grained control over the way that you use IMAP "
@@ -5174,11 +5204,11 @@ msgstr ""
 "en exclure d'autres, vous pouvez utiliser l'outil de gestion des abonnements "
 "à cet effet."
 
-#: ../C/evolution.xml:2001(para)
+#: ../C/evolution.xml:2016(para)
 msgid "Select Folder &gt; Subscriptions."
 msgstr "Choisissez Dossier &gt; Abonnements."
 
-#: ../C/evolution.xml:2004(para)
+#: ../C/evolution.xml:2019(para)
 msgid ""
 "If you have accounts on multiple IMAP servers, select the server where you "
 "want to manage your subscriptions."
@@ -5186,15 +5216,15 @@ msgstr ""
 "Si vous possédez des comptes sur plusieurs serveurs IMAP, sélectionnez le "
 "serveur dont vous voulez gérer les abonnements."
 
-#: ../C/evolution.xml:2005(para)
+#: ../C/evolution.xml:2020(para)
 msgid "Evolution displays a list of available files and folders."
 msgstr "Evolution affiche une liste des fichiers et dossiers disponibles."
 
-#: ../C/evolution.xml:2008(para)
+#: ../C/evolution.xml:2023(para)
 msgid "Select a file or folder by clicking it."
 msgstr "Sélectionnez un fichier ou un dossier en cliquant dessus."
 
-#: ../C/evolution.xml:2009(para)
+#: ../C/evolution.xml:2024(para)
 msgid ""
 "You should select at least the Inbox folder. Depending upon the way your "
 "IMAP server is configured, the list of available files might include non-"
@@ -5205,31 +5235,35 @@ msgstr ""
 "contenir des dossiers qui ne contiennent pas de messages. Si c'est le cas, "
 "vous pouvez les ignorer."
 
-#: ../C/evolution.xml:2012(para)
-msgid "Click Subscribe to add a folder to the subscribed list."
-msgstr "Cliquez sur S'abonner pour ajouter un dossier à la liste des abonnements."
+#: ../C/evolution.xml:2027(para)
+msgid ""
+"Enable the corresponding checkbox to add a folder to the subscribed list."
+msgstr ""
+"Cochez la case correspondante pour ajouter un dossier à la liste des "
+"abonnements."
 
-#: ../C/evolution.xml:2015(para)
+#: ../C/evolution.xml:2030(para)
 msgid "When you have subscribed to the folders you want, close the window."
-msgstr "Lorsque vous vous êtes abonné aux dossiers souhaités, fermez la fenêtre."
+msgstr ""
+"Lorsque vous vous êtes abonné aux dossiers souhaités, fermez la fenêtre."
 
-#: ../C/evolution.xml:2022(para)
+#: ../C/evolution.xml:2037(para)
 msgid ""
-"To protect and encode your e-mail transmissions, Evolution offers two "
+"To protect and encode your email transmissions, Evolution offers two "
 "encryption methods:"
 msgstr ""
 "Afin de protéger et de coder la transmission de vos courriels, Evolution met "
 "à disposition deux méthodes de chiffrement :"
 
-#: ../C/evolution.xml:2025(para)
+#: ../C/evolution.xml:2040(para)
 msgid "GPG Encryption"
 msgstr "Chiffrement GPG"
 
-#: ../C/evolution.xml:2028(para) ../C/evolution.xml:2185(title)
+#: ../C/evolution.xml:2043(para) ../C/evolution.xml:2201(title)
 msgid "S/MIME Encryption"
 msgstr "Chiffrement S/MIME"
 
-#: ../C/evolution.xml:2031(para)
+#: ../C/evolution.xml:2046(para)
 msgid ""
 "Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), "
 "an implementation of strong <link linkend=\"public-key-encryption\">Public "
@@ -5239,39 +5273,36 @@ msgstr ""
 "Privacy Guard), une implémentation du solide <link linkend=\"public-key-"
 "encryption\">chiffrement à clé publique</link>."
 
-#: ../C/evolution.xml:2032(para)
+#: ../C/evolution.xml:2047(para)
 msgid ""
-"GPG uses two keys: public and private. You can give your public key to "
-"anyone you want to receive encrypted messages, or put it on a public key "
-"server so that people can look it up before contacting you. Your private key "
-"lets you decrypt any message encrypted with your public key. Never give your "
-"private key to anyone."
+"In order to encrypt and decrypt emails using GPG, it is necessary to use two "
+"kinds of encryption keys: public and private. Private keys are used to "
+"encrypt messages and public keys to decrypt them. Private keys should not be "
+"shared with others, while public keys can be shared with those you want to "
+"send encrypted messages to. You may also place them on a public key server."
 msgstr ""
-"GPG utilise deux clés, une publique et une privée. Vous pouvez donner votre "
-"clé publique à tous ceux qui sont susceptibles de recevoir des messages "
-"chiffrés de votre part, ou la placer sur un serveur de clés publiques afin "
-"que tout le monde puisse la consulter avant de vous contacter. Votre clé "
-"privée permet de déchiffrer tout message chiffré avec votre clé publique. Ne "
-"donnez jamais votre clé privée à qui que ce soit."
+"Afin de chiffrer et de déchiffrer des courriels avec GPG, il est nécessaire "
+"d'utiliser deux sortes de clés de chiffrement : clé publique et clé privée. "
+"Les clés privées servent à chiffrer les messages et les clés publiques à les "
+"déchiffrer. Les clés privées ne doivent pas être communiquées, alors que les "
+"clés publiques peuvent être échangées avec les personnes auxquelles vous "
+"destinez des messages chiffrés. Vous pouvez également déposer ces dernières "
+"sur un serveur de clés publiques."
 
-#: ../C/evolution.xml:2033(para)
+# http://bugzilla.gnome.org/show_bug.cgi?id=544886
+#: ../C/evolution.xml:2048(para)
 msgid ""
-"When you send a message that is encrypted, you must encrypt it using your "
-"intended recipient's public key. To receive an encrypted message, you must "
-"make sure that the sender has your public key in advance. For signing "
-"messages, you encrypt the signature with your private key, so only your "
-"public key can unlock it. When you send the message, the recipient gets your "
-"public key and unlocks the signature, verifying your identity."
+"To send encrypted email, you must have your own private key on your keyring, "
+"and the person you are sending it to must have your public key in order to "
+"decrypt and read it. To decrypt and read someone else's encrypted email, you "
+"must first have a copy of their public key on your keyring."
 msgstr ""
-"Lorsque vous envoyez un message chiffré, vous devez le chiffrer à l'aide de "
-"la clé publique du destinataire. Pour recevoir un message chiffré, vous "
-"devez vous assurer préalablement que l'expéditeur dispose de votre clé "
-"publique. Pour signer des messages, vous chiffrez la signature avec votre "
-"clé privée, afin que seule votre clé publique puisse la déverrouiller. "
-"Lorsque vous envoyez le message, le destinataire récupère votre clé publique "
-"et déverrouille la signature, ce qui atteste votre identité."
+"Pour envoyer des messages chiffrés, vous devez disposer de la clé publique "
+"du destinataire dans votre trousseau, et le destinataire pourra déchiffrer "
+"et lire le message grâce à sa clé privée. Pour déchiffrer et lire un message "
+"reçu chiffré, vous devez disposer de votre clé privée dans votre trousseau."
 
-#: ../C/evolution.xml:2034(para)
+#: ../C/evolution.xml:2049(para)
 msgid ""
 "Evolution does not support older versions of PGP, such as OpenPGP and Inline "
 "PGP."
@@ -5279,11 +5310,11 @@ msgstr ""
 "Evolution ne prend pas en charge des versions plus anciennes de PGP, telles "
 "que OpenPGP ou Inline PGP."
 
-#: ../C/evolution.xml:2035(para)
+#: ../C/evolution.xml:2050(para)
 msgid "You can use encryption in two different ways:"
 msgstr "Vous pouvez utiliser le chiffrement de deux manières différentes :"
 
-#: ../C/evolution.xml:2038(para)
+#: ../C/evolution.xml:2053(para)
 msgid ""
 "You can encrypt the entire message, so that nobody but the recipient can "
 "read it."
@@ -5291,7 +5322,7 @@ msgstr ""
 "Vous pouvez chiffrer le message complet afin que personne ne puisse le lire "
 "à l'exception du destinataire."
 
-#: ../C/evolution.xml:2041(para)
+#: ../C/evolution.xml:2056(para)
 msgid ""
 "You can attach an encrypted signature to a plain text message, so that the "
 "recipient can read the message without decrypting it, and needs decrypting "
@@ -5302,13 +5333,14 @@ msgstr ""
 "qu'il n'ait besoin de déchiffrer que s'il souhaite vérifier l'identité de "
 "l'expéditeur."
 
-#: ../C/evolution.xml:2044(para)
+#: ../C/evolution.xml:2059(para)
 msgid ""
 "For example, suppose that Kevin wants to send an encrypted message to his "
 "friend Rachel. He looks up her public key on a general key server, and then "
-"tells Evolution to encrypt the message. The message now reads “@#"
-"$23ui7yr87#@!48970fsd.” When the information gets to Rachel, she decrypts it "
-"using her private key, and it appears as plain text for her to read."
+"tells Evolution to encrypt the message. The message now reads <quote>@#"
+"$23ui7yr87#@!48970fsd.</quote> When the information gets to Rachel, she "
+"decrypts it using her private key, and it appears as plain text for her to "
+"read."
 msgstr ""
 "Par exemple, supposons que Kevin souhaite envoyer un message chiffré à son "
 "amie Rachel. Il consulte sa clé publique sur un serveur de clés général, "
@@ -5317,11 +5349,11 @@ msgstr ""
 "information, elle la déchiffre avec sa clé privée et le message reprend sa "
 "forme lisible."
 
-#: ../C/evolution.xml:2047(title)
+#: ../C/evolution.xml:2062(title)
 msgid "Making a GPG Encryption Key"
 msgstr "Création d'une clé de chiffrement GPG"
 
-#: ../C/evolution.xml:2048(para)
+#: ../C/evolution.xml:2063(para)
 msgid ""
 "Before you can get or send encrypted mail, you need to generate your public "
 "and private keys with GPG. This procedure covers version 1.2.4 of GPG. If "
@@ -5334,15 +5366,16 @@ msgstr ""
 "cette procédure varie légèrement. Vous pouvez obtenir le numéro de version "
 "en tapant <command>gpg --version</command>."
 
-#: ../C/evolution.xml:2051(para)
+#: ../C/evolution.xml:2066(para)
 msgid "Open a terminal and enter <command>gpg --gen-key</command>."
-msgstr "Ouvrez une fenêtre de terminal et saisissez <command>gpg --gen-key</command>."
+msgstr ""
+"Ouvrez une fenêtre de terminal et saisissez <command>gpg --gen-key</command>."
 
-#: ../C/evolution.xml:2054(para)
+#: ../C/evolution.xml:2069(para)
 msgid "Select an algorithm, then press Enter."
 msgstr "Choisissez un algorithme, puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2056(para)
+#: ../C/evolution.xml:2071(para)
 msgid ""
 "To accept the default algorithm of DSA and ElGamal, press Enter "
 "(recommended)."
@@ -5350,7 +5383,7 @@ msgstr ""
 "Pour accepter l'algorithme par défaut DSA et ElGamal, appuyez sur Entrée "
 "(recommandé)."
 
-#: ../C/evolution.xml:2059(para)
+#: ../C/evolution.xml:2074(para)
 msgid ""
 "Select a key length, then press Enter. To accept the default, 1024 bits, "
 "press Enter."
@@ -5358,11 +5391,11 @@ msgstr ""
 "Choisissez une longueur de clé, puis appuyez sur Entrée. Pour accepter la "
 "valeur par défaut de 1024 bits, appuyez sur Entrée."
 
-#: ../C/evolution.xml:2062(para)
+#: ../C/evolution.xml:2077(para)
 msgid "Enter how long your key should be valid for."
 msgstr "Saisissez la durée de validité de votre clé."
 
-#: ../C/evolution.xml:2064(para)
+#: ../C/evolution.xml:2079(para)
 msgid ""
 "To accept the default of no expiration, press Enter, then press Y when you "
 "are prompted to verify the selection."
@@ -5370,33 +5403,33 @@ msgstr ""
 "Pour accepter la valeur par défaut de non expiration, appuyez sur Entrée, "
 "puis appuyez sur Y lorsqu'on vous demande de vérifier ce choix."
 
-#: ../C/evolution.xml:2067(para)
+#: ../C/evolution.xml:2082(para)
 msgid "Type your real name, then press Enter."
 msgstr "Saisissez votre nom réel, puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2070(para)
-msgid "Type your e-mail address, then press Enter."
+#: ../C/evolution.xml:2085(para)
+msgid "Type your email address, then press Enter."
 msgstr "Saisissez votre adresse électronique, puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2073(para)
+#: ../C/evolution.xml:2088(para)
 msgid "(Optional) Type a comment, then press Enter."
 msgstr "Saisissez un commentaire (facultatif), puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2076(para)
+#: ../C/evolution.xml:2091(para)
 msgid "Review your selected user ID. If it is correct, press O."
 msgstr ""
 "Relisez l'identifiant utilisateur sélectionné. S'il est correct, appuyez sur "
 "O."
 
-#: ../C/evolution.xml:2079(para)
+#: ../C/evolution.xml:2094(para)
 msgid "Type a passphrase, then press Enter."
 msgstr "Saisissez une phrase de passe, puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2082(para)
+#: ../C/evolution.xml:2097(para)
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Déplacez votre souris au hasard pour générer les clés."
 
-#: ../C/evolution.xml:2085(para)
+#: ../C/evolution.xml:2100(para)
 msgid ""
 "After the keys are generated, you can view your key information by entering "
 "<command>gpg --list-keys</command>. You should see something similar to "
@@ -5412,7 +5445,7 @@ msgstr ""
 "&lt;vous@exemple.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-"
 "14]  </computeroutput>"
 
-#: ../C/evolution.xml:2086(para)
+#: ../C/evolution.xml:2101(para)
 msgid ""
 "GPG creates one list, or keyring, for your public keys and one for your "
 "private keys. All the public keys you know are stored in the file ~/.gnupg/"
@@ -5423,11 +5456,12 @@ msgstr ""
 "sont stockées dans le fichier ~/.gnupg/pubring.gpg. Si vous voulez donnez "
 "vos clés à d'autres personnes, envoyez-leur ce fichier."
 
-#: ../C/evolution.xml:2087(para)
+#: ../C/evolution.xml:2102(para)
 msgid "If you want, you can upload your keys to a key server."
-msgstr "Si vous le souhaitez, vous pouvez placer vos clés sur un serveur de clés."
+msgstr ""
+"Si vous le souhaitez, vous pouvez placer vos clés sur un serveur de clés."
 
-#: ../C/evolution.xml:2090(para)
+#: ../C/evolution.xml:2105(para)
 msgid ""
 "Check your public key ID with gpg--list-keys. It is the string after 1024D "
 "on the line beginning with pub. In the example above, it is 32j38dk2."
@@ -5436,7 +5470,7 @@ msgstr ""
 "chaîne de caractères après 1024D dans la ligne qui commence par pub. Dans "
 "l'exemple ci-dessus, c'est 32j38dk2."
 
-#: ../C/evolution.xml:2093(para)
+#: ../C/evolution.xml:2108(para)
 msgid ""
 "Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Substitute your key ID for "
@@ -5447,7 +5481,7 @@ msgstr ""
 "par votre identifiant de clé. Vous avez besoin de votre mot de passe pour "
 "effectuer cela."
 
-#: ../C/evolution.xml:2096(para)
+#: ../C/evolution.xml:2111(para)
 msgid ""
 "Key servers store your public keys for you so that your friends can decrypt "
 "your messages. If you choose not to use a key server, you can manually send "
@@ -5463,7 +5497,7 @@ msgstr ""
 "fois pour toutes, ce qui permet aux autres de la télécharger d'un endroit "
 "centralisé lorsqu'ils en ont besoin."
 
-#: ../C/evolution.xml:2097(para)
+#: ../C/evolution.xml:2112(para)
 msgid ""
 "If you don't have a key to unlock or encrypt a message, you can set your "
 "encryption tool to look it up automatically. If it can't find the key, an "
@@ -5473,11 +5507,11 @@ msgstr ""
 "vous pouvez configurer votre outil de déchiffrement afin qu'il la recherche "
 "automatiquement. S'il ne peut trouver la clé, un message d'erreur apparaîtra."
 
-#: ../C/evolution.xml:2101(title)
+#: ../C/evolution.xml:2116(title)
 msgid "Getting and Using GPG Public Keys"
 msgstr "Recherche et utilisation de clés publiques GPG"
 
-#: ../C/evolution.xml:2102(para)
+#: ../C/evolution.xml:2117(para)
 msgid ""
 "To send an encrypted message, you need to use the recipient's public key in "
 "combination with your private key. Evolution handles the encryption, but you "
@@ -5488,7 +5522,7 @@ msgstr ""
 "chiffrement, mais vous devez obtenir la clé publique et l'ajouter à votre "
 "trousseau de clés."
 
-#: ../C/evolution.xml:2103(para)
+#: ../C/evolution.xml:2118(para)
 msgid ""
 "To get public keys from a public key server, enter the command<command> gpg "
 "--recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, "
@@ -5501,60 +5535,66 @@ msgstr ""
 "l'identifiant de votre destinataire. Vous devez saisir votre mot de passe, "
 "puis l'identifiant est automatiquement ajouté à votre trousseau."
 
-#: ../C/evolution.xml:2105(para)
+#: ../C/evolution.xml:2120(para)
 msgid ""
-"The domain &rsquo;<emphasis>wwwkeys.pgp.net</emphasis>&rsquo; is assigned to "
-"multiple hosts in various networks. The gpg utility tries to connect to one "
-"in the current network; and if that particular host is down, it fails with a "
-"time-out."
-msgstr "Le domaine <emphasis>wwwkeys.pgp.net</emphasis> est attribué à plusieurs hôtes dans différents réseaux. L'utilitaire gpg essaie de se connecter à l'un d'entre eux dans le réseau où il se trouve ; et si cet hôte est hors service, il échoue après un délai d'expiration."
+"The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
+"to multiple hosts in various networks. The gpg utility tries to connect to "
+"one in the current network; and if that particular host is down, it fails "
+"with a time-out."
+msgstr ""
+"Le domaine <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> est attribué "
+"à plusieurs hôtes dans différents réseaux. L'utilitaire gpg essaie de se "
+"connecter à l'un d'entre eux dans le réseau où il se trouve ; et si cet hôte "
+"est hors service, il échoue après un délai d'expiration."
 
-#: ../C/evolution.xml:2108(para)
+#: ../C/evolution.xml:2123(para)
 msgid ""
 "To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal "
 "console and get the IP address of the hosts. You can ping each of them to "
 "find the one which is up and running. Now, you can replace wwwkeys.pgp.net "
 "in the gpg --recv-keys --keyserver wwwkeys.pgp.net keyid command with that "
 "explicit IP number as returned by the host utility."
-msgstr "Pour éviter cela, saisissez la commande <command>$ host wwwkeys.pgp.net</command> dans un terminal et notez les adresses IP des hôtes. Vous pouvez essayez de les atteindre par la commande « ping » pour savoir lesquels répondent effectivement. Ensuite, vous pouvez remplacer le nom wwwkeys.pgp.net dans la commande « gpg --recv-keys --keyserver wwwkeys.pgp.net keyid » par le numéro IP que vous avez identifié à l'étape précédente."
+msgstr ""
+"Pour éviter cela, saisissez la commande <command>$ host wwwkeys.pgp.net</"
+"command> dans un terminal et notez les adresses IP des hôtes. Vous pouvez "
+"essayez de les atteindre par la commande « ping » pour savoir lesquels "
+"répondent effectivement. Ensuite, vous pouvez remplacer le nom wwwkeys.pgp."
+"net dans la commande « gpg --recv-keys --keyserver wwwkeys.pgp.net keyid » "
+"par le numéro IP que vous avez identifié à l'étape précédente."
 
-#: ../C/evolution.xml:2113(para)
+#: ../C/evolution.xml:2128(para)
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
 "enter the command <command>gpg <varname>--import</varname></command> to add "
 "it to your keyring."
 msgstr ""
 "Si quelqu'un vous envoie directement une clé publique, enregistrez-la dans "
-"un fichier texte et saisissez la commande <command>gpg <varname>--"
-"import</varname></command> pour l'ajouter à votre trousseau."
+"un fichier texte et saisissez la commande <command>gpg <varname>--import</"
+"varname></command> pour l'ajouter à votre trousseau."
 
-#: ../C/evolution.xml:2117(title)
+#: ../C/evolution.xml:2132(title)
 msgid "Setting up GPG Encryption"
 msgstr "Configuration du chiffrement GPG"
 
-#: ../C/evolution.xml:2120(para) ../C/evolution.xml:5639(para)
-#: ../C/evolution.xml:5655(para) ../C/evolution.xml:6086(para)
-msgid "Click Edit &gt; Preferences, then click Mail Accounts."
-msgstr "Choisissez Édition &gt; Préférences, puis cliquez sur Comptes de messagerie."
-
-#: ../C/evolution.xml:2123(para)
+#: ../C/evolution.xml:2138(para) ../C/evolution.xml:2177(para)
 msgid "Select the account you want to use securely, then click Edit."
 msgstr ""
 "Sélectionnez le compte pour lequel vous voulez ajouter la sécurité, puis "
 "cliquez sur Édition."
 
-#: ../C/evolution.xml:2126(para) ../C/evolution.xml:2164(para)
+#: ../C/evolution.xml:2141(para) ../C/evolution.xml:2180(para)
 msgid "Click the Security tab."
 msgstr "Cliquez sur l'onglet Sécurité."
 
-#: ../C/evolution.xml:2129(para)
+#: ../C/evolution.xml:2144(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
-msgstr "Indiquez votre identifiant de clé dans le champ « ID de la clé PGP/GPG »."
+msgstr ""
+"Indiquez votre identifiant de clé dans le champ « ID de la clé PGP/GPG »."
 
-#: ../C/evolution.xml:2138(para)
+#: ../C/evolution.xml:2153(para)
 msgid ""
 "Evolution requires that you know your key ID. If you don't remember it, you "
-"can find it by typing <command>gpg --list-keys</command> in a console "
+"can find it by typing <command>gpg --list-keys</command> in a terminal "
 "window. Your key ID is an eight-character string with random numbers and "
 "letters."
 msgstr ""
@@ -5564,49 +5604,41 @@ msgstr ""
 "est une chaîne de huit caractères composée de nombres et de lettres "
 "aléatoires."
 
-#: ../C/evolution.xml:2142(title)
+#: ../C/evolution.xml:2157(title)
 msgid "Encrypting Messages"
 msgstr "Chiffrement des messages"
 
-#: ../C/evolution.xml:2143(para)
+#: ../C/evolution.xml:2158(para)
 msgid "To encrypt a single message:"
 msgstr "Pour chiffrer un message unique :"
 
-#: ../C/evolution.xml:2146(para)
+#: ../C/evolution.xml:2161(para)
 msgid "Open a Compose a Message window."
 msgstr "Ouvrez une fenêtre d'édition de message."
 
-#: ../C/evolution.xml:2149(para)
+#: ../C/evolution.xml:2164(para)
 msgid "Click Security &gt; PGP Encrypt."
 msgstr "Choisissez Sécurité &gt; Chiffrer avec PGP."
 
-#: ../C/evolution.xml:2152(para)
-msgid "Compose your message, then click Send."
-msgstr "Écrivez votre message, puis cliquez sur Envoyer."
+#: ../C/evolution.xml:2167(para)
+msgid "Compose your message."
+msgstr "Écrivez votre message."
 
-#: ../C/evolution.xml:2155(para)
-msgid "You can set Evolution to always sign your e-mail messages:"
+#: ../C/evolution.xml:2171(para)
+msgid "You can set Evolution to always sign your email messages:"
 msgstr "Vous pouvez configurer Evolution pour qu'il signe tous vos courriels :"
 
-#: ../C/evolution.xml:2158(para)
-msgid "Click Edit &gt; Preferences, then select Mail Accounts."
-msgstr "Choisissez Édition &gt; Préférences, puis sélectionnez Comptes de messagerie."
-
-#: ../C/evolution.xml:2161(para)
-msgid "Select the mail account to encrypt, then click Edit."
-msgstr "Sélectionnez le compte de messagerie souhaité, puis cliquez sur Édition."
-
-#: ../C/evolution.xml:2167(para)
+#: ../C/evolution.xml:2183(para)
 msgid "Select Always Sign Outgoing Messages When Using This Account."
 msgstr ""
 "Cochez l'option Toujours signer les messages sortants lors de l'utilisation "
 "de ce compte."
 
-#: ../C/evolution.xml:2179(title)
+#: ../C/evolution.xml:2195(title)
 msgid "Unencrypting a Received Message"
 msgstr "Déchiffrement d'un message reçu"
 
-#: ../C/evolution.xml:2180(para)
+#: ../C/evolution.xml:2196(para)
 msgid ""
 "If you receive an encrypted message, you need to decrypt it before you read "
 "it. Remember, the sender must have your public key before they can send you "
@@ -5616,7 +5648,7 @@ msgstr ""
 "pouvoir le lire. Rappelez-vous que l'expéditeur doit disposer de votre clé "
 "publique avant de pouvoir vous envoyer un message chiffré."
 
-#: ../C/evolution.xml:2181(para)
+#: ../C/evolution.xml:2197(para)
 msgid ""
 "When you view the message, Evolution prompts you for your PGP password. "
 "Enter it, and the unencrypted message is displayed."
@@ -5624,7 +5656,7 @@ msgstr ""
 "Lorsque vous affichez le message, Evolution vous demande votre mot de passe "
 "PGP. Saisissez-le et le message déchiffré apparaîtra."
 
-#: ../C/evolution.xml:2186(para)
+#: ../C/evolution.xml:2202(para)
 msgid ""
 "S/MIME encryption also uses a key-based approach, but it has some "
 "significant advantages in convenience and security. S/MIME uses "
@@ -5647,7 +5679,7 @@ msgstr ""
 "automatiquement la partie publique du certificat et déchiffre ou vérifie le "
 "message."
 
-#: ../C/evolution.xml:2187(para)
+#: ../C/evolution.xml:2203(para)
 msgid ""
 "S/MIME is used most often in corporate settings. In these cases, "
 "administrators supply certificates that they have purchased from a "
@@ -5664,43 +5696,42 @@ msgstr ""
 "cas, c'est l'administrateur système qui vous fournit un fichier de "
 "certificat."
 
-#: ../C/evolution.xml:2188(para)
+#: ../C/evolution.xml:2204(para)
 msgid ""
 "If you want to use S/MIME independently, you can extract an identification "
-"certificate from your Mozilla* or Netscape* Web browser. See the Mozilla "
-"help <ulink url=\"http://www.mozilla.org/projects/security/pki/psm/help_21/"
-"using_certs_help.html\">Mozilla Help</ulink>for more information on security "
-"certificates."
+"certificate from your Mozilla* or Netscape* Web browser. See the <ulink url="
+"\"http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help."
+"html\">Mozilla Help</ulink>for more information on security certificates."
 msgstr ""
-"Si vous souhaitez utiliser S/MIME de façon indépendante,  vous pouvez "
+"Si vous souhaitez utiliser S/MIME de façon indépendante, vous pouvez "
 "extraire un certificat d'identification de votre navigateur Web Mozilla* ou "
 "Netscape*. Consultez l'<ulink url=\"http://www.mozilla.org/projects/security/"
 "pki/psm/help_21/using_certs_help.html\">aide de Mozilla</ulink> (en anglais) "
 "pour plus d'informations sur les certificats de sécurité."
 
-#: ../C/evolution.xml:2189(para)
+#: ../C/evolution.xml:2205(para)
 msgid "The certificate file is a password-protected file on your computer."
 msgstr ""
 "Le fichier de certificat est un fichier protégé par mot de passe sur votre "
 "ordinateur."
 
-#: ../C/evolution.xml:2192(title)
+#: ../C/evolution.xml:2208(title)
 msgid "Adding a Signing Certificate"
 msgstr "Ajout d'un certificat de signature"
 
-#: ../C/evolution.xml:2195(para)
-msgid "Click Edit &gt; Preferences, then click Certificate."
-msgstr "Choisissez Édition &gt; Préférences, puis cliquez sur Certificats."
+#: ../C/evolution.xml:2214(para)
+msgid "Click Certificates."
+msgstr "Cliquez sur Certificats."
 
-#: ../C/evolution.xml:2198(para) ../C/evolution.xml:2318(para)
+#: ../C/evolution.xml:2217(para) ../C/evolution.xml:2340(para)
 msgid "Click Import."
 msgstr "Cliquez sur Importer."
 
-#: ../C/evolution.xml:2201(para)
+#: ../C/evolution.xml:2220(para)
 msgid "Select the file to import, then click Open."
 msgstr "Sélectionnez le fichier à importer, puis cliquez sur Ouvrir."
 
-#: ../C/evolution.xml:2207(para)
+#: ../C/evolution.xml:2226(para)
 msgid ""
 "Similarly, you can add certificates that are sent to you independently of "
 "any authority by clicking the Contact Certificates tab and using the same "
@@ -5713,11 +5744,11 @@ msgstr ""
 "vous pouvez aussi ajouter de nouvelles autorités de certification disposant "
 "de leurs propres fichiers de certificat."
 
-#: ../C/evolution.xml:2211(title)
+#: ../C/evolution.xml:2230(title)
 msgid "Signing or Encrypting Every Message"
 msgstr "Signature et chiffrement de tous les messages"
 
-#: ../C/evolution.xml:2212(para)
+#: ../C/evolution.xml:2231(para)
 msgid ""
 "After you have added your certificate, you can sign or encrypt a message by "
 "clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
@@ -5726,23 +5757,20 @@ msgstr ""
 "message en choisissant Sécurité &gt; Signer avec S/MIME ou Chiffre avec S/"
 "MIME dans l'éditeur de messages."
 
-#: ../C/evolution.xml:2213(para)
+#: ../C/evolution.xml:2232(para)
 msgid "To have every message signed or encrypted:"
 msgstr "Pour que tous les messages soient signés ou chiffrés :"
 
-#: ../C/evolution.xml:2216(para)
-msgid ""
-"Click Edit &gt; Preferences, then select the account to encrypt the messages "
-"in."
+#: ../C/evolution.xml:2238(para)
+msgid "Select the account to encrypt the messages in."
 msgstr ""
-"Choisissez Édition &gt; Préférences, puis sélectionnez le compte dont les "
-"messages devront être chiffrés."
+"Sélectionnez le compte dans lequel vous souhaitez chiffrer les messages."
 
-#: ../C/evolution.xml:2219(para)
+#: ../C/evolution.xml:2241(para)
 msgid "Click Edit, then click Security."
 msgstr "Cliquez sur Édition, puis sur Sécurité."
 
-#: ../C/evolution.xml:2222(para)
+#: ../C/evolution.xml:2244(para)
 msgid ""
 "Click Select next to Signing Certificate and specify the path to your "
 "signing certificate."
@@ -5750,7 +5778,7 @@ msgstr ""
 "Cliquez sur Sélectionner en regard de Certificat de signature et indiquez le "
 "chemin d'accès vers votre certificat de signature."
 
-#: ../C/evolution.xml:2224(para)
+#: ../C/evolution.xml:2246(para)
 msgid ""
 "Click Select next to Encryption Certificate and specify the path to your "
 "encryption certificate."
@@ -5758,69 +5786,70 @@ msgstr ""
 "Cliquez sur Sélectionner en regard de Certificat de chiffrement et indiquez "
 "le chemin d'accès vers votre certificat de chiffrement."
 
-#: ../C/evolution.xml:2227(para)
+#: ../C/evolution.xml:2249(para)
 msgid "Select the appropriate options."
 msgstr "Cochez les options adéquates."
 
-#: ../C/evolution.xml:2243(para)
+#: ../C/evolution.xml:2265(para)
 msgid ""
-"Whether you only get a few e-mail messages a day, or you receive hundreds, "
-"you probably want to sort and organize them. Evolution™ has the tools to "
-"help you do it."
+"Whether you only get a few email messages a day, or you receive hundreds, "
+"you probably want to sort and organize them. <trademark>Evolution</"
+"trademark> has the tools to help you do it."
 msgstr ""
 "Que vous receviez seulement quelques courriels par jour ou des centaines, "
-"vous allez probablement vouloir les trier et les organiser. Evolution&trade; "
-"dispose des outils pour vous aider à faire cela."
+"vous allez probablement vouloir les trier et les organiser. "
+"<trademark>Evolution</trademark> dispose des outils pour vous aider à faire "
+"cela."
 
-#: ../C/evolution.xml:2246(link) ../C/evolution.xml:2269(title)
-msgid "Importing Your Old E-Mail"
+#: ../C/evolution.xml:2268(link) ../C/evolution.xml:2291(title)
+msgid "Importing Your Old Email"
 msgstr "Importation d'anciens courriels"
 
-#: ../C/evolution.xml:2249(link) ../C/evolution.xml:2358(title)
+#: ../C/evolution.xml:2271(link) ../C/evolution.xml:2381(title)
 msgid "Sorting the Message List"
 msgstr "Tri de la liste des messages"
 
-#: ../C/evolution.xml:2252(link) ../C/evolution.xml:2529(title)
+#: ../C/evolution.xml:2274(link) ../C/evolution.xml:2552(title)
 msgid "Getting Organized with Folders"
 msgstr "Organisation par dossiers"
 
-#: ../C/evolution.xml:2255(link) ../C/evolution.xml:2544(title)
+#: ../C/evolution.xml:2277(link) ../C/evolution.xml:2567(title)
 msgid "Searching for Messages"
 msgstr "Recherche de messages"
 
-#: ../C/evolution.xml:2258(link) ../C/evolution.xml:2748(title)
+#: ../C/evolution.xml:2280(link) ../C/evolution.xml:2771(title)
 msgid "Create Rules to Automatically Organize Mail"
 msgstr "Création de règles pour l'organisation automatique des courriels"
 
-#: ../C/evolution.xml:2261(link) ../C/evolution.xml:2987(title)
+#: ../C/evolution.xml:2283(link) ../C/evolution.xml:3010(title)
 msgid "Using Search Folders"
 msgstr "Utilisation des dossiers de recherche"
 
-#: ../C/evolution.xml:2264(link) ../C/evolution.xml:3120(title)
+#: ../C/evolution.xml:2286(link) ../C/evolution.xml:3143(title)
 msgid "Stopping Junk Mail (Spam)"
 msgstr "Blocage des messages indésirables (pourriel)"
 
-#: ../C/evolution.xml:2270(para)
+#: ../C/evolution.xml:2292(para)
 msgid ""
-"Evolution allows you to import old e-mail and contacts so that you don't "
-"need to worry about losing your old information."
+"Evolution allows you to import old email and contacts so that you don't need "
+"to worry about losing your old information."
 msgstr ""
 "Evolution permet d'importer d'anciens courriels et contacts ; il n'y a donc "
 "pas de crainte à avoir sur la perte d'anciennes informations."
 
-#: ../C/evolution.xml:2273(title)
+#: ../C/evolution.xml:2295(title)
 msgid "Importing Single Files"
 msgstr "Importation de fichiers isolés"
 
-#: ../C/evolution.xml:2274(para)
+#: ../C/evolution.xml:2296(para)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution est capable d'importer les types de fichiers suivants :"
 
-#: ../C/evolution.xml:2276(title)
+#: ../C/evolution.xml:2298(title)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd) :"
 
-#: ../C/evolution.xml:2277(para)
+#: ../C/evolution.xml:2299(para)
 msgid ""
 "The address book format used by the GNOME, KDE, and many other contact "
 "management applications. You should be able to export to vCard format from "
@@ -5831,11 +5860,11 @@ msgstr ""
 "d'exporter au format vCard depuis n'importe quel programme de carnet "
 "d'adresses."
 
-#: ../C/evolution.xml:2280(title)
-msgid "vCalender:"
-msgstr "vCalender :"
+#: ../C/evolution.xml:2302(title)
+msgid "vCalendar:"
+msgstr "vCalendar :"
 
-#: ../C/evolution.xml:2281(para)
+#: ../C/evolution.xml:2303(para)
 msgid ""
 "A format for storing calender files, which is generally used by Evolution, "
 "Microsoft Outlook, Sunbird, and Korganizer."
@@ -5843,11 +5872,11 @@ msgstr ""
 "Un format de stockage de fichiers calendrier, utilisé généralement par "
 "Evolution, MS Outlook, Sunbird et Korganizer."
 
-#: ../C/evolution.xml:2284(title)
+#: ../C/evolution.xml:2306(title)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar ou iCal (.ics) :"
 
-#: ../C/evolution.xml:2285(para)
+#: ../C/evolution.xml:2307(para)
 msgid ""
 "A format for storing calendar files. iCalendar is used by Palm OS handhelds, "
 "Evolution, and Microsoft Outlook."
@@ -5855,21 +5884,23 @@ msgstr ""
 "Un format de stockage de fichiers calendrier. iCalendar est utilisé par les "
 "appareils Palm OS, par Evolution et par MS Outlook."
 
-#: ../C/evolution.xml:2288(title)
+#: ../C/evolution.xml:2310(title)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab) :"
 
-#: ../C/evolution.xml:2289(para)
-msgid "CSV or Tab files saved using Evolution, Microsoft Outlook and Mozilla."
-msgstr "Les fichiers tab ou csv enregistrés par Evolution, MS Outlook et Mozilla."
+#: ../C/evolution.xml:2311(para)
+msgid ""
+"CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
+msgstr ""
+"Les fichiers Tab ou CSV enregistrés par Evolution, MS Outlook et Mozilla."
 
-#: ../C/evolution.xml:2292(title)
+#: ../C/evolution.xml:2314(title)
 msgid "Microsoft Outlook Express 4 (.mbx):"
 msgstr "Microsoft Outlook Express 4 (.mbx) :"
 
-#: ../C/evolution.xml:2293(para)
+#: ../C/evolution.xml:2315(para)
 msgid ""
-"The e-mail file format used by Microsoft Outlook Express 4. For other "
+"The email file format used by Microsoft Outlook Express 4. For other "
 "versions of Microsoft Outlook and Outlook Express, see the workaround "
 "described in <link linkend=\"bsawgkk\">Step 1</link>."
 msgstr ""
@@ -5877,48 +5908,48 @@ msgstr ""
 "Concernant les autres versions de MS Outlook et Outlook Express, consultez "
 "l'astuce présentée à l'<link linkend=\"bsawgkk\">étape 1</link>."
 
-#: ../C/evolution.xml:2296(title)
+#: ../C/evolution.xml:2318(title)
 msgid "LDAP Data Interchange Format (.LDIF):"
 msgstr "LDAP Data Interchange Format (.LDIF) :"
 
-#: ../C/evolution.xml:2297(para)
+#: ../C/evolution.xml:2319(para)
 msgid "A standard data format for contact cards."
 msgstr "Un format de données standard pour les cartes de contacts."
 
-#: ../C/evolution.xml:2300(title)
+#: ../C/evolution.xml:2322(title)
 msgid "Berkley Mailbox (.mbox or null extension):"
 msgstr "Berkley Mailbox (.mbox ou sans extension) :"
 
-#: ../C/evolution.xml:2301(para)
+#: ../C/evolution.xml:2323(para)
 msgid ""
-"The e-mail format used by Mozilla, Netscape, Evolution, Eudora*, and many "
-"other e-mail clients."
+"The email format used by Mozilla, Netscape, Evolution, Eudora*, and many "
+"other email clients."
 msgstr ""
 "Le format de courriels utilisé par Mozilla, Netscape, Evolution, Eudora* et "
 "bien d'autres logiciels de messagerie."
 
-#: ../C/evolution.xml:2303(para)
-msgid "To import your old e-mail:"
+#: ../C/evolution.xml:2325(para)
+msgid "To import your old email:"
 msgstr "Pour importer vos anciens courriels :"
 
-#: ../C/evolution.xml:2306(para) ../C/evolution.xml:2328(para)
-#: ../C/evolution.xml:3432(para)
+#: ../C/evolution.xml:2328(para) ../C/evolution.xml:2350(para)
+#: ../C/evolution.xml:3453(para)
 msgid "Click File &gt; Import."
 msgstr "Cliquez sur Fichier &gt; Importer."
 
-#: ../C/evolution.xml:2312(para)
+#: ../C/evolution.xml:2334(para)
 msgid "Select Import a Single File, then click Forward."
 msgstr "Sélectionnez « Importer un seul fichier », puis cliquez sur Suivant."
 
-#: ../C/evolution.xml:2315(para)
+#: ../C/evolution.xml:2337(para)
 msgid "Select the file to import, then click Forward."
 msgstr "Sélectionnez le fichier à importer, puis cliquez sur Suivant."
 
-#: ../C/evolution.xml:2324(title)
+#: ../C/evolution.xml:2346(title)
 msgid "Importing Multiple Files"
 msgstr "Importation de plusieurs fichiers"
 
-#: ../C/evolution.xml:2325(para)
+#: ../C/evolution.xml:2347(para)
 msgid ""
 "Evolution automates the import process for several applications it can "
 "recognize."
@@ -5926,13 +5957,14 @@ msgstr ""
 "Evolution automatise le processus d'importation pour plusieurs applications "
 "qu'il reconnaît."
 
-#: ../C/evolution.xml:2334(para)
-msgid "Select Import Data and Settings From Older Programs, then click Forward."
+#: ../C/evolution.xml:2356(para)
+msgid ""
+"Select Import Data and Settings From Older Programs, then click Forward."
 msgstr ""
-"Sélectionnez « Importer les données et les paramètres d'anciens "
-"programmes », puis cliquez sur Suivant."
+"Sélectionnez « Importer les données et les paramètres d'anciens programmes », "
+"puis cliquez sur Suivant."
 
-#: ../C/evolution.xml:2335(para)
+#: ../C/evolution.xml:2357(para)
 msgid ""
 "Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link "
 "linkend=\"bsawf2t\">Step 5</link> to import."
@@ -5940,7 +5972,7 @@ msgstr ""
 "Suivez les procédures de l'<link linkend=\"bsawely\">étape 3</link> jusqu'à "
 "l'<link linkend=\"bsawf2t\">étape 5</link> pour effectuer l'importation."
 
-#: ../C/evolution.xml:2336(para)
+#: ../C/evolution.xml:2358(para)
 msgid ""
 "Evolution searches for old mail programs and, if possible, imports the data "
 "from them."
@@ -5948,24 +5980,20 @@ msgstr ""
 "Evolution recherche d'anciens programmes de messagerie et, si possible, "
 "importe les données qu'il trouve."
 
-#: ../C/evolution.xml:2340(para)
+#: ../C/evolution.xml:2363(para)
 msgid ""
-"Microsoft Outlook and versions of Outlook Express after version 4 use "
-"proprietary formats that Evolution cannot read or import. One migration "
-"method that works well is to use the Outport application. See <ulink url="
-"\"http://outport.sourceforge.net\">outport.sourceforge.net</ulink> for "
-"additional information. You can also import data into another Windows mail "
-"client such as Mozilla."
+"One migration method that works well is to use the Outport application. See "
+"<ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</"
+"ulink> for additional information. You can also import data into another "
+"Windows mail client such as Mozilla."
 msgstr ""
-"MS Outlook et les versions d'Outlook Express postérieures à la version 4 "
-"utilisent des formats propriétaires qu'Evolution ne peut ni lire, ni "
-"importer. Une méthode de migration qui fonctionne bien est d'utiliser "
-"l'application Outport. Consultez le site <ulink url=\"http://outport."
-"sourceforge.net\">outport.sourceforge.net</ulink> pour plus d'informations. "
-"Vous pouvez aussi importer les données dans un autre logiciel de messagerie "
-"sous Windows, comme Mozilla par exemple."
+"Une méthode de migration qui fonctionne bien est d'utiliser l'application "
+"Outport. Consultez le site <ulink url=\"http://outport.sourceforge.net"
+"\">outport.sourceforge.net</ulink> pour plus d'informations. Vous pouvez "
+"aussi importer les données dans un autre logiciel de messagerie sous "
+"Windows, comme Mozilla par exemple."
 
-#: ../C/evolution.xml:2343(para)
+#: ../C/evolution.xml:2366(para)
 msgid ""
 "While in Windows, import your .pst files into Mozilla Mail (or another mail "
 "program such as Netscape or Eudora that uses the standard mbox format)."
@@ -5974,26 +6002,17 @@ msgstr ""
 "logiciel de messagerie qui utilise le format mbox standard, comme Netscape "
 "ou Eudora)."
 
-#: ../C/evolution.xml:2344(para)
+#: ../C/evolution.xml:2370(para)
 msgid ""
-"Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders "
-"from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports "
-"and undeletes the messages in your Trash folders."
+"Copy the files to the system or partition that Evolution is installed on."
 msgstr ""
-"Les utilisateurs de Mozilla et Netscape doivent cliquer sur Fichier &gt; "
-"Compresser &gt; Tous les dossiers dans le composant de messagerie de "
-"Netscape ou Mozilla. Sinon, Evolution importe et récupère les messages que "
-"vous aviez mis à la corbeille."
-
-#: ../C/evolution.xml:2347(para)
-msgid "Copy the files to the system or partition that Evolution is installed on."
-msgstr "Copiez les fichiers sur le système ou la partition où se trouve Evolution."
+"Copiez les fichiers sur le système ou la partition où se trouve Evolution."
 
-#: ../C/evolution.xml:2350(para)
+#: ../C/evolution.xml:2373(para)
 msgid "Use the Evolution import tool to import the files."
 msgstr "Utilisez l'outil d'importation d'Evolution pour importer les fichiers."
 
-#: ../C/evolution.xml:2353(para)
+#: ../C/evolution.xml:2376(para)
 msgid ""
 "For POP mail, filters are applied as messages are downloaded. For IMAP mail, "
 "filters are applied to new messages when you open the Inbox folder. On "
@@ -6011,9 +6030,9 @@ msgstr ""
 "tous les messages d'un dossier, sélectionnez tout le dossier en appuyant sur "
 "Ctrl+A, puis appliquez les filtres en appuyant sur Ctrl+Y."
 
-#: ../C/evolution.xml:2359(para)
+#: ../C/evolution.xml:2382(para)
 msgid ""
-"Evolution helps you work by letting you sort your e-mail. To sort by sender, "
+"Evolution helps you work by letting you sort your email. To sort by sender, "
 "subject, or date, click the bars with those labels at the top of the message "
 "list. The direction of the arrow next to the label indicates the direction "
 "of the sort. Click again, to sort them in reverse order. For example, click "
@@ -6033,26 +6052,25 @@ msgstr ""
 "droit sur l'en-tête de colonne pour obtenir quelques options de tri, ainsi "
 "que pour ajouter ou enlever des colonnes de la liste des messages."
 
-#: ../C/evolution.xml:2360(para)
+#: ../C/evolution.xml:2383(para)
 msgid ""
-"To look at the complete headers for a message, click View &gt; Message "
-"Display &gt; Show Full Headers. To see all message data, click View &gt; "
-"Message Display &gt; Show E-Mail Source."
+"To look at the complete headers for a message, click View &gt; All Message "
+"Headers. To see all message data, click View &gt; Message Source."
 msgstr ""
 "Pour afficher tous les en-têtes d'un message, cliquez sur Affichage &gt; "
 "Tous les en-têtes du message. Pour voir toutes les données du message, "
 "cliquez sur Affichage &gt; Source du message."
 
-#: ../C/evolution.xml:2363(title)
-msgid "Sorting Mail In E-mail Threads"
+#: ../C/evolution.xml:2386(title)
+msgid "Sorting Mail In Email Threads"
 msgstr "Tri des messages dans les fils de discussion"
 
-#: ../C/evolution.xml:2364(para)
+#: ../C/evolution.xml:2387(para)
 msgid ""
-"You can also choose a threaded message view. Click View &gt; Threaded "
-"Message List to turn the threaded view on or off. When you select this "
-"option, Evolution groups the replies to a message with the original, so you "
-"can follow the thread of a conversation from one message to the next."
+"You can also choose a threaded message view. Click View &gt; Group By "
+"Threads to turn the threaded view on or off. When you select this option, "
+"Evolution groups the replies to a message with the original, so you can "
+"follow the thread of a conversation from one message to the next."
 msgstr ""
 "Vous pouvez aussi choisir d'afficher les messages par fil de discussion. "
 "Cliquez sur Affichage &gt; Grouper par fils de discussion pour activer ou "
@@ -6060,7 +6078,7 @@ msgstr ""
 "groupe les réponses à un message avec le message original, afin que vous "
 "puissiez suivre le fil d'une conversation d'un message à l'autre."
 
-#: ../C/evolution.xml:2366(para)
+#: ../C/evolution.xml:2389(para)
 msgid ""
 "In a thread of conversation view, each new message is stacked below of the "
 "ones that arrived before it, so that the newest message is always the one "
@@ -6076,7 +6094,7 @@ msgstr ""
 "automatiquement remonté en tête de liste. Les fils de discussion sont "
 "toujours triés en fonction de la date de leur message le plus récent."
 
-#: ../C/evolution.xml:2368(para)
+#: ../C/evolution.xml:2391(para)
 msgid ""
 "There is a gconf key to toggle between the collapsed or expanded state of "
 "mail thread. By default, it is collapsed and you can change this at /apps/"
@@ -6093,11 +6111,11 @@ msgstr ""
 "et que vous redémarrez Evolution, tous les fils sont dans le nouvel état. "
 "Ceci est une fonctionnalité avancée réservée aux utilisateurs experts."
 
-#: ../C/evolution.xml:2373(title)
+#: ../C/evolution.xml:2396(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "Tri des messages avec les en-têtes de colonne"
 
-#: ../C/evolution.xml:2374(para)
+#: ../C/evolution.xml:2397(para)
 msgid ""
 "The message list normally has columns to indicate whether a message has been "
 "read, whether it has attachments, how important it is, and the sender, date, "
@@ -6109,15 +6127,15 @@ msgstr ""
 "l'expéditeur, la date et le sujet. Vous pouvez changer l'ordre des colonnes "
 "et ajouter ou enlever des colonnes par glisser-déposer."
 
-#: ../C/evolution.xml:2378(title)
+#: ../C/evolution.xml:2401(title)
 msgid "Sorting Mail With Column Headers"
 msgstr "Tri des messages avec les en-têtes de colonne"
 
-#: ../C/evolution.xml:2379(para)
+#: ../C/evolution.xml:2402(para)
 msgid ""
 "In addition to it, Evolution enables you to sort your messages by using Sort-"
-"by list.You can use any of the criteria given in the Sort-by list such as "
-"<emphasis>sender, location, to, from, size, </emphasis>and so forth to "
+"by list. You can use any of the criteria given in the Sort-by list such as "
+"<emphasis>sender, location, to, from, size</emphasis> and so forth to "
 "perform sorting. It returns the sorted email list that matches the criteria "
 "you have selected."
 msgstr ""
@@ -6127,106 +6145,106 @@ msgstr ""
 "emphasis> etc. Cela trie la liste des courriels selon le critère que vous "
 "aurez sélectionné."
 
-#: ../C/evolution.xml:2380(para)
+#: ../C/evolution.xml:2403(para)
 msgid "To sort messages, perform the following procedure:"
 msgstr "Pour trier les courriels, effectuez la procédure suivante :"
 
-#: ../C/evolution.xml:2383(para)
+#: ../C/evolution.xml:2406(para)
 msgid "Right click message header bar."
 msgstr "Faites un clic droit sur la barre des en-têtes de colonne."
 
-#: ../C/evolution.xml:2386(para)
+#: ../C/evolution.xml:2409(para)
 msgid "Click Sort by to get a list of options."
 msgstr "Choisissez « Trier par » pour obtenir une liste d'options."
 
-#: ../C/evolution.xml:2388(title)
+#: ../C/evolution.xml:2411(title)
 msgid "Sort by:"
 msgstr "Trier par :"
 
-#: ../C/evolution.xml:2389(para)
+#: ../C/evolution.xml:2412(para)
 msgid "Sorts the message by different criteria as listed below:"
 msgstr ""
 "Trie les messages selon différents critères, comme le présente la liste ci-"
 "dessous :"
 
-#: ../C/evolution.xml:2393(para)
+#: ../C/evolution.xml:2416(para)
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: ../C/evolution.xml:2396(para) ../C/evolution.xml:2402(para)
+#: ../C/evolution.xml:2419(para) ../C/evolution.xml:2425(para)
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: ../C/evolution.xml:2399(para)
+#: ../C/evolution.xml:2422(para)
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../C/evolution.xml:2405(para)
+#: ../C/evolution.xml:2428(para)
 msgid "Due By"
 msgstr "Date d'échéance"
 
-#: ../C/evolution.xml:2408(para)
+#: ../C/evolution.xml:2431(para)
 msgid "Follow Up Flag"
 msgstr "Indicateur de suivi"
 
-#: ../C/evolution.xml:2411(para)
+#: ../C/evolution.xml:2434(para)
 msgid "Flag Status"
 msgstr "État des marqueurs"
 
-#: ../C/evolution.xml:2414(para)
+#: ../C/evolution.xml:2437(para)
 msgid "Size"
 msgstr "Taille"
 
-#: ../C/evolution.xml:2417(para)
+#: ../C/evolution.xml:2440(para)
 msgid "To"
 msgstr "À"
 
-#: ../C/evolution.xml:2420(para)
+#: ../C/evolution.xml:2443(para)
 msgid "Received"
 msgstr "Reçu"
 
-#: ../C/evolution.xml:2423(para)
+#: ../C/evolution.xml:2446(para)
 msgid "Date"
 msgstr "Date"
 
-#: ../C/evolution.xml:2426(para)
+#: ../C/evolution.xml:2449(para)
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../C/evolution.xml:2429(para)
+#: ../C/evolution.xml:2452(para)
 msgid "From"
 msgstr "De"
 
-#: ../C/evolution.xml:2432(para)
+#: ../C/evolution.xml:2455(para)
 msgid "Attachment"
 msgstr "Pièce jointe"
 
-#: ../C/evolution.xml:2435(para)
+#: ../C/evolution.xml:2458(para)
 msgid "Score"
 msgstr "Score"
 
-#: ../C/evolution.xml:2438(para)
+#: ../C/evolution.xml:2461(para)
 msgid "Flagged"
 msgstr "Marqué"
 
-#: ../C/evolution.xml:2441(para) ../C/evolution.xml:3354(para)
-#: ../C/evolution.xml:4241(para) ../C/evolution.xml:4591(para)
-#: ../C/evolution.xml:4787(para)
+#: ../C/evolution.xml:2464(para) ../C/evolution.xml:3375(para)
+#: ../C/evolution.xml:4265(para) ../C/evolution.xml:4616(para)
+#: ../C/evolution.xml:4811(para)
 msgid "Status"
 msgstr "État"
 
-#: ../C/evolution.xml:2444(para)
+#: ../C/evolution.xml:2467(para)
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../C/evolution.xml:2448(para)
+#: ../C/evolution.xml:2471(para)
 msgid ""
 "Clicking each sort criteria cycles take you through three possibilities. "
 "Sort by criteria in ascending or descending order or unsort the message. "
 "When you click any of the sort criteria reiteratively, Evolution sort the "
 "messages in a sequential order - ascending, descending and unsort. For "
 "example, when you click Recepients for the first time, Evolution sort the "
-"messages by recepients in ascending order and for the second time, sort in "
+"messages by recipients in ascending order and for the second time, sort in "
 "the reverse order. For the next click, messages will be displayed unsorted."
 msgstr ""
 "Des clics successifs sur un critère de tri produisent tour à tour trois "
@@ -6235,35 +6253,35 @@ msgstr ""
 "selon les destinataires par ordre croissant. Au deuxième clic, il trie par "
 "ordre décroissant, et au troisième clic, il ne trie plus rien."
 
-#: ../C/evolution.xml:2451(title)
+#: ../C/evolution.xml:2474(title)
 msgid "Sort Ascending:"
 msgstr "Tri croissant :"
 
-#: ../C/evolution.xml:2452(para)
+#: ../C/evolution.xml:2475(para)
 msgid ""
-"Sorts the messages top to bottom and returns you the sorted e-mail list in "
+"Sorts the messages top to bottom and returns you the sorted message list in "
 "the order of oldest to the latest."
 msgstr ""
 "Trie les messages du haut en bas et génère une liste de courriels triés du "
 "plus ancien au plus récent."
 
-#: ../C/evolution.xml:2455(title)
+#: ../C/evolution.xml:2478(title)
 msgid "Sort Descending:"
 msgstr "Tri décroissant :"
 
-#: ../C/evolution.xml:2456(para)
+#: ../C/evolution.xml:2479(para)
 msgid ""
-"Sort descending revers the order and returns you the sorted e-mail list in "
+"Sort descending revers the order and returns you the sorted message list in "
 "the order of newest to oldest."
 msgstr ""
 "Trie les messages dans l'ordre inverse et génère une liste de courriels "
 "triés du plus récent au plus ancien."
 
-#: ../C/evolution.xml:2459(title)
+#: ../C/evolution.xml:2482(title)
 msgid "Unsort:"
 msgstr "Ne pas trier :"
 
-#: ../C/evolution.xml:2460(para)
+#: ../C/evolution.xml:2483(para)
 msgid ""
 "Unsort removes sorting from this column, reverting to the order of messages "
 "as they were added to the folder."
@@ -6271,11 +6289,11 @@ msgstr ""
 "Enlève le tri selon cette colonne, revenant à l'état de tri des messages "
 "selon leur ordre d'arrivée dans le dossier."
 
-#: ../C/evolution.xml:2463(title)
+#: ../C/evolution.xml:2486(title)
 msgid "Removing a Column:"
 msgstr "Enlever cette colonne :"
 
-#: ../C/evolution.xml:2464(para)
+#: ../C/evolution.xml:2487(para)
 msgid ""
 "Remove this column from the display. You can also remove columns by dragging "
 "the header off the list and letting it drop."
@@ -6283,11 +6301,11 @@ msgstr ""
 "Enlève la colonne de l'affichage. Vous pouvez aussi enlever des colonnes en "
 "faisant glisser leur en-tête hors de la liste."
 
-#: ../C/evolution.xml:2467(title)
+#: ../C/evolution.xml:2490(title)
 msgid "Adding a Column:"
 msgstr "Ajouter une colonne :"
 
-#: ../C/evolution.xml:2468(para)
+#: ../C/evolution.xml:2491(para)
 msgid ""
 "When you select this item, a dialog box appears, listing the possible "
 "columns. Drag the column you want into a space between existing column "
@@ -6298,11 +6316,11 @@ msgstr ""
 "sur une limite entre deux en-têtes de colonne existante. Une flèche rouge "
 "montre où la colonne sera insérée."
 
-#: ../C/evolution.xml:2471(title)
+#: ../C/evolution.xml:2494(title)
 msgid "Best Fit:"
 msgstr "Meilleur ajustement :"
 
-#: ../C/evolution.xml:2472(para)
+#: ../C/evolution.xml:2495(para)
 msgid ""
 "Automatically adjusts the widths of the columns for the most efficient use "
 "of space."
@@ -6310,11 +6328,11 @@ msgstr ""
 "Ajuste automatiquement la largeur des colonnes pour un usage optimal de "
 "l'espace disponible."
 
-#: ../C/evolution.xml:2475(title)
+#: ../C/evolution.xml:2498(title)
 msgid "Customizing the Current View:"
 msgstr "Personnaliser la vue en cours :"
 
-#: ../C/evolution.xml:2476(para)
+#: ../C/evolution.xml:2499(para)
 msgid ""
 "Choose this item to pick a more complex sort order for messages, or to "
 "choose which columns of information about your messages you want to display."
@@ -6323,21 +6341,21 @@ msgstr ""
 "complexe, ou pour choisir quelle(s) colonne(s) d'information sur les "
 "messages vous souhaitez afficher."
 
-#: ../C/evolution.xml:2480(para)
-msgid "Select the search criteria."
-msgstr "Sélectionnez le critère de recherche."
+#: ../C/evolution.xml:2503(para)
+msgid "Select the search criteria from the list."
+msgstr "Sélectionnez le critère de recherche dans la liste."
 
-#: ../C/evolution.xml:2481(para)
+#: ../C/evolution.xml:2504(para)
 msgid "You can view the messages in the desired order in the message list."
 msgstr ""
 "Vous pouvez afficher les messages dans l'ordre souhaité dans la liste des "
 "messages."
 
-#: ../C/evolution.xml:2487(title)
+#: ../C/evolution.xml:2510(title)
 msgid "Using the Follow up Feature"
 msgstr "Fonctionnalité de suivi"
 
-#: ../C/evolution.xml:2488(para)
+#: ../C/evolution.xml:2511(para)
 msgid ""
 "To make sure you don't forget about a message, you can use the Follow up "
 "feature."
@@ -6345,45 +6363,47 @@ msgstr ""
 "Pour être certain de ne pas oublier de traiter un message, vous pouvez "
 "utiliser la fonctionnalité de suivi."
 
-#: ../C/evolution.xml:2491(para)
+#: ../C/evolution.xml:2514(para)
 msgid "Select one or more messages."
 msgstr "Sélectionnez un ou plusieurs messages."
 
-#: ../C/evolution.xml:2494(para)
+#: ../C/evolution.xml:2517(para)
 msgid "Right-click one of the messages."
 msgstr "Faites un clic droit sur l'un des messages."
 
-#: ../C/evolution.xml:2497(para)
+#: ../C/evolution.xml:2520(para)
 msgid "Click Mark for Follow Up."
 msgstr "Choisissez « Marquer pour donner suite »."
 
-#: ../C/evolution.xml:2500(para)
+#: ../C/evolution.xml:2523(para)
 msgid "You can also open the Flag to Follow Up window by"
-msgstr "Vous pouvez également ouvrir la fenêtre « Marquer pour donner suite » en"
+msgstr ""
+"Vous pouvez également ouvrir la fenêtre « Marquer pour donner suite » en"
 
-#: ../C/evolution.xml:2503(para)
+#: ../C/evolution.xml:2526(para)
 msgid "Select the messages."
 msgstr "Sélectionnez les messages."
 
-#: ../C/evolution.xml:2506(para)
+#: ../C/evolution.xml:2529(para)
 msgid "Select Message menu."
 msgstr "Ouvrez le menu Message."
 
-#: ../C/evolution.xml:2509(para)
+#: ../C/evolution.xml:2532(para)
 msgid "Click Mark as."
 msgstr "Choisissez « Marquer comme »."
 
-#: ../C/evolution.xml:2512(para)
+#: ../C/evolution.xml:2535(para)
 msgid "Select Follow Up or press Shift+Ctrl+G."
 msgstr "Choisissez « Donner suite » ou appuyez sur Maj+Ctrl+G."
 
-#: ../C/evolution.xml:2513(para)
-msgid "A dialog box opens to allow you to set the type of flag and the due date."
+#: ../C/evolution.xml:2536(para)
+msgid ""
+"A dialog box opens to allow you to set the type of flag and the due date."
 msgstr ""
 "Une boîte de dialogue s'ouvre, vous permettant de saisir le type de "
 "marqueur, ainsi que la date d'échéance."
 
-#: ../C/evolution.xml:2517(para)
+#: ../C/evolution.xml:2540(para)
 msgid ""
 "The flag itself is the action you want to remind yourself about. Several are "
 "provided for you, such as Call, Forward, and Reply, but you can enter your "
@@ -6393,7 +6413,7 @@ msgstr ""
 "a plusieurs à votre disposition, tels que Appel, Faire suivre ou Répondre, "
 "mais vous pouvez saisir votre propre note ou action si vous le souhaitez."
 
-#: ../C/evolution.xml:2518(para)
+#: ../C/evolution.xml:2541(para)
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
 "entirely by right-clicking the message, then click either Flag Completed or "
@@ -6403,17 +6423,17 @@ msgstr ""
 "entièrement en faisant un clic droit sur le message et en choisissant Marqué "
 "Achevé ou Effacer les marqueurs."
 
-#: ../C/evolution.xml:2519(para)
+#: ../C/evolution.xml:2542(para)
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
-"before the message headers. An overdue message might tell you “Overdue: Call "
-"by April 07, 2003, 5:00 PM.”"
+"before the message headers. An overdue message might tell you "
+"<quote>Overdue: Call by April 07, 2003, 5:00 PM.</quote>"
 msgstr ""
 "Lorsque vous lisez un message marqué, l'état du marqueur est affiché au "
 "sommet, avant les en-têtes. Une marque de suivi en retard vous est signalé "
 "avec un message du style « Retard : Appel le 7 avril 2003, 17:00 »."
 
-#: ../C/evolution.xml:2520(para)
+#: ../C/evolution.xml:2543(para)
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
 "might add a Flag Status column to your message list and sort that way. "
@@ -6429,22 +6449,23 @@ msgstr ""
 "votre dossier de recherche ne contiendra plus que les messages qui "
 "contiennent encore une échéance."
 
-#: ../C/evolution.xml:2522(title)
+#: ../C/evolution.xml:2545(title)
 msgid "Mark as Important Feature:"
 msgstr "Fonctionnalité Marquer comme important :"
 
-#: ../C/evolution.xml:2523(para)
+#: ../C/evolution.xml:2546(para)
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
 "them as important by right-clicking the message, then click Mark as "
-"Important or Select Message &gt; Mark as &gt;Important."
+"Important or Select Message &gt; Mark as &gt; Important from the menubar."
 msgstr ""
 "Si vous préférez utiliser une méthode plus simple de vous rappeler de "
 "certains messages, vous pouvez les marquer comme importants en faisant un "
-"clic droit sur le message, puis en choisissant « Marquer comme important » "
-"ou en choississant le menu Message &gt; Marquer comme important."
+"clic droit sur le message, puis en choisissant « Marquer comme important » ou "
+"en choississant le menu « Message &gt; Marquer comme important » dans la "
+"barre de menus."
 
-#: ../C/evolution.xml:2530(para)
+#: ../C/evolution.xml:2553(para)
 msgid ""
 "Evolution, like most other mail systems, stores mail in folders. You start "
 "out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can "
@@ -6458,29 +6479,29 @@ msgstr ""
 "choisissant Dossier &gt; Nouveau, ou en faisant un clic droit sur la liste "
 "des dossiers et en choisissant Nouveau dossier."
 
-#: ../C/evolution.xml:2531(para)
+#: ../C/evolution.xml:2554(para)
 msgid ""
 "When you click OK, your new folder appears in the folder view. You can then "
-"move the messages to it by dragging and dropping them, or right click &gt; "
-"Move to folder or press Shift+Ctrl+V."
+"move the messages to it by dragging and dropping them, or right click on the "
+"message and choose Move to folder, or press Shift+Ctrl+V."
 msgstr ""
 "Lorsque vous cliquez sur Valider, votre nouveau dossier apparaît dans la "
 "liste des dossiers. Vous pouvez alors y déplacer des messages par glisser-"
 "déposer, ou en choisissant « Déplacer vers le dossier » dans le menu "
 "contextuel des messages, ou encore en appuyant sur Maj+Ctrl+V."
 
-#: ../C/evolution.xml:2532(para)
+#: ../C/evolution.xml:2555(para)
 msgid ""
 "You can also drop the messages to a particular folder by selecting Message "
-"&gt; Move to folder or press Shift+Ctrl +V. This will open Select folder "
-"window, where you can drop your message to any of the folders listed."
+"&gt; Move to folder. This will open the Select folder window, where you can "
+"drop your message to any of the folders listed."
 msgstr ""
 "Vous pouvez aussi placer les messages dans une dossier particulier en "
-"choisissant Message &gt; Déplacer vers le dossier ou en appuyant sur Maj+Ctrl"
-"+V. La fenêtre « Sélectionnez un dossier » apparaît et vous permet de "
-"choisir le dossier de destination du ou des messages."
+"choisissant Message &gt; Déplacer vers le dossier. La fenêtre « Sélectionnez "
+"un dossier » apparaît et vous permet de choisir le dossier de destination du "
+"ou des messages."
 
-#: ../C/evolution.xml:2534(para)
+#: ../C/evolution.xml:2557(para)
 msgid ""
 "If you want to create a new folder click New at the bottom left of the "
 "window. Specify the location and enter the label of the folder at the entry "
@@ -6493,28 +6514,30 @@ msgstr ""
 "messages d'un dossier vers un autre en sélectionnant le message et en "
 "cliquant sur Déplacer en bas à droite."
 
-#: ../C/evolution.xml:2535(para)
+#: ../C/evolution.xml:2558(para)
 msgid ""
 "If you create a filter with the filter assistant, you can have mail filed "
-"automatically. For that select Edit &gt; Message Filters to appear Message "
-"Filters window"
+"automatically. Select Edit &gt; Message Filters to bring up the Message "
+"Filters window."
 msgstr ""
 "Si vous créez un filtre avec l'assistant, il est possible de classer "
-"automatiquement les messages. Pour cela, choisissez Édition &gt; Filtres de "
-"message afin de faire apparaître la fenêtre des Filtres de message."
+"automatiquement les messages. Choisissez Édition &gt; Filtres de message "
+"afin de faire apparaître la fenêtre des Filtres de message."
 
-#: ../C/evolution.xml:2537(para)
+#: ../C/evolution.xml:2560(para)
 msgid ""
-"Click the Add tab to appear Add Rule window from where you can set different "
-"criteria for filtering messages. For more information refer <link linkend="
-"\"usage-mail-org-filters-new\">Creating New Filter Rules</link>."
+"Click on the Add button to bring up the Add Rule window from where you can "
+"set different criteria for filtering messages. For additional information on "
+"filtering, see <link linkend=\"usage-mail-org-filters-new\">Creating New "
+"Filter Rules</link>."
 msgstr ""
-"Cliquez sur Ajouter, ce qui fera apparaître la fenêtre Ajouter une règle, "
-"dans laquelle vous pouvez définir différents critères de filtrage des "
-"messages. Pour plus d'informations, consultez <link linkend=\"usage-mail-org-"
-"filters-new\">Création de nouvelles règles de filtrage</link>."
+"Cliquez sur le bouton Ajouter, ce qui fera apparaître la fenêtre Ajouter une "
+"règle, dans laquelle vous pouvez définir différents critères de filtrage des "
+"messages. Pour plus d'informations sur le filtrage, consultez <link linkend="
+"\"usage-mail-org-filters-new\">Création de nouvelles règles de filtrage</"
+"link>."
 
-#: ../C/evolution.xml:2539(para)
+#: ../C/evolution.xml:2562(para)
 msgid ""
 "The Inbox folder on most IMAP servers cannot contain both subfolders and "
 "messages. When you create additional folders on your IMAP mail server, "
@@ -6532,7 +6555,7 @@ msgstr ""
 "trouvent dans la boîte de réception, tant que vous ne déplacez pas ces "
 "dossiers à un autre endroit."
 
-#: ../C/evolution.xml:2545(para)
+#: ../C/evolution.xml:2568(para)
 msgid ""
 "Most email clients can search the message for you, but Evolution does it "
 "differently and efficiently giving you faster search result with Quick "
@@ -6543,13 +6566,13 @@ msgstr ""
 "de recherche plus rapidement avec la Recherche rapide, la Recherche "
 "personnalisée et la Recherche avancée."
 
-#: ../C/evolution.xml:2547(title) ../C/evolution.xml:3294(title)
-#: ../C/evolution.xml:4172(title) ../C/evolution.xml:4480(title)
-#: ../C/evolution.xml:4724(title)
+#: ../C/evolution.xml:2570(title) ../C/evolution.xml:3315(title)
+#: ../C/evolution.xml:4197(title) ../C/evolution.xml:4505(title)
+#: ../C/evolution.xml:4749(title)
 msgid "Quick Search:"
 msgstr "Recherche rapide :"
 
-#: ../C/evolution.xml:2548(para)
+#: ../C/evolution.xml:2571(para)
 msgid ""
 "Quick Search displays all the messages that match the in-built criteria you "
 "selected from the drop-down list at the top left side, just above the "
@@ -6559,78 +6582,87 @@ msgstr ""
 "prédéfinis que vous sélectionnez dans le menu déroulant en haut à gauche, "
 "juste au-dessus de la liste des messages."
 
-#: ../C/evolution.xml:2550(para) ../C/evolution.xml:4175(para)
-msgid "To perform quick search, perform the following procedure:"
+#: ../C/evolution.xml:2573(para)
+msgid "To perform a quick search, perform the following procedure:"
 msgstr "Pour effectuer une recherche rapide, suivez la procédure suivante :"
 
-#: ../C/evolution.xml:2553(para)
-msgid "Click Show to expand the drop-down list."
-msgstr "Cliquez sur le menu déroulant « Afficher »."
+#: ../C/evolution.xml:2576(para) ../C/evolution.xml:2655(para)
+#: ../C/evolution.xml:3278(para) ../C/evolution.xml:3321(para)
+#: ../C/evolution.xml:4149(para) ../C/evolution.xml:4465(para)
+#: ../C/evolution.xml:4701(para)
+msgid ""
+"Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
+"stock_search.png\"/> to expand the drop-down list."
+msgstr ""
+"Cliquez sur l'icône de recherche <inlinegraphic format=\"PNG\" fileref="
+"\"figures/stock_search.png\"/> pour ouvrir la liste déroulante."
 
-#: ../C/evolution.xml:2556(para)
-msgid "Select the search criteria from the list"
+#: ../C/evolution.xml:2579(para) ../C/evolution.xml:3324(para)
+#: ../C/evolution.xml:4205(para) ../C/evolution.xml:4547(para)
+#: ../C/evolution.xml:4757(para)
+msgid "Select the search criteria from the list:"
 msgstr "Sélectionnez un critère de recherche dans la liste :"
 
-#: ../C/evolution.xml:2559(para)
+#: ../C/evolution.xml:2582(para)
 msgid "All Messages"
 msgstr "Tous les messages"
 
-#: ../C/evolution.xml:2562(para)
+#: ../C/evolution.xml:2585(para)
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../C/evolution.xml:2565(para)
+#: ../C/evolution.xml:2588(para)
 msgid "No Label"
 msgstr "Aucune étiquette"
 
-#: ../C/evolution.xml:2568(para) ../C/evolution.xml:2610(para)
+#: ../C/evolution.xml:2591(para) ../C/evolution.xml:2633(para)
 msgid "Important"
 msgstr "Important"
 
-#: ../C/evolution.xml:2571(para) ../C/evolution.xml:2613(para)
+#: ../C/evolution.xml:2594(para) ../C/evolution.xml:2636(para)
 msgid "Work"
 msgstr "Bureau"
 
-#: ../C/evolution.xml:2574(para) ../C/evolution.xml:2616(para)
-#: ../C/evolution.xml:3348(para) ../C/evolution.xml:4235(para)
-#: ../C/evolution.xml:4585(para) ../C/evolution.xml:4781(para)
-#: ../C/evolution.xml:5398(para)
+#: ../C/evolution.xml:2597(para) ../C/evolution.xml:2639(para)
+#: ../C/evolution.xml:3369(para) ../C/evolution.xml:4259(para)
+#: ../C/evolution.xml:4610(para) ../C/evolution.xml:4805(para)
+#: ../C/evolution.xml:5375(para)
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../C/evolution.xml:2577(para) ../C/evolution.xml:2619(para)
+#: ../C/evolution.xml:2600(para) ../C/evolution.xml:2642(para)
 msgid "To do"
 msgstr "À faire"
 
-#: ../C/evolution.xml:2580(para) ../C/evolution.xml:2622(para)
+#: ../C/evolution.xml:2603(para) ../C/evolution.xml:2645(para)
 msgid "Later"
 msgstr "Plus tard"
 
-#: ../C/evolution.xml:2583(para)
+#: ../C/evolution.xml:2606(para)
 msgid "Read Messages"
 msgstr "Messages lus"
 
-#: ../C/evolution.xml:2586(para)
+#: ../C/evolution.xml:2609(para)
 msgid "Recent Messages"
 msgstr "Message récents"
 
-#: ../C/evolution.xml:2589(para)
+#: ../C/evolution.xml:2612(para)
 msgid "Last 5 Days' Messages"
 msgstr "Messages des 5 derniers jours"
 
-#: ../C/evolution.xml:2592(para)
+#: ../C/evolution.xml:2615(para)
 msgid "Messages with Attachments"
 msgstr "Messages avec une pièce jointe"
 
-#: ../C/evolution.xml:2595(para)
+#: ../C/evolution.xml:2618(para)
 msgid "Important Messages"
 msgstr "Messages importants"
 
-#: ../C/evolution.xml:2598(para)
+#: ../C/evolution.xml:2621(para)
 msgid "Messages Not Junk"
 msgstr "Messages non pourriels"
 
-#: ../C/evolution.xml:2603(para)
+#: ../C/evolution.xml:2626(para)
 msgid ""
 "Evolution displays the messages matching the criteria present in the shown "
 "message list"
@@ -6638,43 +6670,35 @@ msgstr ""
 "Evolution affiche dans la liste des messages les messages correspondant au "
 "critère choisi."
 
-#: ../C/evolution.xml:2607(para)
+#: ../C/evolution.xml:2630(para)
 msgid ""
 "The following labels need not necessarily be the same as the default names "
-"listed here.You can change the name of these labels by selecting Edit &gt; "
+"listed here. You can change the name of these labels by selecting Edit &gt; "
 "Preferences &gt; Mail Preferences &gt; Colors."
 msgstr ""
-"Les libellés ci-après ne sont pas forcément identiques aux noms par défaut "
-"énumérés ici. Vous pouvez modifier les noms de ces libellés en choisissant "
+"Les étiquettes ci-après ne sont pas forcément identiques aux noms par défaut "
+"énumérés ici. Vous pouvez modifier les noms de ces étiquettes en choisissant "
 "Édition &gt; Préférences &gt; Préférences de courriel &gt; Couleurs."
 
-#: ../C/evolution.xml:2627(title) ../C/evolution.xml:3252(title)
-#: ../C/evolution.xml:4118(title) ../C/evolution.xml:4435(title)
-#: ../C/evolution.xml:4670(title)
+#: ../C/evolution.xml:2650(title) ../C/evolution.xml:3273(title)
+#: ../C/evolution.xml:4144(title) ../C/evolution.xml:4460(title)
+#: ../C/evolution.xml:4696(title)
 msgid "Customized Search:"
 msgstr "Recherche personnalisée :"
 
-#: ../C/evolution.xml:2628(para)
+#: ../C/evolution.xml:2651(para)
 msgid ""
-"Evolution allows you to perform customized search.To search for a message "
+"Evolution allows you to perform customized search. To search for a message "
 "use the following procedure:"
 msgstr ""
 "Evolution vous permet d'effectuer des recherches personnalisées. Pour "
 "rechercher un message, suivez la procédure suivante :"
 
-#: ../C/evolution.xml:2632(para)
-msgid ""
-"Click search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"stock_search.png\"/> to specify the search type."
-msgstr ""
-"Cliquez sur l'icône de recherche <inlinegraphic format=\"PNG\" fileref="
-"\"figures/stock_search.png\"/> pour spécifier le type de recherche."
-
-#: ../C/evolution.xml:2634(title)
+#: ../C/evolution.xml:2657(title)
 msgid "Subject or Sender Contain:"
 msgstr "Le sujet ou l'expéditeur contiennent :"
 
-#: ../C/evolution.xml:2635(para)
+#: ../C/evolution.xml:2658(para)
 msgid ""
 "Finds messages that contain the search text in the subject or sender. It "
 "does not search in the message body."
@@ -6682,77 +6706,80 @@ msgstr ""
 "Recherche les messages contenant le texte à rechercher dans le sujet ou "
 "l'expéditeur. Il ne recherche pas dans le corps du message."
 
-#: ../C/evolution.xml:2638(title)
+#: ../C/evolution.xml:2661(title)
 msgid "Recipients Contain:"
 msgstr "Les destinataires contiennent :"
 
-#: ../C/evolution.xml:2639(para)
+#: ../C/evolution.xml:2662(para)
 msgid "Finds messages with the search text in the To: and Cc: headers."
 msgstr ""
 "Recherche les messages contenant le texte recherché dans les en-têtes À: et "
 "Cc:."
 
-#: ../C/evolution.xml:2642(title)
+#: ../C/evolution.xml:2665(title)
 msgid "Message Contains:"
 msgstr "Le message contient :"
 
-#: ../C/evolution.xml:2643(para)
+#: ../C/evolution.xml:2666(para)
 msgid "Searches the message body and all headers for the specified text."
-msgstr "Recherche le texte spécifié dans le corps du message et tous les en-têtes."
+msgstr ""
+"Recherche le texte spécifié dans le corps du message et tous les en-têtes."
 
-#: ../C/evolution.xml:2646(title)
+#: ../C/evolution.xml:2669(title)
 msgid "Subject Contain:"
 msgstr "Le sujet contient :"
 
-#: ../C/evolution.xml:2647(para)
+#: ../C/evolution.xml:2670(para)
 msgid "Shows messages where the search text is in the subject line."
-msgstr "Recherche les messages où le texte recherché apparaît dans la ligne du sujet."
+msgstr ""
+"Recherche les messages où le texte recherché apparaît dans la ligne du sujet."
 
-#: ../C/evolution.xml:2650(title)
+#: ../C/evolution.xml:2673(title)
 msgid "Sender Contain:"
 msgstr "L'expéditeur contient :"
 
-#: ../C/evolution.xml:2651(para)
-msgid "Finds messages whose From: header contains a match for your search text."
+#: ../C/evolution.xml:2674(para)
+msgid ""
+"Finds messages whose From: header contains a match for your search text."
 msgstr "Recherche les messages où l'en-tête De: contient le texte recherché."
 
-#: ../C/evolution.xml:2654(title)
+#: ../C/evolution.xml:2677(title)
 msgid "Body Contains:"
 msgstr "Le corps contient :"
 
-#: ../C/evolution.xml:2655(para)
+#: ../C/evolution.xml:2678(para)
 msgid "Searches only in message text, not any other header."
-msgstr "Recherche uniquement dans le corps du message, et pas dans les en-têtes."
+msgstr ""
+"Recherche uniquement dans le corps du message, et pas dans les en-têtes."
 
-#: ../C/evolution.xml:2659(para)
+#: ../C/evolution.xml:2682(para)
 msgid "Click the drop-down list to select the scope"
 msgstr ""
-"Cliquez sur le menu déroulant « dans » pour définir l'étendue de la "
-"recherche."
+"Cliquez sur le menu déroulant « dans » pour définir l'étendue de la recherche."
 
-#: ../C/evolution.xml:2662(para)
+#: ../C/evolution.xml:2685(para)
 msgid "Current Folder"
 msgstr "Dossier actuel"
 
-#: ../C/evolution.xml:2665(para)
+#: ../C/evolution.xml:2688(para)
 msgid "Current Account"
 msgstr "Compte actuel"
 
-#: ../C/evolution.xml:2668(para)
+#: ../C/evolution.xml:2691(para)
 msgid "All Accounts"
 msgstr "Tous les comptes"
 
-#: ../C/evolution.xml:2671(para)
+#: ../C/evolution.xml:2694(para)
 msgid "Current Message"
 msgstr "Message actuel"
 
-#: ../C/evolution.xml:2676(para)
+#: ../C/evolution.xml:2699(para)
 msgid "Type the search string in the search entry and press Enter."
 msgstr ""
 "Saisissez le texte à rechercher dans la zone de recherche et appuyez sur "
 "« Entrée »."
 
-#: ../C/evolution.xml:2678(para)
+#: ../C/evolution.xml:2701(para)
 msgid ""
 "The folder list will be disabled while you perform search on All Accounts or "
 "Current Account."
@@ -6760,7 +6787,7 @@ msgstr ""
 "La liste des dossiers est désactivée lorsque vous effectuez une recherche "
 "dans Tous les comptes ou dans le Compte actuel."
 
-#: ../C/evolution.xml:2682(para)
+#: ../C/evolution.xml:2705(para)
 msgid ""
 "Evolution shows your search results in the message list. You might want to "
 "create a search folder instead; see <link linkend=\"usage-mail-organize-"
@@ -6771,16 +6798,18 @@ msgstr ""
 "linkend=\"usage-mail-organize-vfolders\">Utilisation des dossiers de "
 "recherche</link> pour plus de détails."
 
-#: ../C/evolution.xml:2684(para)
+#: ../C/evolution.xml:2707(para) ../C/evolution.xml:3313(para)
 msgid ""
-"To clear your search click the Clear button or menu, or enter a blank "
+"To clear your search you can click the Clear icon in the search string "
+"field, or choose Search &gt; Clear from the menubar, or enter a blank "
 "search. You can also press Shift+Ctrl+Q to clear the search."
 msgstr ""
-"Pour effacer votre recherche, cliquez sur le bouton Effacer ou choisissez "
-"Recherche &gt; Effacer ou effectuez une recherche vide. Vous pouvez aussi "
-"appuyer sur Maj+Ctrl+Q pour effacer la recherche."
+"Pour effacer votre recherche, cliquez sur l'icône Effacer dans le champ de "
+"recherche ou choisissez Recherche &gt; Effacer dans la barre de menus, ou "
+"effectuez une recherche vide. Vous pouvez aussi appuyer sur Ctrl+Maj+Q pour "
+"effacer la recherche."
 
-#: ../C/evolution.xml:2687(para)
+#: ../C/evolution.xml:2710(para)
 msgid ""
 "You can even perform a quick search on a customized search results as it "
 "just filters and displays the messages in the message list."
@@ -6789,30 +6818,34 @@ msgstr ""
 "recherche personnalisée, car la recherche rapide ne fait que filtrer "
 "l'affichage des messages dans la liste des messages."
 
-#: ../C/evolution.xml:2690(title) ../C/evolution.xml:4144(title)
-#: ../C/evolution.xml:4461(title) ../C/evolution.xml:4696(title)
+#: ../C/evolution.xml:2713(title) ../C/evolution.xml:4170(title)
+#: ../C/evolution.xml:4486(title) ../C/evolution.xml:4722(title)
 msgid "Advanced Search:"
 msgstr "Recherche avancée :"
 
-#: ../C/evolution.xml:2691(para)
-msgid "To perform advanced search,"
-msgstr "Pour effectuer une recherche avancée,"
+#: ../C/evolution.xml:2714(para) ../C/evolution.xml:4171(para)
+#: ../C/evolution.xml:4487(para) ../C/evolution.xml:4723(para)
+msgid "You can perform an advanced search based on any of the search types."
+msgstr ""
+"Vous pouvez effectuer une recherche avancée sur la base de n'importe quel "
+"type de recherche."
 
-#: ../C/evolution.xml:2695(para)
-msgid "Select Search menu"
-msgstr "Ouvrez le menu Recherche"
+#: ../C/evolution.xml:2718(para) ../C/evolution.xml:4175(para)
+#: ../C/evolution.xml:4491(para)
+msgid "Select the Search menu."
+msgstr "Ouvrez le menu Recherche."
 
-#: ../C/evolution.xml:2698(para)
-msgid "Click Advanced Search to open Advanced Search dialogue box"
+#: ../C/evolution.xml:2721(para)
+msgid "Click Advanced Search to open Advanced Search dialog box."
 msgstr ""
-"Choisissez Recherche avancée afin d'ouvrir la boîte de dialogue Recherche "
-"avancée"
+"Choisissez « Recherche avancée » afin d'ouvrir la boîte de dialogue Recherche "
+"avancée."
 
-#: ../C/evolution.xml:2703(para)
+#: ../C/evolution.xml:2726(para)
 msgid "Enter the Search name."
 msgstr "Saisissez un nom pour la recherche."
 
-#: ../C/evolution.xml:2706(para)
+#: ../C/evolution.xml:2729(para)
 msgid ""
 "Click Add to add rules. For more information on rules, refer <link linkend="
 "\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A "
@@ -6823,15 +6856,15 @@ msgstr ""
 "\">étape 4</link> de la <link linkend=\"vfolder-create\">Création d'un "
 "dossier de recherche</link>."
 
-#: ../C/evolution.xml:2712(para)
+#: ../C/evolution.xml:2735(para)
 msgid "Press Save to save your search results."
 msgstr "Cliquez sur Enregistrer pour conserver les résultats de la recherche."
 
-#: ../C/evolution.xml:2716(title)
+#: ../C/evolution.xml:2739(title)
 msgid "Save Search:"
 msgstr "Enregistrer la recherche :"
 
-#: ../C/evolution.xml:2717(para)
+#: ../C/evolution.xml:2740(para)
 msgid ""
 "To save your search results other than from advanced search, select Search "
 "&gt; Save Search. You can view the label of your search results listed under "
@@ -6841,31 +6874,31 @@ msgstr ""
 "avancée, sélectionnez Recherche &gt; Enregistrer la recherche. Vous voyez "
 "apparaître le nom de vos résultats de recherche dans le menu Recherche."
 
-#: ../C/evolution.xml:2720(title)
+#: ../C/evolution.xml:2743(title)
 msgid "Edit Saved Searches:"
 msgstr "Édition de recherches enregistrées :"
 
-#: ../C/evolution.xml:2721(para)
-msgid "To edit your saved searches"
-msgstr "Pour éditer les recherches enregistrées"
+#: ../C/evolution.xml:2744(para)
+msgid "To edit your saved searches,"
+msgstr "Pour modifier les recherches enregistrées :"
 
-#: ../C/evolution.xml:2725(para)
-msgid "Select Search"
-msgstr "Ouvrez le menu Recherche"
+#: ../C/evolution.xml:2748(para)
+msgid "Select Search from the menu bar."
+msgstr "Dans la barre de menus, ouvrez le menu Recherche."
 
-#: ../C/evolution.xml:2728(para)
-msgid "Click Edit Saved Searches to open Searches dialogue box."
+#: ../C/evolution.xml:2751(para)
+msgid "Click Edit Saved Searches to open the Searches dialog box."
 msgstr ""
-"Choisissez « Éditer les recherches enregistrées » pour ouvrir la boîte de "
-"dialogue des Recherches."
+"Choisissez « Modifier les recherches enregistrées » pour ouvrir la boîte de "
+"dialogue des recherches."
 
-#: ../C/evolution.xml:2733(para)
-msgid "Click Edit tab to edit to open Edit Rule dialogue box"
+#: ../C/evolution.xml:2756(para)
+msgid "Click the Edit button to open the Edit Rule dialog box."
 msgstr ""
 "Cliquez sur le bouton Édition pour ouvrir la boîte de dialogue Éditer la "
-"règle"
+"règle."
 
-#: ../C/evolution.xml:2734(para)
+#: ../C/evolution.xml:2757(para)
 msgid ""
 "You can also add or remove Searches from the list by using the respective "
 "buttons available at the right."
@@ -6873,11 +6906,12 @@ msgstr ""
 "Vous pouvez aussi ajouter ou enlever des Recherches dans la liste en "
 "utilisant les boutons correspondants affichés sur la droite."
 
-#: ../C/evolution.xml:2739(para)
-msgid "Edit the title or search criteria from the dialogue box."
-msgstr "Éditez le titre ou les critères de la recherche dans la boîte de dialogue."
+#: ../C/evolution.xml:2762(para)
+msgid "Edit the title or search criteria from the dialog box."
+msgstr ""
+"Modifiez le titre ou les critères de la recherche dans la boîte de dialogue."
 
-#: ../C/evolution.xml:2749(para)
+#: ../C/evolution.xml:2772(para)
 msgid ""
 "Filters work very much like the mail room in a large company. Their purpose "
 "is to bundle, sort, and distribute mail to the various folders. In addition, "
@@ -6894,29 +6928,29 @@ msgstr ""
 "message dans plusieurs dossiers, ou conserver une copie et en envoyer une à "
 "une autre personne."
 
-#: ../C/evolution.xml:2752(title)
+#: ../C/evolution.xml:2775(title)
 msgid "Creating New Filter Rules"
 msgstr "Création de règles de filtrage"
 
-#: ../C/evolution.xml:2755(para) ../C/evolution.xml:2959(para)
-#: ../C/evolution.xml:2974(para)
+#: ../C/evolution.xml:2778(para) ../C/evolution.xml:2982(para)
+#: ../C/evolution.xml:2997(para)
 msgid "Click Edit &gt; Message Filters."
 msgstr "Choisissez Éditer &gt; Filtres de message."
 
-#: ../C/evolution.xml:2758(para) ../C/evolution.xml:3009(para)
-#: ../C/evolution.xml:5014(para) ../C/evolution.xml:5642(para)
+#: ../C/evolution.xml:2781(para) ../C/evolution.xml:3032(para)
+#: ../C/evolution.xml:5038(para) ../C/evolution.xml:5619(para)
 msgid "Click Add."
 msgstr "Cliquez sur Ajouter."
 
-#: ../C/evolution.xml:2761(para)
+#: ../C/evolution.xml:2784(para)
 msgid "Type a name for the filter in the Rule name field."
 msgstr "Saisissez un nom pour le filtre dans le champ « Nom de la règle »."
 
-#: ../C/evolution.xml:2766(para)
-msgid "Define the criteria for the filter in the If section."
-msgstr "Définissez les critères du filtre dans la section des critères."
+#: ../C/evolution.xml:2789(para)
+msgid "Define the criteria for the filter in the first section."
+msgstr "Définissez les critères du filtre dans la première section."
 
-#: ../C/evolution.xml:2767(para)
+#: ../C/evolution.xml:2790(para)
 msgid ""
 "For each of the filter criteria, you must first select which parts of the "
 "message you want to filter:"
@@ -6924,81 +6958,82 @@ msgstr ""
 "Pour chaque critère de filtre, vous devez d'abord sélectionner quelle partie "
 "du message vous souhaitez filtrer :"
 
-#: ../C/evolution.xml:2769(title) ../C/evolution.xml:3019(title)
+#: ../C/evolution.xml:2792(title) ../C/evolution.xml:3042(title)
 msgid "Sender:"
 msgstr "Expéditeur :"
 
-#: ../C/evolution.xml:2770(para)
-msgid "The sender's address."
-msgstr "L'adresse de l'expéditeur."
+#: ../C/evolution.xml:2793(para)
+msgid "The sender's email address or the name of the sender."
+msgstr "L'adresse électronique de l'expéditeur ou son nom."
 
-#: ../C/evolution.xml:2773(title)
+#: ../C/evolution.xml:2796(title)
 msgid "Recipient:"
 msgstr "Destinataires :"
 
-#: ../C/evolution.xml:2774(para) ../C/evolution.xml:3024(para)
+#: ../C/evolution.xml:2797(para) ../C/evolution.xml:3047(para)
 msgid "The recipients of the message."
 msgstr "Les destinataires du message."
 
-#: ../C/evolution.xml:2777(title) ../C/evolution.xml:3027(title)
+#: ../C/evolution.xml:2800(title) ../C/evolution.xml:3050(title)
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: ../C/evolution.xml:2778(para) ../C/evolution.xml:3028(para)
+#: ../C/evolution.xml:2801(para) ../C/evolution.xml:3051(para)
 msgid "The subject line of the message."
 msgstr "La ligne sujet du message."
 
-#: ../C/evolution.xml:2781(title)
+#: ../C/evolution.xml:2804(title)
 msgid "Specific Header:"
 msgstr "En-tête spécifique :"
 
-#: ../C/evolution.xml:2782(para)
+#: ../C/evolution.xml:2805(para)
 msgid "Any header including custom ones."
 msgstr "N'importe quel en-tête, y compris les en-têtes personnalisés."
 
-#: ../C/evolution.xml:2784(para)
+#: ../C/evolution.xml:2807(para)
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
 "second time. For example, if a message declares the Resent-From: header as "
-"“engineering@example.com” and then restates it as “marketing@example.com,” "
-"Evolution filters as though the second declaration did not occur. To filter "
-"on messages that use headers multiple times, use a regular expression."
+"<quote>engineering@example.com</quote> and then restates it as "
+"<quote>marketing@example.com,</quote> Evolution filters as though the second "
+"declaration did not occur. To filter on messages that use headers multiple "
+"times, use a regular expression."
 msgstr ""
 "Si un message utilise un en-tête plus d'une fois, Evolution ne prend en "
 "compte que la première occurrence, même si le message définit l'en-tête "
 "différemment la deuxième fois. Par exemple, si un message définit l'en-tête "
-"Resent-From: comme « engineering@exemple.com », puis qu'il le redéfinit "
-"comme « marketing@example.com », Evolution applique les filtres comme si la "
+"Resent-From: comme « engineering@exemple.com », puis qu'il le redéfinit comme "
+"« marketing@example.com », Evolution applique les filtres comme si la "
 "deuxième déclaration n'existait pas. Pour filtrer sur les en-têtes "
 "redondants des messages, utilisez une expression regulière."
 
-#: ../C/evolution.xml:2786(title) ../C/evolution.xml:3031(title)
+#: ../C/evolution.xml:2809(title) ../C/evolution.xml:3054(title)
 msgid "Message Body:"
 msgstr "Corps du message :"
 
-#: ../C/evolution.xml:2787(para) ../C/evolution.xml:3032(para)
+#: ../C/evolution.xml:2810(para) ../C/evolution.xml:3055(para)
 msgid "Searches in the actual text of the message."
 msgstr "Recherche dans le texte effectif du message."
 
-#: ../C/evolution.xml:2790(title)
+#: ../C/evolution.xml:2813(title)
 msgid "Expression:"
 msgstr "Expression :"
 
-#: ../C/evolution.xml:2791(para)
+#: ../C/evolution.xml:2814(para)
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
-"in the Scheme language, used to define filters in Evolution."
+"in the Scheme language used to define filters in Evolution."
 msgstr ""
 "(uniquement pour les programmeurs) Recherche les messages selon une "
 "expression écrite en langage Scheme, utilisé pour définir les filtres dans "
 "Evolution."
 
-#: ../C/evolution.xml:2794(title) ../C/evolution.xml:3039(title)
+#: ../C/evolution.xml:2817(title) ../C/evolution.xml:3062(title)
 msgid "Date Sent:"
 msgstr "Date d'envoi :"
 
-#: ../C/evolution.xml:2795(para) ../C/evolution.xml:3040(para)
+#: ../C/evolution.xml:2818(para) ../C/evolution.xml:3063(para)
 msgid ""
 "Filters messages according to the date on which they were sent. First, "
 "choose the conditions you want a message to meet, such as before a given "
@@ -7016,11 +7051,11 @@ msgstr ""
 "demander de vérifier qu'un message soit dans un intrervalle de temps relatif "
 "au filtre, comme par exemple entre deux et quatre jours."
 
-#: ../C/evolution.xml:2798(title) ../C/evolution.xml:3043(title)
+#: ../C/evolution.xml:2821(title) ../C/evolution.xml:3066(title)
 msgid "Date Received:"
 msgstr "Date de réception :"
 
-#: ../C/evolution.xml:2799(para) ../C/evolution.xml:3044(para)
+#: ../C/evolution.xml:2822(para) ../C/evolution.xml:3067(para)
 msgid ""
 "This works the same way as the Date Sent option, except that it compares the "
 "time you received the message with the dates you specify."
@@ -7028,24 +7063,24 @@ msgstr ""
 "Cela fonctionne de la même manière qu'avec l'option Date d'envoi, sauf qu'il "
 "compare avec la date à laquelle vous avez reçu le message."
 
-#: ../C/evolution.xml:2802(title) ../C/evolution.xml:3047(title)
+#: ../C/evolution.xml:2825(title) ../C/evolution.xml:3070(title)
 msgid "Label:"
 msgstr "Étiquette :"
 
-#: ../C/evolution.xml:2803(para)
+#: ../C/evolution.xml:2826(para) ../C/evolution.xml:3071(para)
 msgid ""
 "Messages can have labels of Important, Work, Personal, To Do, or Later. You "
-"can set tables with other filters or by hand."
+"can set labels with other filters or manually."
 msgstr ""
-"Les messages peuvent avoir les étiquettes Important, Personnel, À faire ou "
-"Plus tard. Vous pouvez placer ces étiquettes avec d'autres filtres ou à la "
-"main."
+"Les messages peuvent avoir les étiquettes Important, Bureau, Personnel, À "
+"faire ou Plus tard. Vous pouvez placer ces étiquettes avec d'autres filtres "
+"ou à la main."
 
-#: ../C/evolution.xml:2806(title) ../C/evolution.xml:3051(title)
+#: ../C/evolution.xml:2829(title) ../C/evolution.xml:3074(title)
 msgid "Score:"
 msgstr "Score :"
 
-#: ../C/evolution.xml:2807(para) ../C/evolution.xml:3052(para)
+#: ../C/evolution.xml:2830(para) ../C/evolution.xml:3075(para)
 msgid ""
 "Sets the message score to any whole number greater than 0. You can have one "
 "filter set or change a message score, and then set up another filter to move "
@@ -7060,19 +7095,19 @@ msgstr ""
 "nombre que vous pouvez attribuer aux messages afin que d'autres filtres les "
 "traitent."
 
-#: ../C/evolution.xml:2810(title) ../C/evolution.xml:3055(title)
+#: ../C/evolution.xml:2833(title) ../C/evolution.xml:3078(title)
 msgid "Size:"
 msgstr "Taille :"
 
-#: ../C/evolution.xml:2811(para) ../C/evolution.xml:3056(para)
+#: ../C/evolution.xml:2834(para) ../C/evolution.xml:3079(para)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Trie selon la taille du message en kilooctets."
 
-#: ../C/evolution.xml:2814(title) ../C/evolution.xml:3059(title)
+#: ../C/evolution.xml:2837(title) ../C/evolution.xml:3082(title)
 msgid "Status:"
 msgstr "État :"
 
-#: ../C/evolution.xml:2815(para) ../C/evolution.xml:3060(para)
+#: ../C/evolution.xml:2838(para) ../C/evolution.xml:3083(para)
 msgid ""
 "Filters according to the status of a message. The status can be Replied To, "
 "Draft, Important, Read, or Junk."
@@ -7080,27 +7115,27 @@ msgstr ""
 "Filtre selon l'état d'un message. L'état peut être Répondre à, Brouillon, "
 "Important, Lu ou Pourriel."
 
-#: ../C/evolution.xml:2818(title)
+#: ../C/evolution.xml:2841(title)
 msgid "Flagged:"
 msgstr "Donner suite :"
 
-#: ../C/evolution.xml:2819(para) ../C/evolution.xml:3064(para)
+#: ../C/evolution.xml:2842(para) ../C/evolution.xml:3087(para)
 msgid "Checks whether the message is flagged for follow-up."
 msgstr "Vérifie si le message est marqué pour effectuer un suivi."
 
-#: ../C/evolution.xml:2822(title) ../C/evolution.xml:3067(title)
+#: ../C/evolution.xml:2845(title) ../C/evolution.xml:3090(title)
 msgid "Attachments:"
 msgstr "Pièces jointes :"
 
-#: ../C/evolution.xml:2823(para) ../C/evolution.xml:3068(para)
-msgid "Creates a filter based on whether there is an attachment for the e-mail."
+#: ../C/evolution.xml:2846(para) ../C/evolution.xml:3091(para)
+msgid "Creates a filter based on whether there is an attachment for the email."
 msgstr "Crée un filtre basé sur la présence d'une pièce jointe au courriel."
 
-#: ../C/evolution.xml:2826(title)
+#: ../C/evolution.xml:2849(title)
 msgid "Mailing List"
 msgstr "Liste de diffusion"
 
-#: ../C/evolution.xml:2827(para) ../C/evolution.xml:3072(para)
+#: ../C/evolution.xml:2850(para) ../C/evolution.xml:3095(para)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -7115,11 +7150,11 @@ msgstr ""
 "listes qui ne définissent pas correctement X-BeenThere ne seront pas "
 "interceptés par ces filtres."
 
-#: ../C/evolution.xml:2830(title)
+#: ../C/evolution.xml:2853(title)
 msgid "Regex Match:"
 msgstr "Correspondance Regex :"
 
-#: ../C/evolution.xml:2831(para)
+#: ../C/evolution.xml:2854(para)
 msgid ""
 "If you know your way around a <link linkend=\"regular-expression\">regex</"
 "link>, or regular expression, this option allows you to search for complex "
@@ -7131,16 +7166,16 @@ msgstr ""
 "Si vous maîtrisez une <link linkend=\"regular-expression\">regex</link> ou "
 "expression régulière, cette option vous permet de rechercher des motifs "
 "complexes de caractères afin de pouvoir trouver, par exemple, tous les mots "
-"commençant par « a » et qui finissent par « m », et qui contiennent entre 6 "
-"et quinze caractères, ou tous les messages qui déclarent deux fois un en-"
-"tête particulier. Pour des informations sur l'utilisation des expressions "
+"commençant par « a » et qui finissent par « m », et qui contiennent entre 6 et "
+"quinze caractères, ou tous les messages qui déclarent deux fois un en-tête "
+"particulier. Pour des informations sur l'utilisation des expressions "
 "régulières, consultez la page de manuel de la commande « grep »."
 
-#: ../C/evolution.xml:2834(title)
+#: ../C/evolution.xml:2857(title)
 msgid "Source Account:"
 msgstr "Compte source :"
 
-#: ../C/evolution.xml:2835(para)
+#: ../C/evolution.xml:2858(para)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
@@ -7148,11 +7183,11 @@ msgstr ""
 "Filtre les messages selon le serveur de provenance. Ce critère est utile si "
 "vous disposez de plusieurs comptes POP."
 
-#: ../C/evolution.xml:2838(title) ../C/evolution.xml:2922(title)
+#: ../C/evolution.xml:2861(title) ../C/evolution.xml:2945(title)
 msgid "Pipe to Program:"
 msgstr "Canal d'accès au programme :"
 
-#: ../C/evolution.xml:2839(para)
+#: ../C/evolution.xml:2862(para)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
@@ -7163,59 +7198,50 @@ msgstr ""
 "cet effet doivent retourner un nombre entier. L'usage le plus courant "
 "consiste à ajouter un filtre de pourriels externe."
 
-#: ../C/evolution.xml:2842(title)
+#: ../C/evolution.xml:2865(title)
 msgid "Junk Test:"
 msgstr "Test pourriel :"
 
-#: ../C/evolution.xml:2843(para)
+#: ../C/evolution.xml:2866(para)
 msgid "Filters based on the results of the junk mail test."
 msgstr "Filtre selon les résultats d'un test de pourriel."
 
-#: ../C/evolution.xml:2846(title)
+#: ../C/evolution.xml:2869(title)
 msgid "Select the Criteria for the Condition:"
 msgstr "Sélectionnez le critère correspondant à la condition :"
 
-#: ../C/evolution.xml:2847(para)
+#: ../C/evolution.xml:2870(para)
 msgid ""
-"If you want multiple criteria for this filter, click Add Criterion and "
-"repeat step 4."
+"If you want multiple criteria for this filter, click Add and repeat step 4."
 msgstr ""
 "Si vous souhaitez plusieurs critères pour ce filtre, cliquez sur Ajouter et "
 "répétez l'étape 4."
 
-#: ../C/evolution.xml:2850(title)
+#: ../C/evolution.xml:2873(title)
 msgid "Select the Actions for the Filter in the Then Section:"
 msgstr "Sélectionnez les actions du filtre dans la section « Alors » :"
 
-#: ../C/evolution.xml:2851(para)
+#: ../C/evolution.xml:2874(para)
 msgid "Select any of the following options."
 msgstr "Sélectionnez l'une des options suivantes."
 
-#: ../C/evolution.xml:2856(title)
+#: ../C/evolution.xml:2879(title)
 msgid "Move to Folder:"
 msgstr "Déplacer vers le dossier :"
 
-#: ../C/evolution.xml:2857(para)
-msgid ""
-"Moves the message into a folder you specify. Click Here to select the "
-"destination folder."
-msgstr ""
-"Déplace le message dans un dossier à définir. Cliquez sur &lt;cliquez ici "
-"pour sélectionner un dossier &gt;."
+#: ../C/evolution.xml:2880(para)
+msgid "Moves the message into a folder you specify."
+msgstr "Déplace le message dans un dossier de votre choix."
 
-#: ../C/evolution.xml:2862(title)
+#: ../C/evolution.xml:2885(title)
 msgid "Copy to Folder:"
 msgstr "Copier vers le dossier :"
 
-#: ../C/evolution.xml:2863(para)
-msgid ""
-"Puts a copy of the message into a folder you specify. Click Here to select "
-"the destination folder."
-msgstr ""
-"Place une copie du message dans un dossier à définir. Cliquez sur &lt;"
-"cliquez ici pour sélectionner un dossier &gt;."
+#: ../C/evolution.xml:2886(para)
+msgid "Puts a copy of the message into a folder you specify."
+msgstr "Place une copie du message dans un dossier à définir."
 
-#: ../C/evolution.xml:2869(para)
+#: ../C/evolution.xml:2892(para)
 msgid ""
 "Marks the message for deletion. The message can be undeleted until you "
 "expunge or empty the trash."
@@ -7223,45 +7249,48 @@ msgstr ""
 "Marque le message pour la suppression. Le message peut être récupéré tant "
 "que vous ne nettoyez pas les dossiers ou que vous ne videz pas la corbeille."
 
-#: ../C/evolution.xml:2874(title)
+#: ../C/evolution.xml:2897(title)
 msgid "Stop Processing:"
 msgstr "Arrêter le traitement :"
 
-#: ../C/evolution.xml:2875(para)
-msgid "Select this if you want to have all other filters ignore this message."
+#: ../C/evolution.xml:2898(para)
+msgid ""
+"Select this if you want to all other filters ignore this message. Note that "
+"only filters listed after this particular rule will be ignored."
 msgstr ""
 "Sélectionnez ceci si vous souhaitez que tous les autres filtres ignorent ce "
-"message."
+"message. Notez que seuls les filtres apparaissant après cette règle seront "
+"ignorés."
 
-#: ../C/evolution.xml:2880(title)
+#: ../C/evolution.xml:2903(title)
 msgid "Assign Color:"
 msgstr "Assigner une couleur :"
 
-#: ../C/evolution.xml:2881(para)
+#: ../C/evolution.xml:2904(para)
 msgid "Marks the message with a color of your choice."
 msgstr "Marque le message avec une couleur de votre choix."
 
-#: ../C/evolution.xml:2886(title)
+#: ../C/evolution.xml:2909(title)
 msgid "Assign Score:"
 msgstr "Assigner un score :"
 
-#: ../C/evolution.xml:2887(para)
+#: ../C/evolution.xml:2910(para)
 msgid "Assigns the message a numeric score."
 msgstr "Attribue un score numérique au message."
 
-#: ../C/evolution.xml:2892(title)
+#: ../C/evolution.xml:2915(title)
 msgid "Adjust Score:"
 msgstr "Ajuster le score :"
 
-#: ../C/evolution.xml:2893(para)
+#: ../C/evolution.xml:2916(para)
 msgid "Changes the numeric score by the amount you set."
 msgstr "Modifie le score numérique selon la quantité indiquée."
 
-#: ../C/evolution.xml:2898(title)
+#: ../C/evolution.xml:2921(title)
 msgid "Set Status:"
 msgstr "Définir l'état :"
 
-#: ../C/evolution.xml:2899(para)
+#: ../C/evolution.xml:2922(para)
 msgid ""
 "Sets the status of the message. The status can be Replied To, Draft, "
 "Important, Read, or Junk."
@@ -7269,11 +7298,11 @@ msgstr ""
 "Définit l'état du message. L'état peut être Répondu à, Brouillon, Important, "
 "Lu ou Pourriel."
 
-#: ../C/evolution.xml:2904(title)
+#: ../C/evolution.xml:2927(title)
 msgid "Unset Status:"
 msgstr "État non défini :"
 
-#: ../C/evolution.xml:2905(para)
+#: ../C/evolution.xml:2928(para)
 msgid ""
 "If the message has a status value, unsets it. If a status value is not set, "
 "it does nothing."
@@ -7281,26 +7310,26 @@ msgstr ""
 "Si le message possède une valeur d'état, celle-ci est supprimée. S'il n'en "
 "avait pas, l'action est neutre."
 
-#: ../C/evolution.xml:2910(title)
+#: ../C/evolution.xml:2933(title)
 msgid "Beep:"
 msgstr "Bip :"
 
-#: ../C/evolution.xml:2911(para)
+#: ../C/evolution.xml:2934(para)
 msgid "Makes the system beep."
 msgstr "Effectue un bip système."
 
-#: ../C/evolution.xml:2916(title)
+#: ../C/evolution.xml:2939(title)
 msgid "Play Sound:"
 msgstr "Jouer le son :"
 
-#: ../C/evolution.xml:2917(para)
+#: ../C/evolution.xml:2940(para)
 msgid "Select a sound file for Evolution to play."
 msgstr "Sélectionne un fichier son joué par Evolution."
 
-#: ../C/evolution.xml:2923(para)
+#: ../C/evolution.xml:2946(para)
 msgid ""
 "Sends the message to a program of your choice. No return value is expected. "
-"This feature can be used to create automatic Web postings from e-mail "
+"This feature can be used to create automatic Web postings from email "
 "messages or to perform additional message post processing not supported by "
 "Evolution."
 msgstr ""
@@ -7310,37 +7339,37 @@ msgstr ""
 "effectuer des traitements supplémentaires de message non pris en charge par "
 "Evolution."
 
-#: ../C/evolution.xml:2928(title)
+#: ../C/evolution.xml:2951(title)
 msgid "Run Program:"
 msgstr "Lancer le programme :"
 
-#: ../C/evolution.xml:2929(para)
+#: ../C/evolution.xml:2952(para)
 msgid "Evolution runs an application."
 msgstr "Evolution lance une application."
 
-#: ../C/evolution.xml:2935(para)
-msgid "Click Add Action if you need multiple actions and click OK."
+#: ../C/evolution.xml:2958(para)
+msgid "Click Add if you need multiple actions and click OK."
 msgstr ""
 "Cliquez sur Ajouter si vous souhaitez effectuer plusieurs actions, puis "
 "cliquez sur Valider."
 
-#: ../C/evolution.xml:2941(para)
+#: ../C/evolution.xml:2964(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
 msgstr ""
 "Il existe un raccourci simple pour la création rapide de filtres ou de "
 "dossiers de recherche :"
 
-#: ../C/evolution.xml:2944(para)
-msgid "Right-click the message in the e-mail list."
+#: ../C/evolution.xml:2967(para)
+msgid "Right-click the message in the message list."
 msgstr "Faites un clic droit sur le message dans la liste des courriels."
 
-#: ../C/evolution.xml:2947(para)
-msgid "Select one of the items under the Create Rule from the Message submenu."
+#: ../C/evolution.xml:2970(para)
+msgid "Select one of the items under the Create Rule From Message submenu."
 msgstr ""
 "Choisissez l'un des éléments du sous-menu « Créer une règle à partir du "
 "message »."
 
-#: ../C/evolution.xml:2948(para)
+#: ../C/evolution.xml:2971(para)
 msgid ""
 "Creating a rule based on a message opens the filter creation tool with some "
 "of the information about the message already filled in for your convenience."
@@ -7348,7 +7377,7 @@ msgstr ""
 "La création d'une règle basée sur un message ouvre l'outil de création de "
 "filtre avec une partie des informations du message pré-remplies pour vous."
 
-#: ../C/evolution.xml:2951(para)
+#: ../C/evolution.xml:2974(para)
 msgid ""
 "If you have several filters that match a single message, they are all "
 "applied to the message in order, unless one of the filters has the Stop "
@@ -7356,11 +7385,11 @@ msgid ""
 "affects are not touched by other filters."
 msgstr ""
 "Si un seul message correspond à plusieurs filtres, ceux-ci sont tous "
-"appliqués successivement, sauf si l'un d'entre eux possède l'action "
-"« Arrêter le traitement ». Si vous utilisez cette action dans un filtre, les "
-"messages qu'il traite ne sont plus affectés par les autres filtres."
+"appliqués successivement, sauf si l'un d'entre eux possède l'action « Arrêter "
+"le traitement ». Si vous utilisez cette action dans un filtre, les messages "
+"qu'il traite ne sont plus affectés par les autres filtres."
 
-#: ../C/evolution.xml:2952(para)
+#: ../C/evolution.xml:2975(para)
 msgid ""
 "When you first open the Filters dialog box, you are shown the list of "
 "filters sorted in the order in which they will be applied. You can move them "
@@ -7371,31 +7400,32 @@ msgstr ""
 "priorité en les faisant monter ou descendre dans la liste à l'aide des "
 "boutons Haut et Bas."
 
-#: ../C/evolution.xml:2956(title)
+#: ../C/evolution.xml:2979(title)
 msgid "Editing Filters"
 msgstr "Édition des filtres"
 
-#: ../C/evolution.xml:2962(para)
+#: ../C/evolution.xml:2985(para)
 msgid "Select the filter to edit, then click Edit."
 msgstr "Sélectionnez le filtre à éditer, puis cliquez sur Édition."
 
-#: ../C/evolution.xml:2965(para)
+#: ../C/evolution.xml:2988(para)
 msgid "Make the desired corrections, then click OK twice."
-msgstr "Effectuez les corrections souhaitées, puis cliquez deux fois sur Valider."
+msgstr ""
+"Effectuez les corrections souhaitées, puis cliquez deux fois sur Valider."
 
-#: ../C/evolution.xml:2971(title)
+#: ../C/evolution.xml:2994(title)
 msgid "Deleting Filters"
 msgstr "Suppression de filtres"
 
-#: ../C/evolution.xml:2977(para)
+#: ../C/evolution.xml:3000(para)
 msgid "Select the filter to remove, then click Remove."
 msgstr "Sélectionnez le filtre à supprimer, puis cliquez sur Enlever."
 
-#: ../C/evolution.xml:2988(para)
+#: ../C/evolution.xml:3011(para)
 msgid ""
 "If filters aren't flexible enough, or you find yourself performing the same "
 "search again and again, consider a search folder. Search folders are an "
-"advanced way of viewing your e-mail messages within Evolution. If you get a "
+"advanced way of viewing your email messages within Evolution. If you get a "
 "lot of mail or often forget where you put messages, search folders can help "
 "you keep things organized."
 msgstr ""
@@ -7407,7 +7437,7 @@ msgstr ""
 "dossiers de recherche peuvent vous aider à conserver de l'ordre dans vos "
 "affaires."
 
-#: ../C/evolution.xml:2989(para)
+#: ../C/evolution.xml:3012(para)
 msgid ""
 "A search folder is really a hybrid of all the other organizational tools: it "
 "looks like a folder, it acts like a search, and you set it up like a filter. "
@@ -7424,7 +7454,7 @@ msgstr ""
 "Les messages qu'il contient sont définis à la volée par un ensemble de "
 "critères choisis à l'avance."
 
-#: ../C/evolution.xml:2990(para)
+#: ../C/evolution.xml:3013(para)
 msgid ""
 "As messages that meet the search folder criteria arrive or are deleted, "
 "Evolution automatically adjusts the search folder contents. When you delete "
@@ -7437,7 +7467,7 @@ msgstr ""
 "dossier auquel il appartient, ainsi que de tout dossier de recherche dans "
 "lequel il apparaissait."
 
-#: ../C/evolution.xml:2991(para)
+#: ../C/evolution.xml:3014(para)
 msgid ""
 "The Unmatched Search Folder is the opposite of other search folders: it "
 "displays all messages that do not appear in other search folders."
@@ -7446,9 +7476,9 @@ msgstr ""
 "recherche. Il affiche tous les messages qui n'apparaissent dans aucun autre "
 "dossier de recherche."
 
-#: ../C/evolution.xml:2992(para)
+#: ../C/evolution.xml:3015(para)
 msgid ""
-"If you use remote e-mail storage like IMAP or Microsoft Exchange, and have "
+"If you use remote email storage like IMAP or Microsoft Exchange, and have "
 "created search folders to search through them, the Unmatched Search Folder "
 "also searches the remote folders. If you do not create any search folders "
 "that search remote mail stores, the Unmatched Search Folder does not search "
@@ -7461,17 +7491,18 @@ msgstr ""
 "de stockage distants, le dossier de recherche Autres courriels ne les "
 "recherche pas non plus."
 
-#: ../C/evolution.xml:2993(para)
+#: ../C/evolution.xml:3016(para)
 msgid ""
 "As an example of using folders, searches, and search folders, consider the "
-"following: To organize his mailbox, Jim sets up a search folder for e-mail "
+"following: To organize his mailbox, Jim sets up a search folder for email "
 "from his friend and co-worker Anna. He has another search folder for "
 "messages that have novell.com in the address and Evolution in the subject "
 "line, so he can keep a record of what people from work send him about "
 "Evolution. If Anna sends him a message about anything other than Evolution, "
-"it only shows up in the “Anna” search folder. When Anna sends him mail about "
-"the user interface for Evolution, he can see the message both in the “Anna” "
-"search folder and in the “Internal Evolution Discussion” search folder."
+"it only shows up in the <quote>Anna</quote> search folder. When Anna sends "
+"him mail about the user interface for Evolution, he can see the message both "
+"in the <quote>Anna</quote> search folder and in the <quote>Internal "
+"Evolution Discussion</quote> search folder."
 msgstr ""
 "Pour illustrer l'utilisation des dossiers, des recherches et des dossiers de "
 "recherche, considérez l'exemple suivant : pour organiser sa boîte aux "
@@ -7483,14 +7514,14 @@ msgstr ""
 "sujet qu'Evolution, il n'apparaîtra que dans le dossier de recherche "
 "« Anna ». Si Anna lui envoie un message au sujet de l'interface utilisateur "
 "d'Evolution, il verra apparaître le message à la fois dans le dossier de "
-"recherche « Anna » et dans le dossier de recherche « Discussions internes "
-"sur Evolution »."
+"recherche « Anna » et dans le dossier de recherche « Discussions internes sur "
+"Evolution »."
 
-#: ../C/evolution.xml:2996(title)
+#: ../C/evolution.xml:3019(title)
 msgid "Creating A Search Folder"
 msgstr "Création d'un dossier de recherche"
 
-#: ../C/evolution.xml:2999(para)
+#: ../C/evolution.xml:3022(para)
 msgid ""
 "Click Message &gt; Create Rule, then select a search folder based on "
 "Subject, Sender, Recipient, or Mailing List."
@@ -7499,13 +7530,13 @@ msgstr ""
 "recherche basé sur le sujet, l'expéditeur, les destinataires ou la liste de "
 "diffusion."
 
-#: ../C/evolution.xml:3001(para)
+#: ../C/evolution.xml:3024(para)
 msgid "Select Search menu &gt; Create Search Folder From Search."
 msgstr ""
 "Dans le menu Recherche, choisissez Créer un dossier de recherche à partir "
 "d'une recherche."
 
-#: ../C/evolution.xml:3003(para)
+#: ../C/evolution.xml:3026(para)
 msgid ""
 "Perform this operation from the search results. Create a search folder from "
 "search is enabled only when you already have performed a search."
@@ -7514,15 +7545,16 @@ msgstr ""
 "création d'un dossier de recherche à partir d'une recherche n'est activée "
 "que si vous avez déjà effectué une recherche."
 
-#: ../C/evolution.xml:3006(para)
+#: ../C/evolution.xml:3029(para)
 msgid "Select Edit &gt; Search Folder"
 msgstr "Choisissez Édition &gt; Dossier de recherche"
 
-#: ../C/evolution.xml:3014(para)
+#: ../C/evolution.xml:3037(para)
 msgid "Type the name of the search folder in the Search name field."
-msgstr "Saisissez le nom du dossier de recherche dans le champ Nom de la recherche."
+msgstr ""
+"Saisissez le nom du dossier de recherche dans le champ Nom de la recherche."
 
-#: ../C/evolution.xml:3017(para)
+#: ../C/evolution.xml:3040(para)
 msgid ""
 "Select your search criteria. For each criterion, you must first select which "
 "of the following parts of the message you want the search to examine. The "
@@ -7532,19 +7564,19 @@ msgstr ""
 "d'abord sélectionner quelle partie du message la recherche doit examiner. "
 "Les critères sont quasiment identiques à ceux des filtres."
 
-#: ../C/evolution.xml:3020(para)
+#: ../C/evolution.xml:3043(para)
 msgid "Sender's address."
 msgstr "Adresse de l'expéditeur."
 
-#: ../C/evolution.xml:3023(title)
+#: ../C/evolution.xml:3046(title)
 msgid "Recipients:"
 msgstr "Destinataires :"
 
-#: ../C/evolution.xml:3035(title)
-msgid "Expression:(For programmers only)"
+#: ../C/evolution.xml:3058(title)
+msgid "Expression (For programmers only):"
 msgstr "Expression (uniquement pour les programmeurs) :"
 
-#: ../C/evolution.xml:3036(para)
+#: ../C/evolution.xml:3059(para)
 msgid ""
 "Match a message according to an expression you write in the Scheme language "
 "used to define filters in Evolution."
@@ -7552,42 +7584,34 @@ msgstr ""
 "Recherche les messages selon une expression écrite en langage Scheme, "
 "utilisé pour définir les filtres dans Evolution."
 
-#: ../C/evolution.xml:3048(para)
-msgid ""
-"Messages can have labels of Important, Work, Personal, To Do, or Later. You "
-"can set labels with other filters or manually."
-msgstr ""
-"Les messages peuvent avoir les étiquettes Important, Bureau, Personnel, À "
-"faire ou Plus tard. Vous pouvez placer ces étiquettes avec d'autres filtres "
-"ou à la main."
-
-#: ../C/evolution.xml:3063(title)
+#: ../C/evolution.xml:3086(title)
 msgid "Follow Up:"
 msgstr "Donner suite :"
 
-#: ../C/evolution.xml:3071(title)
+#: ../C/evolution.xml:3094(title)
 msgid "Mailing List:"
 msgstr "Liste de diffusion :"
 
-#: ../C/evolution.xml:3075(title)
+#: ../C/evolution.xml:3098(title)
 msgid "Match all:"
 msgstr "Vérifie tout :"
 
-#: ../C/evolution.xml:3076(para)
+#: ../C/evolution.xml:3099(para)
 msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Vérifie si le message correspond à tous les critères de la liste."
 
-#: ../C/evolution.xml:3080(para)
-msgid "Select the folders where this search folder will search. Your options are:"
+#: ../C/evolution.xml:3103(para)
+msgid ""
+"Select which folders will be used for the search folder. Your options are:"
 msgstr ""
 "Sélectionnez les dossiers dans lesquels ce dossier de recherche va "
 "rechercher. Les options sont :"
 
-#: ../C/evolution.xml:3082(title)
+#: ../C/evolution.xml:3105(title)
 msgid "All local folders:"
 msgstr "Tous les dossiers locaux :"
 
-#: ../C/evolution.xml:3083(para)
+#: ../C/evolution.xml:3106(para)
 msgid ""
 "Uses all local folders for the search folder source in addition to "
 "individual folders that are selected."
@@ -7595,11 +7619,11 @@ msgstr ""
 "Utilise tous les dossiers locaux comme source pour le dossier de recherche, "
 "en plus des dossiers individuels sélectionnés."
 
-#: ../C/evolution.xml:3086(title)
+#: ../C/evolution.xml:3109(title)
 msgid "All active remote folders:"
 msgstr "Tous les dossiers distants actifs :"
 
-#: ../C/evolution.xml:3087(para)
+#: ../C/evolution.xml:3110(para)
 msgid ""
 "Remote folders are considered active if you are connected to the server; you "
 "must be connected to your mail server for the search folder to include any "
@@ -7611,11 +7635,11 @@ msgstr ""
 "dossier de recherche inclue tout message de cette source, en plus des "
 "dossiers individuels sélectionnés."
 
-#: ../C/evolution.xml:3090(title)
+#: ../C/evolution.xml:3113(title)
 msgid "All local and active remote folders:"
 msgstr "Tous les dossiers locaux et distants actifs :"
 
-#: ../C/evolution.xml:3091(para)
+#: ../C/evolution.xml:3114(para)
 msgid ""
 "Uses all local and active remote folders for the search folder source in "
 "addition to individual folders that are selected."
@@ -7623,27 +7647,28 @@ msgstr ""
 "Utilise tous les dossiers locaux et distants actifs comme source du dossier "
 "de recherche, en plus des dossiers individuels sélectionnés."
 
-#: ../C/evolution.xml:3094(title)
+#: ../C/evolution.xml:3117(title)
 msgid "Specific folders only:"
 msgstr "Uniquement les dossiers spécifiques :"
 
-#: ../C/evolution.xml:3095(para)
+#: ../C/evolution.xml:3118(para)
 msgid "Uses individual folders for the search folder source."
 msgstr "Utilise des dossiers individuels comme source du dossier de recherche."
 
-#: ../C/evolution.xml:3097(para)
+#: ../C/evolution.xml:3120(para)
 msgid "If you select Specific folders only,"
 msgstr "Si vous sélectionnez «Uniquement les dossiers spécifiques »,"
 
-#: ../C/evolution.xml:3100(para)
+#: ../C/evolution.xml:3123(para)
 msgid "click Add button to open the Select folder window."
-msgstr "cliquez sur le bouton Ajouter pour ouvrir la fenêtre de sélection de dossier."
+msgstr ""
+"cliquez sur le bouton Ajouter pour ouvrir la fenêtre de sélection de dossier."
 
-#: ../C/evolution.xml:3107(para)
+#: ../C/evolution.xml:3130(para)
 msgid "Select the folder and press Add button."
 msgstr "Sélectionnez le dossier et cliquez sur le bouton Ajouter."
 
-#: ../C/evolution.xml:3110(para)
+#: ../C/evolution.xml:3133(para)
 msgid ""
 "You can view the folder added to the list in the entry box at the bottom of "
 "the New Search Folder window."
@@ -7651,26 +7676,26 @@ msgstr ""
 "Vous pouvez voir le dossier ajouté à la liste de la zone de saisie au bas de "
 "la fenêtre « Nouveau dossier de recherche »."
 
-#: ../C/evolution.xml:3121(para)
+#: ../C/evolution.xml:3144(para)
 msgid ""
-"Evolution can check for junk mail for you. Evolution uses SpamAssassin* and/ "
-"or Bogofilter* with trainable Bayesian filters to perform the spam check. "
+"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
+"or Bogofilter with trainable Bayesian filters to perform the spam check. "
 "When the software detects mail that appears to be junk mail, it will flag it "
 "and hide it from your view. Messages that are flagged as junk mail are "
 "displayed only in the Junk folder."
 msgstr ""
 "Evolution peut vérifier le pourriel à votre place. Pour cela, il utilise "
-"SpamAssassin* et/ou Bogofilter* avec des filtres bayésiens intelligents. "
+"SpamAssassin et/ou Bogofilter avec des filtres bayésiens intelligents. "
 "Lorsque le logiciel détecte un message qui lui semble du pourriel, il le "
 "marque et le masque. Les message marqués comme pourriel apparaissent "
 "uniquement dans le dossier Pourriels."
 
-#: ../C/evolution.xml:3122(para)
+#: ../C/evolution.xml:3145(para)
 msgid ""
 "The junk mail filter can learn which kinds of mail are legitimate and which "
 "are not if you train it. When you first start using junk mail blocking, "
 "check the Junk folder to be sure that legitimate mail doesn't get flagged as "
-"junk mail. If good mail, is incorrectly flagged, remove it from the Junk "
+"junk mail. If good mail is incorrectly flagged, remove it from the Junk "
 "folder by right-clicking it and selecting Mark as Not Junk or press Shift"
 "+Ctrl+J. If Evolution misses junk mail, right-click the message, then click "
 "Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize "
@@ -7688,7 +7713,7 @@ msgstr ""
 "reconnaître les messages semblables à l'avenir, et devenir de plus en plus "
 "performant avec le temps."
 
-#: ../C/evolution.xml:3123(para)
+#: ../C/evolution.xml:3146(para)
 msgid ""
 "Every filter needs to learn at the least 100 spam and 100 ham to start "
 "working. For that, you must mark each message manually by clicking the "
@@ -7702,18 +7727,23 @@ msgstr ""
 "légitimes. Le bouton <emphasis>Pourriel</emphasis> signifie au filtre que le "
 "message est un pourriel."
 
-#: ../C/evolution.xml:3124(para)
+#: ../C/evolution.xml:3147(para)
 msgid ""
 "To change your junk mail filtering preferences, click Edit &gt; Preferences, "
-"then click Mail Preferences. For more information on this see, <link linkend="
-"\"mail-prefs-junk\">Junk Mail Preferences</link>."
+"then click Mail Preferences."
 msgstr ""
 "Pour modifier les préférences de filtrage du pourriel, choisissez Édition "
-"&gt; Préférences, puis cliquez sur Préférences du courriel. Pour plus "
-"d'informations à ce sujet, consultez <link linkend=\"mail-prefs-junk"
-"\">Préférences de pourriel</link>."
+"&gt; Préférences, puis cliquez sur Préférences du courriel."
+
+#: ../C/evolution.xml:3148(para) ../C/evolution.xml:5672(para)
+msgid ""
+"For additional information on junk content, see <link linkend=\"mail-prefs-"
+"junk\">Junk Mail Preferences</link>."
+msgstr ""
+"Pour plus d'informations sur le contenu indésirable, consultez les <link "
+"linkend=\"mail-prefs-junk\">Préférences du pourriel</link>."
 
-#: ../C/evolution.xml:3125(para)
+#: ../C/evolution.xml:3149(para)
 msgid ""
 "For additional junk mail settings, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -7722,86 +7752,86 @@ msgstr ""
 "consultez <link linkend=\"more-mail-options\">Options de réception du "
 "courriel</link>."
 
-#: ../C/evolution.xml:3127(para)
+#: ../C/evolution.xml:3151(para)
 msgid ""
-"SpamAssassin* is an application that scan through the mail box to find junk "
-"mails. Evolution uses SpamAssassin as the default spam-filtering "
-"application. For more information, see<ulink url=\"http://spamassassin."
-"apache.org/\"> The Apache SpamAssassin Project</ulink>."
+"SpamAssassin is an application that scan through the mail box to find junk "
+"mail. Evolution uses SpamAssassin as the default spam-filtering application. "
+"For more information, see<ulink url=\"http://spamassassin.apache.org/\"> The "
+"Apache SpamAssassin Project</ulink>."
 msgstr ""
-"SpamAssasin* est une application qui analyse les boîtes de messagerie pour "
+"SpamAssasin est une application qui analyse les boîtes de messagerie pour "
 "identifier les pourriels. Evolution utilise SpamAssassin comme application "
 "de filtrage de pourriel par défaut. Pour plus d'informations, visitez le "
 "site du <ulink url=\"http://spamassassin.apache.org/\">projet Apache "
 "SpamAssassin</ulink>."
 
-#: ../C/evolution.xml:3128(para)
+#: ../C/evolution.xml:3152(para)
 msgid ""
-"Bogofilter* is a mail filter that classifies mail as spam or ham (non-spam) "
+"Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) "
 "by a statistical analysis of the message's header and content (body). It is "
 "able to learn from the user's classifications and corrections. For more "
 "information on Bogofilter, see <ulink url=\"http://bogofilter.sourceforge."
 "net/\">The Bogofilter site</ulink>."
 msgstr ""
-"Bogofilter* est un filtre de messages qui classe les messages en pourriel et "
+"Bogofilter est un filtre de messages qui classe les messages en pourriel et "
 "non pourriel en procédant par analyse statistique de l'en-tête et du contenu "
 "des messages. Il est capable d'apprendre en fonction des indications des "
 "utilisateurs. Pour plus d'informations sur Bogofilter, consultez le <ulink "
 "url=\"http://bogofilter.sourceforge.net/\">site de Bogofilter</ulink>."
 
-#: ../C/evolution.xml:3135(para)
+#: ../C/evolution.xml:3159(para)
 msgid ""
-"This section shows you how to use the Evolution™ contacts tool to organize "
-"any amount of contact information, share addresses over a network, and save "
-"time with everyday tasks."
+"This section shows you how to use the <trademark>Evolution</trademark> "
+"contacts tool to organize any amount of contact information, share addresses "
+"over a network, and save time with everyday tasks."
 msgstr ""
 "Cette section explique comment utiliser le composant « Contacts » "
-"d'Evolution&trade; pour organiser vos informations de contact, partager des "
-"adresses sur un réseau et gagner du temps dans vos tâches quotidiennes."
+"d'<trademark>Evolution</trademark> pour organiser vos informations de "
+"contact, partager des adresses sur un réseau et gagner du temps dans vos "
+"tâches quotidiennes."
 
-#: ../C/evolution.xml:3138(link) ../C/evolution.xml:3155(title)
+#: ../C/evolution.xml:3162(link) ../C/evolution.xml:3179(title)
 msgid "Contacts and Cards"
 msgstr "Contacts et cartes"
 
-#: ../C/evolution.xml:3141(link) ../C/evolution.xml:3250(title)
+#: ../C/evolution.xml:3165(link) ../C/evolution.xml:3271(title)
 msgid "Searching for Contacts"
 msgstr "Recherche de contacts"
 
-#: ../C/evolution.xml:3144(link) ../C/evolution.xml:3401(title)
+#: ../C/evolution.xml:3168(link) ../C/evolution.xml:3422(title)
 msgid "Organizing your Contacts"
 msgstr "Organisation des contacts"
 
-#: ../C/evolution.xml:3147(link) ../C/evolution.xml:3517(title)
+#: ../C/evolution.xml:3171(link) ../C/evolution.xml:3538(title)
 msgid "LDAP: Shared Address Books on a Network"
 msgstr "LDAP : Carnets d'adresses partagés sur un réseau"
 
-#: ../C/evolution.xml:3150(link) ../C/evolution.xml:3540(title)
+#: ../C/evolution.xml:3174(link) ../C/evolution.xml:3561(title)
 msgid "Send Me a Card: Adding New Cards Quickly"
 msgstr "Envoie-moi une carte : l'ajout rapide de nouvelles cartes"
 
-#: ../C/evolution.xml:3156(para)
+#: ../C/evolution.xml:3180(para)
 msgid ""
 "Contacts are the individuals you have chosen to add to your address book so "
-"you can keep track of information about them and send e-mail to them. In "
-"Evolution, an individual contact is called a card.For more information on "
-"organizing your contact list see <link linkend=\"usage-contact-organize"
+"you can keep track of information about them and send email to them. In "
+"Evolution, an individual contact is called a card. For more information on "
+"organizing your contacts see <link linkend=\"usage-contact-organize"
 "\">Organizing your Contacts</link>. To learn about configuring the contacts "
 "tool, refer <link linkend=\"config-prefs-contact\">Contact Management</link>."
 msgstr ""
 "Les contacts sont des individus que vous choisissez d'ajouter dans votre "
 "carnet d'adresses afin de pouvoir conserver des informations à leur sujet et "
 "de pouvoir leur envoyer des courriels. Dans Evolution, un contact individuel "
-"est appelé une carte. Pour plus d'informations sur l'organisation de la "
-"liste des contacts, consultez <link linkend=\"usage-contact-organize"
-"\">Organisation des contacts</link>. Pour apprendre comment configurer "
-"l'outil « Contacts », consultez <link linkend=\"config-prefs-contact"
-"\">Gestion des contacts</link>."
+"est appelé une carte. Pour plus d'informations sur l'organisation des "
+"contacts, consultez <link linkend=\"usage-contact-organize\">Organisation "
+"des contacts</link>. Pour apprendre comment configurer l'outil « Contacts », "
+"consultez <link linkend=\"config-prefs-contact\">Gestion des contacts</link>."
 
-#: ../C/evolution.xml:3159(title)
+#: ../C/evolution.xml:3183(title)
 msgid "The Contact Editor"
 msgstr "L'éditeur de contact"
 
-#: ../C/evolution.xml:3160(para)
+#: ../C/evolution.xml:3184(para)
 msgid ""
 "If you want to add or change cards, use the contact editor. You can edit "
 "email address, telephone numbers, mailer addresses and all other contact "
@@ -7812,23 +7842,23 @@ msgstr ""
 "téléphone, les adresses postales et toutes les autres informations de "
 "contact saisies pour un contact particulier."
 
-#: ../C/evolution.xml:3161(para)
+#: ../C/evolution.xml:3185(para)
 msgid "The contact editor window has three tabs:"
 msgstr "La fenêtre de l'éditeur de contact présente trois onglets :"
 
-#: ../C/evolution.xml:3163(title)
-msgid "Contacts:"
+#: ../C/evolution.xml:3187(title)
+msgid "Contact:"
 msgstr "Contact :"
 
-#: ../C/evolution.xml:3164(para)
+#: ../C/evolution.xml:3188(para)
 msgid "Contains basic contact information."
 msgstr "Contient les informations de base du contact."
 
-#: ../C/evolution.xml:3167(title)
+#: ../C/evolution.xml:3191(title)
 msgid "Personal Information:"
 msgstr "Informations personnelles :"
 
-#: ../C/evolution.xml:3168(para)
+#: ../C/evolution.xml:3192(para)
 msgid ""
 "Contains a more specific description of the person, including URLs for "
 "calendar and free/busy information."
@@ -7836,46 +7866,37 @@ msgstr ""
 "Contient une description plus spécifique de la personne, y compris des URL "
 "pour les informations de calendrier et de disponibilité."
 
-#: ../C/evolution.xml:3171(title)
+#: ../C/evolution.xml:3195(title)
 msgid "Mailing Address:"
 msgstr "Adresse postale :"
 
-#: ../C/evolution.xml:3172(para)
+#: ../C/evolution.xml:3196(para)
 msgid "Contains the individual's mailing address."
 msgstr "Contient l'adresse postale de la personne."
 
-#: ../C/evolution.xml:3174(para)
+#: ../C/evolution.xml:3198(para)
 msgid ""
 "You can also use Action Menu to find Forward Contact, which opens a new "
 "message with the card already attached, and Send Message to Contact, which "
-"opens a new message to the contact's e-mail address."
+"opens a new message to the contact's email address."
 msgstr ""
 "Vous pouvez aussi utiliser le menu Actions pour y trouver « Faire suivre le "
 "contact », ce qui crée un nouveau message contenant la carte en pièce "
 "jointe, et « Envoyer un message au contact », ce qui crée un nouveau message "
 "à destination de l'adresse électronique du contact."
 
-#: ../C/evolution.xml:3175(para)
-msgid ""
-"From the Contact Editor toolbar, you can save and close, print, close, or "
-"delete the contact."
-msgstr ""
-"À partir de la barre d'outils des contacts, vous pouvez enregistrer, fermer, "
-"imprimer ou supprimer un contact."
-
-#: ../C/evolution.xml:3176(para)
+#: ../C/evolution.xml:3199(para)
 msgid ""
-"You can add card from within an e-mail message or calendar appointment. In "
-"an open e-mail, right-click any e-mail address or message, and click Add to "
+"You can add a card from within an email message or calendar appointment. In "
+"an open email, right-click any email address or message, and click Add to "
 "Address Book or select Add Sender to Address Book from the Message menu."
 msgstr ""
 "Vous pouvez ajouter une carte depuis un courriel ou un rendez-vous du "
 "calendrier. Dans un courriel ouvert, faites un clic droit sur une adresse "
 "électronique et choisissez « Ajouter dans le carnet d'adresses » ou "
-"choisissez « Ajouter l'expéditeur au carnet d'adresses » dans le menu "
-"Message."
+"choisissez « Ajouter l'expéditeur au carnet d'adresses » dans le menu Message."
 
-#: ../C/evolution.xml:3177(para)
+#: ../C/evolution.xml:3200(para)
 msgid ""
 "Most of the items in the contact editor simply display the information you "
 "enter, but some of them have additional features:"
@@ -7884,46 +7905,46 @@ msgstr ""
 "informations que vous avez saisies, mais certains d'entre eux offrent des "
 "fonctionnalités supplémentaires :"
 
-#: ../C/evolution.xml:3179(title)
+#: ../C/evolution.xml:3202(title)
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: ../C/evolution.xml:3180(para)
+#: ../C/evolution.xml:3203(para)
 msgid ""
 "Specify the name of your contact here. You can type a name into the Full "
 "Name field, but you can also click the Full Name button to bring up a small "
-"dialog box with text boxes for first and last names, titles like “Mr.” or "
-"“Her Excellency,” and suffixes like “Jr.” The Full Name field also interacts "
-"with the File Under box to help you organize your contacts and to handle "
-"multi-word surnames.To see how it works, type a name in the Full Name field. "
-"As an example, we'll use Miguel de Icaza. You'll notice that the File Under "
-"field also fills in, but in reverse: Icaza, Miguel de. If you had entered "
-"John Q. Doe, the contacts editor would have correctly guessed that the entry "
-"should be filed under “Doe, John Q.” However, Miguel's surname, “de Icaza”, "
-"has two words, and to sort it correctly you must enter de Icaza, Miguel in "
-"the File As entry."
+"dialog box with text boxes for first and last names, titles like <quote>Mr.</"
+"quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</"
+"quote> The Full Name field also interacts with the File Under box to help "
+"you organize your contacts and to handle multi-word surnames. To see how it "
+"works, type a name in the Full Name field. As an example, we will use Miguel "
+"de Icaza. You will notice that the File Under field also fills in, but in "
+"reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts "
+"editor would have correctly guessed that the entry should be filed under "
+"<quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</"
+"quote> has two words, and to sort it correctly you must enter de Icaza, "
+"Miguel in the File As entry."
 msgstr ""
 "Indiquez ici le nom du contact. Vous pouvez saisir un nom dans ce champ, "
 "mais vous pouvez également cliquer sur le bouton Nom complet afin de faire "
 "apparaître une petite boîte de dialogue présentant des zones de saisies pour "
-"le prénom, le nom de famille, un titre comme « M. » ou « Son Excellence », "
-"et des suffixes comme « Jr. ». Le champ du nom complet interagit aussi avec "
-"le menu déroulant « Classer sous » pour vous aider à organiser les contacts "
-"et pour gérer les noms de famille composés. Pour comprendre ce "
-"fonctionnement, saisissez un nom dans la champ Nom complet. Par exemple, "
-"utilisons « Miguel de Icaza ». Vous pouvez remarquer que le champ « Classer "
-"sous » se remplit aussi, mais dans l'ordre inverse : Icaza, Miguel de. Si "
-"vous aviez saisi Jean T. Dupond, l'éditeur de contact aurait compris que "
-"cette saisie devait être classée comme « Dupond, Jean T. ». Cependant, le "
-"nom de famille de Miguel, « de Icaza », comporte deux mots. Pour qu'il soit "
-"trié correctement, vous devez choisir « de Icaza, Miguel » dans le champ "
-"Classer sous."
-
-#: ../C/evolution.xml:3183(title)
+"le prénom, le nom de famille, un titre comme « M. » ou « Son Excellence », et "
+"des suffixes comme « Jr. ». Le champ du nom complet interagit aussi avec le "
+"menu déroulant « Classer sous » pour vous aider à organiser les contacts et "
+"pour gérer les noms de famille composés. Pour comprendre ce fonctionnement, "
+"saisissez un nom dans la champ Nom complet. Par exemple, utilisons « Miguel "
+"de Icaza ». Vous pouvez remarquer que le champ « Classer sous » se remplit "
+"aussi, mais dans l'ordre inverse : Icaza, Miguel de. Si vous aviez saisi "
+"Jean T. Dupond, l'éditeur de contact aurait compris que cette saisie devait "
+"être classée comme « Dupond, Jean T. ». Cependant, le nom de famille de "
+"Miguel, « de Icaza », comporte deux mots. Pour qu'il soit trié correctement, "
+"vous devez choisir « de Icaza, Miguel » dans le champ Classer sous."
+
+#: ../C/evolution.xml:3206(title)
 msgid "Where:"
 msgstr "Où :"
 
-#: ../C/evolution.xml:3184(para)
+#: ../C/evolution.xml:3207(para)
 msgid ""
 "Select one of your address books as the location for this contact. You might "
 "not be able to write to all available address books, especially those on a "
@@ -7933,11 +7954,11 @@ msgstr ""
 "contact. Il est possible que vous ne puissiez pas modifier certains carnets "
 "d'adresses, particulièrement ceux qui se trouvent sur un réseau."
 
-#: ../C/evolution.xml:3187(title)
+#: ../C/evolution.xml:3210(title)
 msgid "Categories:"
 msgstr "Catégories :"
 
-#: ../C/evolution.xml:3188(para)
+#: ../C/evolution.xml:3211(para)
 msgid ""
 "Click the Categories button to select categories for this card. If you "
 "assign contact categories, you can then search for contacts using those "
@@ -7950,11 +7971,11 @@ msgstr ""
 "sur les catégories de contacts, consultez <link linkend=\"usage-contact-"
 "organize\">Organisation des contacts</link>."
 
-#: ../C/evolution.xml:3191(title)
+#: ../C/evolution.xml:3214(title)
 msgid "Free/Busy and Calendar URLs:"
 msgstr "URL de calendrier et de disponibilité :"
 
-#: ../C/evolution.xml:3192(para)
+#: ../C/evolution.xml:3215(para)
 msgid ""
 "Click the Personal Information tab to enter Web addresses for the contact. "
 "If the contact publishes Free/Busy or calendar data online, using a server "
@@ -7969,79 +7990,69 @@ msgstr ""
 "Après cela, vous pouvez vérifier leurs agendas lorsque vous créez des rendez-"
 "vous dans un calendrier."
 
-#: ../C/evolution.xml:3197(title)
+#: ../C/evolution.xml:3220(title)
 msgid "Creating and Editing Contacts"
 msgstr "Création et édition de contacts"
 
-#: ../C/evolution.xml:3198(para)
+#: ../C/evolution.xml:3221(para)
 msgid "Follow the steps given below to create a new card."
 msgstr "Suivez les étapes ci-dessous pour créer une nouvelle carte."
 
-#: ../C/evolution.xml:3201(para)
-msgid "Click the down arrow key next to the New button in the toolbar"
-msgstr "Cliquez sur la flèche bas à côté du bouton Nouveau dans la barre d'outils."
+#: ../C/evolution.xml:3224(para)
+msgid "Click File &gt; New &gt; Contact."
+msgstr "Choisissez Fichier &gt; Nouveau &gt; Contact."
 
-#: ../C/evolution.xml:3204(para)
-msgid ""
-"Select Contacts from the drop-down list or press Shift+Ctrl+C to appear "
-"Contact Editor."
-msgstr ""
-"Choisissez Contacts dans la liste déroulante ou appuyez sur Maj+Ctrl+C pour "
-"faire apparaître l'éditeur de contact."
-
-#: ../C/evolution.xml:3207(para)
+#: ../C/evolution.xml:3227(para)
 msgid "Enter the contact information to the entry boxes provided."
 msgstr ""
 "Saisissez les informations du contact dans les zones de saisies à "
 "disposition."
 
-#: ../C/evolution.xml:3213(para)
+#: ../C/evolution.xml:3233(para)
 msgid "If you want to change a card that already exists,"
 msgstr "Si vous souhaitez modifier une carte existante, "
 
-#: ../C/evolution.xml:3216(para)
-msgid "Press Contact tool from the Switcher to appear the Contact list."
+#: ../C/evolution.xml:3236(para)
+msgid ""
+"Go to the Contacts window by selecting View &gt; Window &gt; Contacts from "
+"the menubar."
 msgstr ""
-"Choisissez l'outil Contacts dans le sélecteur pour faire apparaître la liste "
-"des contacts."
+"Affichez la fenêtre des contacts en choisissant Affichage &gt; Fenêtre &gt; "
+"Contacts dans la barre de menus."
 
-#: ../C/evolution.xml:3219(para)
+#: ../C/evolution.xml:3239(para)
 msgid "Double click on the card you want to edit."
 msgstr "Double-cliquez sur la carte que vous souhaitez modifier."
 
-#: ../C/evolution.xml:3222(para)
-msgid "Edit from the Contact Editor window."
+#: ../C/evolution.xml:3242(para) ../C/evolution.xml:3262(para)
+msgid "Edit the information in the Contact Editor window."
 msgstr "Effectuez vos modifications dans la fenêtre de l'éditeur de contact."
 
-#: ../C/evolution.xml:3228(para)
-msgid "You can also edit the contact information from the message list."
+#: ../C/evolution.xml:3248(para)
+msgid "You can also edit the contact information from the preview pane."
 msgstr ""
-"Vous pouvez aussi modifier les informations d'un contact à partir de la "
-"liste des messages."
+"Vous pouvez aussi modifier les informations d'un contact à partir du panneau "
+"d'aperçu."
 
-#: ../C/evolution.xml:3231(para)
-msgid "Right click on the address from Message Header"
+#: ../C/evolution.xml:3251(para)
+msgid "Right click on the address from Message Header."
 msgstr "Faites un clic droit sur l'adresse dans les en-têtes du message."
 
-#: ../C/evolution.xml:3234(para)
-msgid "Select Add to Address Book to appear Contact Quick-Add window"
+#: ../C/evolution.xml:3254(para)
+msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
 msgstr ""
 "Choisissez « Ajouter dans le carnet d'adresses » pour faire apparaître la "
 "fenêtre « Ajout express de contact »."
 
-#: ../C/evolution.xml:3239(para)
-msgid "Press Edit Full tab at the bottom left to appear Contact Editor window"
+#: ../C/evolution.xml:3259(para)
+msgid ""
+"Press the Edit Full button at the bottom left to bring up the Contact Editor "
+"window."
 msgstr ""
 "Cliquez sur le bouton « Éditer entièrement » en bas à gauche pour faire "
 "apparaître la fenêtre d'édition de contact."
 
-#: ../C/evolution.xml:3242(para)
-msgid "Edit the required information from Contact Editor and press OK."
-msgstr ""
-"Modifiez les informations souhaitées dans l'éditeur de contact et cliquez "
-"sur Valider."
-
-#: ../C/evolution.xml:3253(para)
+#: ../C/evolution.xml:3274(para)
 msgid ""
 "Evolution enables you to find the contact address quickly by using "
 "Customized Search. To find the contact address you are looking for, use the "
@@ -8051,35 +8062,28 @@ msgstr ""
 "utilisant la recherche personnalisée. Pour trouver l'adresse du contact que "
 "vous cherchez, utilisez la procédure suivante :"
 
-#: ../C/evolution.xml:3257(para)
-msgid ""
-"Click <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/> "
-"to expand the drop-down list."
-msgstr ""
-"Cliquez sur <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png"
-"\"/> pour ouvrir le menu déroulant."
-
-#: ../C/evolution.xml:3260(para)
+#: ../C/evolution.xml:3281(para) ../C/evolution.xml:4152(para)
+#: ../C/evolution.xml:4468(para) ../C/evolution.xml:4704(para)
 msgid "Specify the search criteria from any of the following:"
 msgstr "Indiquez le critère de recherche parmi ceux qui vous sont proposés :"
 
-#: ../C/evolution.xml:3263(para)
+#: ../C/evolution.xml:3284(para)
 msgid "Name begins with"
 msgstr "Le nom commence par"
 
-#: ../C/evolution.xml:3266(para)
+#: ../C/evolution.xml:3287(para)
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
-#: ../C/evolution.xml:3269(para)
+#: ../C/evolution.xml:3290(para)
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: ../C/evolution.xml:3274(para)
+#: ../C/evolution.xml:3295(para)
 msgid "Press Enter to begin the search"
 msgstr "Appuyez sur Entrée pour commencer la recherche"
 
-#: ../C/evolution.xml:3277(para)
+#: ../C/evolution.xml:3298(para)
 msgid ""
 "For a more complex search, select Search Advanced and select criteria that "
 "describe your desired contact:"
@@ -8087,31 +8091,19 @@ msgstr ""
 "Pour une recherche plus complexe, choisissez « Recherche avancée » et "
 "sélectionnez les critères qui décrivent le contact recherché :"
 
-#: ../C/evolution.xml:3280(para)
+#: ../C/evolution.xml:3301(para)
 msgid "Name the rule in the Rule Name field."
 msgstr "Nommez la règle dans le champ Nom de la recherche."
 
-#: ../C/evolution.xml:3283(para)
+#: ../C/evolution.xml:3304(para)
 msgid "Set up your criteria in the Find items field."
 msgstr "Définissez vos critères dans les champs de recherche."
 
-#: ../C/evolution.xml:3286(para)
+#: ../C/evolution.xml:3307(para)
 msgid "Select Add to add additional criteria."
 msgstr "Cliquez sur Ajouter pour ajouter des critères supplémentaires."
 
-#: ../C/evolution.xml:3289(para)
-msgid "Click Search."
-msgstr "Cliquez sur Valider."
-
-#: ../C/evolution.xml:3292(para)
-msgid ""
-"To show all your contacts, Click Clear in the search bar or search with an "
-"empty query."
-msgstr ""
-"Pour afficher tous les contacts, cliquez sur Effacer dans la barre de "
-"recherche ou faites une recherche vide."
-
-#: ../C/evolution.xml:3295(para)
+#: ../C/evolution.xml:3316(para)
 msgid ""
 "Displays all the contacts that match the built-in criteria you have selected "
 "from the drop-down list at the top left side, just above the Display pane."
@@ -8120,174 +8112,167 @@ msgstr ""
 "avez sélectionnés dans le menu déroulant Afficher, en haut à gauche, juste "
 "au-dessus de la zone d'affichage."
 
-#: ../C/evolution.xml:3297(para)
+#: ../C/evolution.xml:3318(para)
 msgid "To perform quick search, use the following procedure:"
 msgstr "Pour effectuer une recherche rapide, utilisez la procédure suivante :"
 
-#: ../C/evolution.xml:3300(para)
-msgid "Click show to expand the drop-down list."
-msgstr "Cliquez sur le menu déroulant pour l'ouvrir."
-
-#: ../C/evolution.xml:3303(para)
-msgid "Select the search criteria from any of the following:"
-msgstr "Sélectionnez le critère de recherche parmi ceux qui vous sont proposés :"
-
-#: ../C/evolution.xml:3306(para) ../C/evolution.xml:4196(para)
-#: ../C/evolution.xml:4546(para) ../C/evolution.xml:4742(para)
+#: ../C/evolution.xml:3327(para) ../C/evolution.xml:4220(para)
+#: ../C/evolution.xml:4571(para) ../C/evolution.xml:4766(para)
 msgid "Anniversary"
 msgstr "Anniversaire"
 
-#: ../C/evolution.xml:3309(para) ../C/evolution.xml:4199(para)
-#: ../C/evolution.xml:4549(para) ../C/evolution.xml:4745(para)
+#: ../C/evolution.xml:3330(para) ../C/evolution.xml:4223(para)
+#: ../C/evolution.xml:4574(para) ../C/evolution.xml:4769(para)
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: ../C/evolution.xml:3312(para) ../C/evolution.xml:4202(para)
-#: ../C/evolution.xml:4552(para) ../C/evolution.xml:4748(para)
+#: ../C/evolution.xml:3333(para) ../C/evolution.xml:4226(para)
+#: ../C/evolution.xml:4577(para) ../C/evolution.xml:4772(para)
 msgid "Business"
 msgstr "Travail"
 
-#: ../C/evolution.xml:3315(para) ../C/evolution.xml:4205(para)
-#: ../C/evolution.xml:4555(para) ../C/evolution.xml:4751(para)
+#: ../C/evolution.xml:3336(para) ../C/evolution.xml:4229(para)
+#: ../C/evolution.xml:4580(para) ../C/evolution.xml:4775(para)
 msgid "Competition"
 msgstr "Compétition"
 
-#: ../C/evolution.xml:3318(para) ../C/evolution.xml:4754(para)
+#: ../C/evolution.xml:3339(para) ../C/evolution.xml:4778(para)
 msgid "Favorites"
 msgstr "Favoris"
 
-#: ../C/evolution.xml:3321(para) ../C/evolution.xml:4211(para)
-#: ../C/evolution.xml:4561(para) ../C/evolution.xml:4757(para)
+#: ../C/evolution.xml:3342(para) ../C/evolution.xml:4235(para)
+#: ../C/evolution.xml:4586(para) ../C/evolution.xml:4781(para)
 msgid "Gifts"
 msgstr "Cadeaux"
 
-#: ../C/evolution.xml:3324(para) ../C/evolution.xml:4214(para)
-#: ../C/evolution.xml:4564(para) ../C/evolution.xml:4760(para)
+#: ../C/evolution.xml:3345(para) ../C/evolution.xml:4238(para)
+#: ../C/evolution.xml:4589(para) ../C/evolution.xml:4784(para)
 msgid "Goals/Objectives"
 msgstr "Buts/Objectifs"
 
-#: ../C/evolution.xml:3327(para)
+#: ../C/evolution.xml:3348(para) ../C/evolution.xml:4241(para)
 msgid "Holiday"
 msgstr "Vacances"
 
-#: ../C/evolution.xml:3330(para) ../C/evolution.xml:4220(para)
-#: ../C/evolution.xml:4570(para) ../C/evolution.xml:4766(para)
+#: ../C/evolution.xml:3351(para) ../C/evolution.xml:4244(para)
+#: ../C/evolution.xml:4595(para) ../C/evolution.xml:4790(para)
 msgid "Holiday Cards"
 msgstr "Cartes postales"
 
-#: ../C/evolution.xml:3333(para)
+#: ../C/evolution.xml:3354(para)
 msgid "Hot Contacts"
 msgstr "Contacts fréquents"
 
-#: ../C/evolution.xml:3336(para) ../C/evolution.xml:4223(para)
-#: ../C/evolution.xml:4573(para) ../C/evolution.xml:4769(para)
+#: ../C/evolution.xml:3357(para) ../C/evolution.xml:4247(para)
+#: ../C/evolution.xml:4598(para) ../C/evolution.xml:4793(para)
 msgid "Ideas"
 msgstr "Idées"
 
-#: ../C/evolution.xml:3339(para) ../C/evolution.xml:4226(para)
-#: ../C/evolution.xml:4576(para) ../C/evolution.xml:4772(para)
+#: ../C/evolution.xml:3360(para) ../C/evolution.xml:4250(para)
+#: ../C/evolution.xml:4601(para) ../C/evolution.xml:4796(para)
 msgid "International"
 msgstr "International"
 
-#: ../C/evolution.xml:3342(para)
+#: ../C/evolution.xml:3363(para) ../C/evolution.xml:4253(para)
 msgid "Key Customer"
 msgstr "Client clé"
 
-#: ../C/evolution.xml:3345(para) ../C/evolution.xml:4232(para)
-#: ../C/evolution.xml:4582(para) ../C/evolution.xml:4778(para)
+#: ../C/evolution.xml:3366(para) ../C/evolution.xml:4256(para)
+#: ../C/evolution.xml:4607(para) ../C/evolution.xml:4802(para)
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: ../C/evolution.xml:3351(para) ../C/evolution.xml:4238(para)
-#: ../C/evolution.xml:4588(para) ../C/evolution.xml:4784(para)
+#: ../C/evolution.xml:3372(para) ../C/evolution.xml:4262(para)
+#: ../C/evolution.xml:4613(para) ../C/evolution.xml:4808(para)
 msgid "Phone Calls"
 msgstr "Appels téléphoniques"
 
-#: ../C/evolution.xml:3357(para) ../C/evolution.xml:4244(para)
-#: ../C/evolution.xml:4594(para) ../C/evolution.xml:4790(para)
+#: ../C/evolution.xml:3378(para) ../C/evolution.xml:4268(para)
+#: ../C/evolution.xml:4619(para) ../C/evolution.xml:4814(para)
 msgid "Strategies"
 msgstr "Stratégies"
 
-#: ../C/evolution.xml:3360(para) ../C/evolution.xml:4247(para)
-#: ../C/evolution.xml:4597(para) ../C/evolution.xml:4793(para)
+#: ../C/evolution.xml:3381(para) ../C/evolution.xml:4271(para)
+#: ../C/evolution.xml:4622(para) ../C/evolution.xml:4817(para)
 msgid "Suppliers"
 msgstr "Fournisseurs"
 
-#: ../C/evolution.xml:3363(para)
-msgid "Time &amp;Expenses"
-msgstr "Temps et Dépenses"
+#: ../C/evolution.xml:3384(para) ../C/evolution.xml:4274(para)
+#: ../C/evolution.xml:4625(para) ../C/evolution.xml:4820(para)
+msgid "Time &amp; Expenses"
+msgstr "Temps &amp; dépenses"
 
-#: ../C/evolution.xml:3366(para) ../C/evolution.xml:4253(para)
-#: ../C/evolution.xml:4603(para) ../C/evolution.xml:4799(para)
+#: ../C/evolution.xml:3387(para) ../C/evolution.xml:4277(para)
+#: ../C/evolution.xml:4628(para) ../C/evolution.xml:4823(para)
 msgid "VIP"
 msgstr "VIP"
 
-#: ../C/evolution.xml:3369(para) ../C/evolution.xml:4256(para)
-#: ../C/evolution.xml:4606(para) ../C/evolution.xml:4802(para)
+#: ../C/evolution.xml:3390(para) ../C/evolution.xml:4280(para)
+#: ../C/evolution.xml:4631(para) ../C/evolution.xml:4826(para)
 msgid "Waiting"
 msgstr "En attente"
 
-#: ../C/evolution.xml:3372(para)
-msgid "Weather:Cloudy"
+#: ../C/evolution.xml:3393(para)
+msgid "Weather: Cloudy"
 msgstr "Météo : nuageux"
 
-#: ../C/evolution.xml:3375(para)
-msgid "Weather:Fog"
+#: ../C/evolution.xml:3396(para)
+msgid "Weather: Fog"
 msgstr "Météo : brouillard"
 
-#: ../C/evolution.xml:3378(para)
-msgid "Weather:Partly Cloudy"
+#: ../C/evolution.xml:3399(para)
+msgid "Weather: Partly Cloudy"
 msgstr "Météo : partiellement nuageux"
 
-#: ../C/evolution.xml:3381(para)
-msgid "Weather:Rain"
+#: ../C/evolution.xml:3402(para)
+msgid "Weather: Rain"
 msgstr "Météo : pluie"
 
-#: ../C/evolution.xml:3384(para)
-msgid "Weather:Snow"
+#: ../C/evolution.xml:3405(para)
+msgid "Weather: Snow"
 msgstr "Météo : neige"
 
-#: ../C/evolution.xml:3387(para)
-msgid "Weather:Sunny"
+#: ../C/evolution.xml:3408(para)
+msgid "Weather: Sunny"
 msgstr "Météo : ensoleillé"
 
-#: ../C/evolution.xml:3390(para)
-msgid "Weather:Thunderstorms"
+#: ../C/evolution.xml:3411(para)
+msgid "Weather: Thunderstorms"
 msgstr "Météo : orages"
 
-#: ../C/evolution.xml:3395(para)
+#: ../C/evolution.xml:3416(para)
 msgid "Evolution displays the desired contacts."
 msgstr "Evolution affiche les contacts désirés."
 
-#: ../C/evolution.xml:3402(para)
+#: ../C/evolution.xml:3423(para)
 msgid ""
-"Evolution allows you to organize your contact list. You can create several "
-"individual address books, or contact groups. Within a given address book, "
-"you can have several categories of contacts."
+"Evolution allows you to organize your contacts. You can create several "
+"individual address books, or contact lists. Within a given address book, you "
+"can have several categories of contacts."
 msgstr ""
-"Evolution vous permet d'organiser votre liste de contacts. Vous pouvez créer "
-"plusieurs carnets d'adresses différents ou des groupes de contacts. Dans un "
-"carnet d'adresses donné, vous pouvez avoir plusieurs catégories de contacts."
+"Evolution vous permet d'organiser vos contacts. Vous pouvez créer plusieurs "
+"carnets d'adresses différents ou des listes de contacts. Dans un carnet "
+"d'adresses donné, vous pouvez avoir plusieurs catégories de contacts."
 
-#: ../C/evolution.xml:3405(link) ../C/evolution.xml:3419(title)
+#: ../C/evolution.xml:3426(link) ../C/evolution.xml:3440(title)
 msgid "Contacts Groups"
 msgstr "Groupes de contacts"
 
-#: ../C/evolution.xml:3408(link) ../C/evolution.xml:3441(title)
+#: ../C/evolution.xml:3429(link) ../C/evolution.xml:3462(title)
 msgid "Creating a List of Contacts"
 msgstr "Création d'une liste de contacts"
 
-#: ../C/evolution.xml:3411(link) ../C/evolution.xml:3473(title)
+#: ../C/evolution.xml:3432(link) ../C/evolution.xml:3494(title)
 msgid "Grouping with Categories"
 msgstr "Groupements par catégorie"
 
-#: ../C/evolution.xml:3414(link) ../C/evolution.xml:3534(title)
+#: ../C/evolution.xml:3435(link) ../C/evolution.xml:3555(title)
 msgid "Configuring Evolution to use LDAP"
 msgstr "Configuration de LDAP dans Evolution"
 
-#: ../C/evolution.xml:3420(para)
+#: ../C/evolution.xml:3441(para)
 msgid ""
-"Contacts Groups are nothing but Address Books.The simplest way to organize "
+"Contacts Groups are nothing but Address Books. The simplest way to organize "
 "contacts is to create additional address books. You can create a new one by "
 "clicking File &gt; New &gt; Address Book. For contacts groups on your "
 "computer, you only need to provide a name. For contacts on the network, you "
@@ -8302,21 +8287,22 @@ msgstr ""
 "réseau, vous devez fournir plus d'informations sur le serveur de contacts "
 "que vous souhaitez atteindre."
 
-#: ../C/evolution.xml:3421(para)
+#: ../C/evolution.xml:3442(para)
 msgid ""
 "To move a card from one group to another, just drag it from the main display "
-"of contacts. You cannot change the contents of most network contact groups."
+"of contacts and drop it to a different group. You cannot change the contents "
+"of most network contact groups."
 msgstr ""
 "Pour déplacer une carte d'un groupe à un autre, il suffit de le faire "
-"glisser à partir de l'affichage principal des contacts. La plupart des "
-"groupes de contacts sur le réseau ne sont pas modifiables."
+"glisser à partir de l'affichage principal des contacts vers un autre groupe. "
+"La plupart des groupes de contacts sur le réseau ne sont pas modifiables."
 
-#: ../C/evolution.xml:3423(para)
+#: ../C/evolution.xml:3444(para)
 msgid ""
 "Contacts groups are not the same as contact lists. A contact group is like a "
 "folder or address book full of contacts. A contact list is a single contact "
-"that contains other contacts, and is most often used to e-mail several "
-"people at once."
+"that contains other contacts, and is most often used to email several people "
+"at once."
 msgstr ""
 "Les groupes de contacts ne sont pas la même chose que les listes de "
 "contacts. Un groupe de contacts est semblable à un dossier ou à un carnet "
@@ -8324,11 +8310,11 @@ msgstr ""
 "qui contient d'autres contacts, et sert le plus souvent à envoyer un "
 "courriel à plusieurs personnes à la fois."
 
-#: ../C/evolution.xml:3428(title)
+#: ../C/evolution.xml:3449(title)
 msgid "Importing Contacts"
 msgstr "Importation de contacts"
 
-#: ../C/evolution.xml:3429(para)
+#: ../C/evolution.xml:3450(para)
 msgid ""
 "You can import contacts from other contact management tools with the Import "
 "tool."
@@ -8336,11 +8322,11 @@ msgstr ""
 "Vous pouvez importer des contacts depuis d'autres outils de gestion de "
 "contacts à l'aide de l'outil d'importation."
 
-#: ../C/evolution.xml:3434(para)
+#: ../C/evolution.xml:3455(para)
 msgid "Mail yourself a contact as vCard attachment."
 msgstr "Envoyez-vous un contact sous forme de pièce jointe vCard."
 
-#: ../C/evolution.xml:3435(para)
+#: ../C/evolution.xml:3456(para)
 msgid ""
 "Currently VCF and LDIF are supported. CSV and TAB format files are supported "
 "from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
@@ -8349,13 +8335,13 @@ msgstr ""
 "fichier CSV et TAB sont pris en charge par MS Outlook, Thunderbird, Mozilla "
 "et Evolution."
 
-#: ../C/evolution.xml:3442(para)
+#: ../C/evolution.xml:3463(para)
 msgid ""
 "A contact list is a set of contacts with a single nickname that you create. "
-"When you send e-mail to the nickname, it is sent to every member of the "
-"list. This differs from a network mailing list in that it exists only on "
-"your computer as a convenience to you, rather than as an actual e-mail "
-"address managed by a mailing list application on a server."
+"When you send email to the nickname, it is sent to every member of the list. "
+"This differs from a network mailing list in that it exists only on your "
+"computer as a convenience to you, rather than as an actual email address "
+"managed by a mailing list application on a server."
 msgstr ""
 "Une liste de contacts est un ensemble de contacts identifiés par un "
 "pseudonyme unique de votre choix. Lorsque vous envoyez un courriel à ce "
@@ -8365,83 +8351,83 @@ msgstr ""
 "adresse électronique réelle gérée par une application de listes de diffusion "
 "sur un serveur."
 
-#: ../C/evolution.xml:3443(para)
+#: ../C/evolution.xml:3464(para)
 msgid ""
 "For example, you could create one card for each family member, then add "
-"those cards to a contact list called “Family.” Then, instead of entering "
-"each person's e-mail address individually, you can send e-mail to “Family” "
-"and the message would go to all of them."
+"those cards to a contact list called <quote>Family.</quote> Then, instead of "
+"entering each person's email address individually, you can send email to "
+"<quote>Family</quote> and the message would go to all of them."
 msgstr ""
 "Par exemple, vous pouvez créer une carte pour chaque membre de votre "
-"famille, puis ajouter ces cartes à une liste de contacts appelée "
-"« Famille ». Ensuite, au lieu de devoir saisir une à une toutes les adresses "
+"famille, puis ajouter ces cartes à une liste de contacts appelée « Famille ». "
+"Ensuite, au lieu de devoir saisir une à une toutes les adresses "
 "électroniques de votre famille, vous pouvez envoyer un message à « Famille » "
 "et le message sera distribué à chacun d'eux."
 
-#: ../C/evolution.xml:3444(para)
+#: ../C/evolution.xml:3465(para)
 msgid "To create a list of contacts:"
 msgstr "Pour créer une liste de contacts :"
 
-#: ../C/evolution.xml:3447(para)
+#: ../C/evolution.xml:3468(para)
 msgid "Open the list creation dialog box by clicking the New List button."
 msgstr ""
 "Ouvrez la boîte de dialogue de création de liste en cliquant sur le bouton "
 "Nouvelle liste."
 
-#: ../C/evolution.xml:3449(para)
+#: ../C/evolution.xml:3470(para)
 msgid "Click File &gt; New &gt; Contact List."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Liste de contacts."
 
-#: ../C/evolution.xml:3452(para)
+#: ../C/evolution.xml:3473(para)
 msgid "Specify a name for the list."
 msgstr "Indiquez un nom pour la liste."
 
-#: ../C/evolution.xml:3455(para)
-msgid "Specify the names or e-mail addresses of contacts."
+#: ../C/evolution.xml:3476(para)
+msgid "Specify the names or email addresses of contacts."
 msgstr "Indiquez les noms ou les adresses électroniques des contacts."
 
-#: ../C/evolution.xml:3457(para)
+#: ../C/evolution.xml:3478(para)
 msgid "Drag contacts from the main window into the list."
 msgstr "Faites glisser les contacts de la fenêtre principale dans la liste."
 
-#: ../C/evolution.xml:3460(para)
+#: ../C/evolution.xml:3481(para)
 msgid ""
-"Choose whether you want to hide the e-mail addresses when you send a message "
+"Choose whether you want to hide the email addresses when you send a message "
 "to the list."
 msgstr ""
 "Décidez si vous voulez masquer les adresses électroniques lorsque vous "
 "envoyez un message à la liste."
 
-#: ../C/evolution.xml:3461(para)
+#: ../C/evolution.xml:3482(para)
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
-"addresses hidden. This is the same thing as using the “Bcc:” feature "
-"discussed in <link linkend=\"usage-mail-getnsend-send-to-types\">Specifying "
-"Additional Recipients for E-Mail</link>."
+"addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
+"feature discussed in <link linkend=\"usage-mail-getnsend-send-to-types"
+"\">Specifying Additional Recipients for Email</link>."
 msgstr ""
 "Il est recommandé de laisser les adresses masquées, sauf s'il s'agit d'une "
 "très petite liste. C'est l'équivalent de l'utilisation de la fonctionnalité "
 "Cci discutée dans <link linkend=\"usage-mail-getnsend-send-to-types\">Ajout "
 "de destinataires supplémentaires</link>."
 
-#: ../C/evolution.xml:3464(para)
+#: ../C/evolution.xml:3485(para)
 msgid "When you are finished, click OK."
 msgstr "Lorsque vous avez terminé, cliquez sur Valider."
 
-#: ../C/evolution.xml:3467(para)
+#: ../C/evolution.xml:3488(para)
 msgid ""
 "The list appears as a contact card, which you can use as you would any other "
-"card, including mailing the list to another person and sending e-mail to the "
+"card, including mailing the list to another person and sending email to the "
 "list."
 msgstr ""
 "La liste apparaît comme une carte de contact, qui peut être utilisée de la "
 "même manière que toute autre carte, y compris l'envoi de la liste à une "
 "autre personne et l'envoi de messages à la liste."
 
-#: ../C/evolution.xml:3468(para)
+#: ../C/evolution.xml:3489(para)
 msgid ""
-"To mail the list, open a new e-mail and type the name you chose for the "
-"list. Evolution addresses the message to the entire list when you send the "
+"To mail the list, open a new email and type the name you chose for the list. "
+"Evolution addresses the message to the entire list when you send the "
 "message. You can also right-click the list's address card in the contacts "
 "tool and select Send Message to List."
 msgstr ""
@@ -8451,48 +8437,47 @@ msgstr ""
 "avec le bouton droit sur la carte de la liste dans l'outil Contacts et "
 "choisir « Envoyer un message à la liste »."
 
-#: ../C/evolution.xml:3469(para)
+#: ../C/evolution.xml:3490(para)
 msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
 msgstr ""
 "Evolution ne peut pas stocker des listes de contacts sur des serveurs "
 "Microsoft Exchange."
 
-#: ../C/evolution.xml:3474(para)
+#: ../C/evolution.xml:3495(para)
 msgid ""
 "Another way to group cards is to mark them as belonging to different "
 "categories. You can mark a card as being in several categories or no "
-"category at all. For example, you put a friend's card in the “Business” "
-"category because he works with you, the “Friends” category because he's a "
-"friend, and the “Frequent” category because you call him often."
+"category at all. For example, you put a friend's card in the "
+"<guilabel>Business</guilabel> category because he works with you and the "
+"<guilabel>Friends</guilabel> category because he's a friend."
 msgstr ""
 "Une autre façon de grouper des cartes est de les marquer comme faisant "
 "partie de différentes catégories. Une carte peut appartenir à plusieurs "
 "catégories ou à aucune. Par exemple, vous placez la carte d'un ami dans la "
-"catégorie « Travail » parce qu'il travaille avec vous, dans la catégorie "
-"« Amis » car c'est un ami et la catégorie « Contacts fréquents » car vous "
-"l'appelez souvent."
+"catégorie <guilabel>Travail</guilabel> parce qu'il travaille avec vous et "
+"dans la catégorie <guilabel>Amis</guilabel> car c'est un ami."
 
-#: ../C/evolution.xml:3475(para)
+#: ../C/evolution.xml:3496(para)
 msgid "To mark a card as belonging to a category,"
 msgstr "Pour signaler qu'une carte appartient à une catégorie, "
 
-#: ../C/evolution.xml:3478(para)
+#: ../C/evolution.xml:3499(para)
 msgid "Double click the card to appear the Contact Editor window"
 msgstr ""
 "Double-cliquez sur la carte pour faire apparaître la fenêtre de l'éditeur de "
 "contact"
 
-#: ../C/evolution.xml:3481(para)
+#: ../C/evolution.xml:3502(para)
 msgid "Click the Categories button at the left."
 msgstr "Cliquez sur le bouton Catégories sur la gauche."
 
-#: ../C/evolution.xml:3482(para)
-msgid "You can view the Categories dialogue box as given below."
+#: ../C/evolution.xml:3503(para)
+msgid "You can view the Categories dialog box as given below."
 msgstr ""
 "La boîte de dialogue Catégories apparaît, comme le montre la figure ci-"
 "dessous."
 
-#: ../C/evolution.xml:3494(para)
+#: ../C/evolution.xml:3515(para)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
@@ -8500,42 +8485,40 @@ msgstr ""
 "Sélectionnez une catégorie dans la liste. Vous pouvez sélectionner autant de "
 "catégories que vous le souhaitez."
 
-#: ../C/evolution.xml:3497(para)
+#: ../C/evolution.xml:3518(para)
 msgid ""
 "If the master list of categories doesn't suit you, you can add your own "
-"categories. To add new category,"
+"categories. To add a new category,"
 msgstr ""
 "Si la liste principale des catégories ne vous convient pas, vous pouvez "
 "ajouter vos propres catégories. Pour ajouter une catégorie, "
 
-#: ../C/evolution.xml:3500(para)
-msgid "Enter the new category in the entry box at the top"
-msgstr "Saisissez le nom de la nouvelle catégorie dans la zone de saisie tout en haut"
+#: ../C/evolution.xml:3521(para)
+msgid "Enter the new category in the entry box at the top."
+msgstr ""
+"Saisissez le nom de la nouvelle catégorie dans la zone de saisie tout en "
+"haut."
 
-#: ../C/evolution.xml:3504(para)
+#: ../C/evolution.xml:3525(para)
 msgid ""
 "You can view the category name appeared in the field next to Categories "
-"button in the Contact Editor"
+"button in the Contact Editor."
 msgstr ""
 "Le nom de la catégorie apparaît en regard du bouton Catégories dans "
 "l'éditeur de contact."
 
-#: ../C/evolution.xml:3507(para)
-msgid "Press OK at the right bottom of the Contact Editor window."
-msgstr "Cliquez sur Valider en bas à droite de la fenêtre de l'éditeur de contact."
-
-#: ../C/evolution.xml:3511(para)
+#: ../C/evolution.xml:3532(para)
 msgid ""
 "You can edit or set the color and icon for each categories available under "
 "categories list. To achieve that click Edit button at the bottom of the "
-"Categories window. Press delete button to delete the items from the list."
+"Categories window. Press the Delete button to delete the items from the list."
 msgstr ""
 "Vous pouvez modifier ou définir la couleur et l'icône de chaque catégorie "
 "énumérée dans la liste des catégories. Pour cela, cliquez sur le bouton "
 "Édition au bas de la fenêtre des catégories. Cliquez sur le bouton Supprimer "
 "pour supprimer des catégories de la liste."
 
-#: ../C/evolution.xml:3518(para)
+#: ../C/evolution.xml:3539(para)
 msgid ""
 "The <link linkend=\"ldap\">LDAP</link> protocol was created to let users "
 "share contact information over a network by sharing access to a central "
@@ -8550,35 +8533,34 @@ msgstr ""
 "Beaucoup d'organisations conservent un carnet d'adresses LDAP commun pour "
 "tous leurs employés ou pour les contacts clients."
 
-#: ../C/evolution.xml:3519(para)
+#: ../C/evolution.xml:3540(para)
 msgid ""
-"To learn how to add a remote LDAP directory to your available contact "
-"folders, see <link linkend=\"config-prefs-contact\">Contact Management</"
-"link>. Remote groups of contacts appear under the On LDAP Servers item in "
-"the switcher. They work like a local folder of contact cards, with the "
-"following exceptions:"
+"To learn how to add a remote LDAP directory to your available address books, "
+"see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote "
+"groups of contacts appear under the On LDAP Servers item in the switcher. "
+"They work like a local folder of contact cards, with the following "
+"exceptions:"
 msgstr ""
-"Pour apprendre comment ajouter un répertoire LDAP distant à vos dossiers de "
-"contact, consultez <link linkend=\"config-prefs-contact\">Gestion des "
+"Pour apprendre comment ajouter un répertoire LDAP distant à vos carnets "
+"d'adresses, consultez <link linkend=\"config-prefs-contact\">Gestion des "
 "contacts</link>. Les groupes de contacts distants apparaissent sous la "
-"rubrique « Sur les serveurs LDAP » dans le sélecteur. Ils se comportent "
-"comme un dossier local de cartes de contact, à l'exception des éléments "
-"suivants :"
+"rubrique « Sur les serveurs LDAP » dans le sélecteur. Ils se comportent comme "
+"un dossier local de cartes de contact, à l'exception des éléments suivants :"
 
-#: ../C/evolution.xml:3522(para)
+#: ../C/evolution.xml:3543(para)
 msgid ""
 "Network folders are only available when you are connected to the network. If "
 "you use a laptop or have a modem connection, you might want to copy or cache "
 "some of the network directory. You do this by dragging and dropping your "
-"desired contacts into the local contacts list."
+"desired contacts into the local address books."
 msgstr ""
 "Les dossiers réseau ne sont accessibles que lorsque vous êtes connecté au "
 "réseau. Si vous utilisez un ordinateur portable ou que vous avez une "
 "connexion par modem, il peut être souhaitable de copier ou de mettre en "
 "mémoire tampon une partie du répertoire réseau. Vous pouvez le faire en "
-"faisant glisser les contacts concernés dans la liste locale des contacts."
+"faisant glisser les contacts concernés dans les carnets d'adresses locaux."
 
-#: ../C/evolution.xml:3523(para)
+#: ../C/evolution.xml:3544(para)
 msgid ""
 "You can also mark the network folder for offline usage. To mark the folder, "
 "right-click the folder, then click Properties. Select Copy Folder Content "
@@ -8589,7 +8571,7 @@ msgstr ""
 "Cochez « Copier localement le contenu du carnet pour les opérations hors-"
 "ligne »."
 
-#: ../C/evolution.xml:3526(para)
+#: ../C/evolution.xml:3547(para)
 msgid ""
 "To prevent excess network traffic, Evolution does not normally load data "
 "from the LDAP server upon opening."
@@ -8597,7 +8579,7 @@ msgstr ""
 "Pour éviter un trafic réseau trop important, Evolution ne charge en principe "
 "pas les données du serveur LDAP au moment de son ouverture."
 
-#: ../C/evolution.xml:3529(para)
+#: ../C/evolution.xml:3550(para)
 msgid ""
 "Depending on your server settings, you might not be able to edit all the "
 "fields in a contact stored on an LDAP server. Some servers prohibit some or "
@@ -8610,7 +8592,7 @@ msgstr ""
 "de champs plus restreint que ceux d'Evolution. Contactez votre "
 "administrateur système si vous avez besoin de réglages différents."
 
-#: ../C/evolution.xml:3535(para)
+#: ../C/evolution.xml:3556(para)
 msgid ""
 "For information about setting up Evolution to use LDAP, refer to <link "
 "linkend=\"config-prefs-contact\">Contact Management</link>."
@@ -8619,13 +8601,13 @@ msgstr ""
 "LDAP, référez-vous à la <link linkend=\"config-prefs-contact\">Gestion des "
 "contacts</link>."
 
-#: ../C/evolution.xml:3541(para)
+#: ../C/evolution.xml:3562(para)
 msgid ""
 "When you get information about a person in the mail or in a calendar entry, "
-"you can add it to an address card. To do so, right-click any e-mail address "
-"or e-mail message, and click Add to Address Book on the menu that appears. "
-"If the sender already exists, the Editor tab opens and you can edit the "
-"detail. Evolution can also add cards from a hand-held device during HotSync* "
+"you can add it to an address card. To do so, right-click any email address "
+"or email message, and click Add to Address Book on the menu that appears. If "
+"the sender already exists, the Editor tab opens and you can edit the detail. "
+"Evolution can also add cards from a hand-held device during HotSync* "
 "operation. For more information, see <link linkend=\"config-sync"
 "\">Synchronizing Your Handheld Device</link>."
 msgstr ""
@@ -8639,64 +8621,65 @@ msgstr ""
 "détails, consultez <link linkend=\"config-sync\">Synchronisation avec un "
 "PAD</link>."
 
-#: ../C/evolution.xml:3547(para)
+#: ../C/evolution.xml:3568(para)
 msgid ""
-"This section shows you how to use the Evolution™ Calendar to manage your "
-"schedule alone or in conjunction with peers. To learn about importing "
-"calendar data, see <link linkend=\"importing-mail\">Importing Single Files</"
-"link>, which covers the Import tool."
+"This section shows you how to use the <trademark>Evolution</trademark> "
+"Calendar to manage your schedule alone or in conjunction with peers. To "
+"learn about importing calendar data, see <link linkend=\"importing-mail"
+"\">Importing Single Files</link>, which covers the Import tool."
 msgstr ""
-"Cette section explique comment utiliser le module Calendrier d'Evolution "
-"pour gérer votre emploi du temps personnel ou en relation avec des "
-"partenaires. Pour apprendre comment importer des données de calendrier, "
-"consultez <link linkend=\"importing-mail\">Importation de fichiers uniques</"
-"link>, qui traite de l'outil d'importation."
+"Cette section explique comment utiliser le module Calendrier "
+"d'<trademark>Evolution</trademark> pour gérer votre emploi du temps "
+"personnel ou en relation avec des partenaires. Pour apprendre comment "
+"importer des données de calendrier, consultez <link linkend=\"importing-mail"
+"\">Importation de fichiers uniques</link>, qui traite de l'outil "
+"d'importation."
 
-#: ../C/evolution.xml:3550(link) ../C/evolution.xml:3582(title)
+#: ../C/evolution.xml:3571(link) ../C/evolution.xml:3603(title)
 msgid "Ways of Looking at your Calendar"
 msgstr "Différentes vues du calendrier"
 
-#: ../C/evolution.xml:3553(link) ../C/evolution.xml:3740(title)
+#: ../C/evolution.xml:3574(link) ../C/evolution.xml:3761(title)
 msgid "Scheduling With the Evolution Calendar"
 msgstr "Planification dans le calendrier Evolution"
 
-#: ../C/evolution.xml:3556(link) ../C/evolution.xml:4116(title)
+#: ../C/evolution.xml:3577(link) ../C/evolution.xml:4141(title)
 msgid "Searching for Calendar Items"
 msgstr "Recherche d'éléments de calendrier"
 
-#: ../C/evolution.xml:3559(link) ../C/evolution.xml:4265(title)
+#: ../C/evolution.xml:3580(link) ../C/evolution.xml:4289(title)
 msgid "Printing Displayed Items"
 msgstr "Impression d'éléments affichés"
 
-#: ../C/evolution.xml:3562(link) ../C/evolution.xml:4270(title)
+#: ../C/evolution.xml:3583(link) ../C/evolution.xml:4294(title)
 msgid "Deleting Old Appointments and Meetings"
 msgstr "Suppression d'anciens rendez-vous"
 
-#: ../C/evolution.xml:3565(link) ../C/evolution.xml:4275(title)
+#: ../C/evolution.xml:3586(link) ../C/evolution.xml:4299(title)
 msgid "Delegating Meetings"
 msgstr "Délégation de rendez-vous"
 
-#: ../C/evolution.xml:3568(link) ../C/evolution.xml:4295(title)
+#: ../C/evolution.xml:3589(link) ../C/evolution.xml:4319(title)
 msgid "Multiple Calendars, Web Calendars, and CalDAV"
 msgstr "Calendriers multiples, calendriers Web et CalDAV"
 
-#: ../C/evolution.xml:3571(link) ../C/evolution.xml:4302(title)
+#: ../C/evolution.xml:3592(link) ../C/evolution.xml:4326(title)
 msgid "The Task List"
 msgstr "La liste des tâches"
 
-#: ../C/evolution.xml:3574(link) ../C/evolution.xml:4616(title)
+#: ../C/evolution.xml:3595(link) ../C/evolution.xml:4641(title)
 msgid "Memos"
 msgstr "Mémos"
 
-#: ../C/evolution.xml:3577(link) ../C/evolution.xml:4812(title)
+#: ../C/evolution.xml:3598(link) ../C/evolution.xml:4836(title)
 msgid "Configuring Time Zones"
 msgstr "Configuration des fuseaux horaire"
 
-#: ../C/evolution.xml:3583(para)
+#: ../C/evolution.xml:3604(para)
 msgid ""
 "In Evolution, you can keep multiple calendars and overlay them one over the "
 "next. For example, you might have a schedule of events for work, one for "
-"home, and one for your favorite sports team. The switcher lists those "
+"home, and one for your favorite sports team. The side bar lists those "
 "calendars, and you can select or deselect the boxes next to them to show and "
 "hide the appointments in your calendar view. By hiding and showing different "
 "sets of appointments, you can be sure to avoid conflicts, while keeping a "
@@ -8704,20 +8687,20 @@ msgid ""
 msgstr ""
 "Dans Evolution, on peut maintenir plusieurs calendriers et les superposer "
 "l'un sur l'autre. Par exemple, vous pouvez avoir un agenda d'événements "
-"professionnels, un agenda privé et un agenda d'événements sportifs. Le "
-"sélecteur affiche la liste de ces calendriers et vous pouvez cocher ou "
+"professionnels, un agenda privé et un agenda d'événements sportifs. La barre "
+"latérale affiche la liste de ces calendriers et vous pouvez cocher ou "
 "décocher les cases correspondantes pour afficher ou masquer les rendez-vous "
 "dans l'affichage du calendrier. En affichant et masquant différents "
 "ensembles de rendez-vous, vous pouvez être certain d'éviter des conflits "
 "tout en conservant un encombrement minimal à l'affichage."
 
-#: ../C/evolution.xml:3584(para)
+#: ../C/evolution.xml:3605(para)
 msgid "Appointments for each calendar appear as a different color."
 msgstr ""
 "Les rendez-vous de chaque calendrier apparaissent dans des couleurs "
 "différentes."
 
-#: ../C/evolution.xml:3585(para)
+#: ../C/evolution.xml:3606(para)
 msgid ""
 "The toolbar offers you five different buttons that can show you different "
 "views of your calendar."
@@ -8725,76 +8708,75 @@ msgstr ""
 "La barre d'outils présente cinq boutons qui vous permettent d'afficher votre "
 "calendrier de différentes manières."
 
-#: ../C/evolution.xml:3593(para)
+#: ../C/evolution.xml:3614(para)
 msgid "Calendar View"
 msgstr "Vue du calendrier"
 
-#: ../C/evolution.xml:3596(para)
+#: ../C/evolution.xml:3617(para)
 msgid "Shortcut Keys"
 msgstr "Raccourcis clavier"
 
-#: ../C/evolution.xml:3603(para)
+#: ../C/evolution.xml:3624(para)
 msgid "Day"
 msgstr "Jour"
 
-#: ../C/evolution.xml:3606(para)
+#: ../C/evolution.xml:3627(para)
 msgid "control+y"
 msgstr "Ctrl+Y"
 
-#: ../C/evolution.xml:3611(para)
+#: ../C/evolution.xml:3632(para)
 msgid "Work Week"
 msgstr "Semaine de travail"
 
-#: ../C/evolution.xml:3614(para)
+#: ../C/evolution.xml:3635(para)
 msgid "control+j"
 msgstr "Ctrl+J"
 
-#: ../C/evolution.xml:3619(para)
+#: ../C/evolution.xml:3640(para)
 msgid "Week"
 msgstr "Semaine"
 
-#: ../C/evolution.xml:3622(para)
+#: ../C/evolution.xml:3643(para)
 msgid "control+k"
 msgstr "Ctrl+K"
 
-#: ../C/evolution.xml:3627(para)
+#: ../C/evolution.xml:3648(para)
 msgid "Month"
 msgstr "Mois"
 
-#: ../C/evolution.xml:3630(para)
+#: ../C/evolution.xml:3651(para)
 msgid "control+m"
 msgstr "Ctrl+M"
 
-#: ../C/evolution.xml:3635(para)
+#: ../C/evolution.xml:3656(para)
 msgid "List"
 msgstr "Liste"
 
-#: ../C/evolution.xml:3638(para)
+#: ../C/evolution.xml:3659(para)
 msgid "control+l"
 msgstr "Ctrl+L"
 
-#: ../C/evolution.xml:3644(para)
+#: ../C/evolution.xml:3665(para)
 msgid ""
-"You can also select an arbitrary range of days in the small calendar just "
-"above the switcher at the left. To do this, select the days that you want to "
-"view in your calendar."
+"You can also select an arbitrary range of days in the small calendar in the "
+"side bar. To do this, select the days that you want to view in your calendar."
 msgstr ""
 "Vous pouvez aussi sélectionnez arbitrairement un intervalle de jours dans le "
-"petit calendrier juste au-dessus du sélecteur, sur la gauche. Pour cela, "
-"sélectionnez les jours que vous souhaitez voir apparaître dans le calendrier."
+"petit calendrier dans la barre latérale. Pour cela, sélectionnez les jours "
+"que vous souhaitez voir apparaître dans le calendrier."
 
-#: ../C/evolution.xml:3646(para)
+#: ../C/evolution.xml:3667(para)
 msgid ""
-"The Prev and Next buttons move you forward and back in your calendar pages. "
-"If you are using a week or month view, you can move by week or month. To "
-"return to today's listing, click the Today button in the toolbar."
+"The Previous and Next buttons move you forward and back in your calendar "
+"pages. If you are using a week or month view, you can move by week or month. "
+"To return to today's listing, click the Today button in the toolbar."
 msgstr ""
 "Les boutons Précédent et Suivant reculent et avancent dans vos pages de "
 "calendrier. Si vous utilisez une vue hebdomadaire ou mensuelle, vous pouvez "
 "vous déplacer par semaine ou par mois. Pour revenir à l'affichage "
 "d'aujourd'hui, cliquez sur le bouton Aujourd'hui dans la barre d'outils."
 
-#: ../C/evolution.xml:3647(para)
+#: ../C/evolution.xml:3668(para)
 msgid ""
 "To visit calendar entries for a specific date, click Go To and select the "
 "date in the dialog box that appears."
@@ -8802,11 +8784,11 @@ msgstr ""
 "Pour consulter le calendrier à une date spécifique, cliquez sur Aller à et "
 "sélectionnez la date dans la boîte de dialogue qui apparaît."
 
-#: ../C/evolution.xml:3650(title)
+#: ../C/evolution.xml:3671(title)
 msgid "Calendar Properties"
 msgstr "Propriétés du calendrier"
 
-#: ../C/evolution.xml:3651(para)
+#: ../C/evolution.xml:3672(para)
 msgid ""
 "Evolution allows you to edit the label of your calendar, assign color, and "
 "copy content for offline use. To set your calendar properties"
@@ -8815,33 +8797,34 @@ msgstr ""
 "couleurs et de copier le contenu pour un usage hors ligne. Pour définir les "
 "propriétés de calendrier, "
 
-#: ../C/evolution.xml:3654(para)
-msgid "Select the calendar from the folder view at the left."
-msgstr "Sélectionnez le calendrier dans l'affichage des dossiers sur la gauche."
+#: ../C/evolution.xml:3675(para)
+msgid "Select the calendar from the side bar at the left."
+msgstr "Sélectionnez le calendrier dans la barre latérale sur la gauche."
 
-#: ../C/evolution.xml:3657(para)
-msgid "Right click."
-msgstr "Cliquez sur le calendrier avec le bouton droit."
+#: ../C/evolution.xml:3678(para)
+msgid "Right click on the calendar."
+msgstr "Faites un clic droit sur le calendrier."
 
-#: ../C/evolution.xml:3660(para)
-msgid "Select Properties to open Calendar Properties dialogue box."
+#: ../C/evolution.xml:3681(para)
+msgid "Select Properties to open Calendar Properties dialog box."
 msgstr ""
 "Choisissez Propriétés pour ouvrir la boîte de dialogue des propriétés du "
 "calendrier."
 
-#: ../C/evolution.xml:3672(para)
+#: ../C/evolution.xml:3693(para)
 msgid "Edit the label from Name field."
 msgstr "Modifiez le nom du calendrier."
 
-#: ../C/evolution.xml:3675(para)
-msgid "To assign a color for the calendar, click the Color tab."
-msgstr "Pour définir une couleur pour le calendrier, cliquez sur le bouton Couleur."
+#: ../C/evolution.xml:3696(para)
+msgid "To assign a color for the calendar, click the Color button."
+msgstr ""
+"Pour définir une couleur pour le calendrier, cliquez sur le bouton Couleur."
 
-#: ../C/evolution.xml:3678(para)
+#: ../C/evolution.xml:3699(para)
 msgid "Select the color and click OK."
 msgstr "Sélectionnez la couleur et cliquez sur Valider."
 
-#: ../C/evolution.xml:3681(para)
+#: ../C/evolution.xml:3702(para)
 msgid ""
 "To mark your calendar content for offline use, click Copy calendar contents "
 "locally for offline operations."
@@ -8849,7 +8832,7 @@ msgstr ""
 "Pour rendre disponible votre calendrier hors connexion, cochez « Copier "
 "localement le contenu du calendrier pour les opérations hors-ligne »."
 
-#: ../C/evolution.xml:3683(para)
+#: ../C/evolution.xml:3704(para)
 msgid ""
 "Right click on the calendar at the left and select Mark Calendar for offline "
 "use. For more information on working offline refer <link linkend=\"usage-"
@@ -8860,7 +8843,7 @@ msgstr ""
 "travail hors connexion, consultez <link linkend=\"usage-mail-getnsend-offline"
 "\">Travail hors ligne</link>."
 
-#: ../C/evolution.xml:3685(para)
+#: ../C/evolution.xml:3706(para)
 msgid ""
 "To export or share or to store a calendar locally in iCal format, right "
 "click on the calendar in the calendar view at the left and select Save to "
@@ -8870,7 +8853,7 @@ msgstr ""
 "faites un clic droit sur le calendrier dans la liste sur la gauche et "
 "choisissez « Enregistrer sur disque »."
 
-#: ../C/evolution.xml:3687(para)
+#: ../C/evolution.xml:3708(para)
 msgid ""
 "Click Mark as default folder if you want to mark this folder as your default "
 "calendar folder."
@@ -8878,85 +8861,90 @@ msgstr ""
 "Cochez « Marquer comme dossier par défaut » si vous voulez que ce dossier "
 "apparaisse comme le dossier de calendrier par défaut."
 
-#: ../C/evolution.xml:3691(title)
+#: ../C/evolution.xml:3712(title)
 msgid "Google Calendar"
 msgstr "Calendrier Google"
 
-#: ../C/evolution.xml:3692(para)
+#: ../C/evolution.xml:3713(para)
 msgid ""
 "Evolution allows you to access your Google calendar. You can view the Google "
-"calendar offline and create, modify and delete the calendar items online."
-msgstr "Evolution permet d'accéder aux calendriers Google. Il est alors possible de consulter le calendrier Google hors ligne, et de modifier ou supprimer des éléments du calendrier en ligne."
+"calendar offline or create, modify, and delete the calendar items online."
+msgstr ""
+"Evolution permet d'accéder aux calendriers Google. Il est alors possible de "
+"consulter le calendrier Google hors ligne, ou de créer, modifier ou "
+"supprimer des éléments du calendrier en ligne."
 
-#: ../C/evolution.xml:3693(para)
-msgid "To integrate Google calendar to Evolution:"
+#: ../C/evolution.xml:3714(para)
+msgid "To integrate the Google calendar to Evolution:"
 msgstr "Pour intégrer un calendrier Google à Evolution :"
 
-#: ../C/evolution.xml:3696(para)
+#: ../C/evolution.xml:3717(para)
 msgid "Click New, then select Calendar to open the New Calendar dialog."
 msgstr ""
 "Cliquez sur Nouveau, puis Calendrier pour ouvrir la boîte de dialogue de "
 "nouveau calendrier."
 
-#: ../C/evolution.xml:3699(para)
+#: ../C/evolution.xml:3720(para)
 msgid "Select Google from the Type drop-down list."
 msgstr "Choisissez Google dans le menu déroulant Type."
 
-#: ../C/evolution.xml:3704(para)
-msgid "Enter the following:"
+#: ../C/evolution.xml:3725(para)
+msgid "Specify the following:"
 msgstr "Complétez les informations suivantes :"
 
-#: ../C/evolution.xml:3708(title)
+#: ../C/evolution.xml:3729(title)
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../C/evolution.xml:3709(para)
+#: ../C/evolution.xml:3730(para)
 msgid "Specify a name for the Google calendar"
 msgstr "Indiquez un nom pour le calendrier Google."
 
-#: ../C/evolution.xml:3714(title)
+#: ../C/evolution.xml:3735(title)
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: ../C/evolution.xml:3715(para)
+#: ../C/evolution.xml:3736(para)
 msgid "Specify your username for your Google account"
 msgstr "Indiquez le nom d'utilisateur de votre compte Google."
 
-#: ../C/evolution.xml:3721(para)
+#: ../C/evolution.xml:3742(para)
 msgid "Set the time to automatically refresh the calendar."
 msgstr "Définissez la fréquence d'actualisation automatique du calendrier."
 
-#: ../C/evolution.xml:3724(para)
+#: ../C/evolution.xml:3745(para)
 msgid ""
-"Select Use SSL to enable SSL for communication between Evolution and Google "
-"server."
-msgstr "Cochez « Utiliser SSL » pour activer la communication sécurisée entre Evolution et le serveur Google."
+"Select Use SSL to enable SSL for communication between Evolution and the "
+"Google server."
+msgstr ""
+"Cochez « Utiliser SSL » pour activer la communication sécurisée entre "
+"Evolution et le serveur Google."
 
-#: ../C/evolution.xml:3727(para)
+#: ../C/evolution.xml:3748(para)
 msgid ""
-"If you want to set a color label for the calendar, click the Color tab and "
-"select the desired color and click OK."
-msgstr "Si vous souhaitez définir une couleur d'étiquette pour le calendrier, cliquez sur l'onglet Couleur, choisissez la couleur souhaitée et cliquez sur Valider."
+"If you want to set a color label for the calendar, click the Color tab, "
+"select the desired color, then click OK."
+msgstr ""
+"Si vous souhaitez définir une couleur d'étiquette pour le calendrier, "
+"cliquez sur l'onglet Couleur, choisissez la couleur souhaitée et cliquez sur "
+"Valider."
 
-#: ../C/evolution.xml:3730(para)
+#: ../C/evolution.xml:3751(para)
 msgid ""
 "If you want to view the calendar items offline, select Copy calendar content "
 "locally for offline operation check box."
 msgstr ""
-"Si vous souhaitez pouvoir consulter le calendrier hors connexion, cochez « Copier "
-"localement le contenu du calendrier pour les opérations hors-ligne »."
+"Si vous souhaitez pouvoir consulter le calendrier hors connexion, cochez "
+"« Copier localement le contenu du calendrier pour les opérations hors-ligne »."
 
-#: ../C/evolution.xml:3731(para)
+#: ../C/evolution.xml:3752(para)
 msgid ""
-"If you have marked for offline operation, you cannot modify or create the "
-"calendar items."
-msgstr "Lors de votre utilisation du calendrier en mode déconnecté, vous ne pouvez pas modifier ou créer des éléments dans le calendrier."
-
-#: ../C/evolution.xml:3734(para)
-msgid "Click OK to save your modifications."
-msgstr "Cliquez sur Valider pour enregistrer les modifications."
+"If you select this option, you cannot modify or create the calendar items."
+msgstr ""
+"Si vous cochez cette option, vous ne pourrez pas modifier ou créer des "
+"éléments dans le calendrier."
 
-#: ../C/evolution.xml:3741(para)
+#: ../C/evolution.xml:3762(para)
 msgid ""
 "There are two types of events you can schedule with Evolution: appointments "
 "and meetings. An appointment is an event you schedule for yourself only, and "
@@ -8971,104 +8959,106 @@ msgstr ""
 "effectuer une recherche de disponibilité pour les réunions afin de "
 "déterminer si les invités sont libres."
 
-#: ../C/evolution.xml:3744(link) ../C/evolution.xml:3767(title)
+#: ../C/evolution.xml:3765(link) ../C/evolution.xml:3788(title)
 msgid "Appointments"
 msgstr "Rendez-vous"
 
-#: ../C/evolution.xml:3747(link) ../C/evolution.xml:3940(title)
+#: ../C/evolution.xml:3768(link) ../C/evolution.xml:3960(title)
 msgid "Sending a Meeting Invitation"
 msgstr "Envoi d'une invitation de réunion"
 
-#: ../C/evolution.xml:3750(link) ../C/evolution.xml:4024(title)
+#: ../C/evolution.xml:3771(link) ../C/evolution.xml:4049(title)
 msgid "Accepting and Replying to a Meeting Request"
 msgstr "Acceptation et réponse à une requête de réunion"
 
-#: ../C/evolution.xml:3753(link) ../C/evolution.xml:4042(title)
+#: ../C/evolution.xml:3774(link) ../C/evolution.xml:4067(title)
 msgid "Reading Responses to Meeting Requests"
 msgstr "Lecture des réponses aux demandes de réunion"
 
-#: ../C/evolution.xml:3756(link) ../C/evolution.xml:4047(title)
+#: ../C/evolution.xml:3777(link) ../C/evolution.xml:4072(title)
 msgid "Using the Free/Busy View"
 msgstr "Utilisation de l'affichage libre/occupé"
 
-#: ../C/evolution.xml:3759(link) ../C/evolution.xml:4076(title)
-msgid "Publishing Calendar and Free/Busy Information Without a Groupware Server"
+#: ../C/evolution.xml:3780(link) ../C/evolution.xml:4101(title)
+msgid ""
+"Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Publication des informations de calendrier et de disponibilité sans serveur "
 "collaboratif"
 
-#: ../C/evolution.xml:3762(link) ../C/evolution.xml:4109(title)
+#: ../C/evolution.xml:3783(link) ../C/evolution.xml:4134(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Accès aux données de disponibilité sans serveur collaboratif"
 
-#: ../C/evolution.xml:3768(para)
+#: ../C/evolution.xml:3789(para)
 msgid "In Evolution, an appointment is an event you schedule for yourself."
 msgstr ""
 "Dans Evolution, un rendez-vous est un événement que vous planifiez pour vous-"
 "même."
 
-#: ../C/evolution.xml:3771(link) ../C/evolution.xml:3785(title)
+#: ../C/evolution.xml:3792(link) ../C/evolution.xml:3806(title)
 msgid "Creating Appointments"
 msgstr "Création de rendez-vous"
 
-#: ../C/evolution.xml:3774(link) ../C/evolution.xml:3871(title)
-#: ../C/evolution.xml:5347(title)
+#: ../C/evolution.xml:3795(link) ../C/evolution.xml:3894(title)
+#: ../C/evolution.xml:5324(title)
 msgid "Reminders"
 msgstr "Rappels"
 
-#: ../C/evolution.xml:3777(link) ../C/evolution.xml:3910(title)
+#: ../C/evolution.xml:3798(link) ../C/evolution.xml:3930(title)
 msgid "Classifications"
 msgstr "Classifications"
 
-#: ../C/evolution.xml:3780(link) ../C/evolution.xml:3933(title)
+#: ../C/evolution.xml:3801(link) ../C/evolution.xml:3953(title)
 msgid "Recurrence"
 msgstr "Récurrence"
 
-#: ../C/evolution.xml:3788(para)
+#: ../C/evolution.xml:3809(para)
 msgid "Click File &gt; New &gt; Appointment."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Rendez-vous."
 
-#: ../C/evolution.xml:3790(para)
-msgid "Click Calendars on the Switcher, then click New &gt; Appointment."
+#: ../C/evolution.xml:3811(para)
+msgid ""
+"Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
 msgstr ""
 "Cliquez sur Calendriers dans le sélecteur, puis cliquez sur Nouveau &gt; "
 "Rendez-vous."
 
-#: ../C/evolution.xml:3792(para)
+#: ../C/evolution.xml:3813(para)
 msgid ""
 "Double-click in a blank space on the calendar view to open an Appointment "
-"dialogue box. The appointment is created for that particular time on the "
-"calendar view against which you have double clicked on."
+"dialog box. The particular time on the calendar view against which you have "
+"double clicked on will be suggested for the new appointment."
 msgstr ""
 "Double-cliquez sur un espace vierge dans un calendrier pour ouvrir la boîte "
-"de dialogue Rendez-vous. Le rendez-vous est créé à l'endroit précis du "
-"calendrier où vous avez effectué le double-clic."
+"de dialogue Rendez-vous. L'heure de l'endroit sur lequel vous avez cliqué "
+"dans le calendrier est suggérée comme heure du nouveau rendez-vous."
 
-#: ../C/evolution.xml:3794(para)
-msgid "Select the required duration on the calender view and enter the summary."
+#: ../C/evolution.xml:3815(para)
+msgid ""
+"Select the required duration on the calender view and enter the summary."
 msgstr "Sélectionnez la durée souhaitée de l'événement et saisissez un résumé."
 
-#: ../C/evolution.xml:3797(para)
-msgid ""
-"Select a calendar in the Calendar drop-down list. Type a brief summary of "
-"the appointment in the Summary field."
-msgstr ""
-"Sélectionnez un calendrier dans la liste déroulante Calendrier. Saisissez "
-"une courte description du rendez-vous dans le champ Résumé."
+#: ../C/evolution.xml:3818(para) ../C/evolution.xml:3973(para)
+msgid "Select a calendar in the Calendar drop-down list."
+msgstr "Sélectionnez un calendrier dans la liste déroulante Calendrier."
 
-#: ../C/evolution.xml:3802(para)
-msgid "Type a location for the appointment in the Location field."
-msgstr "Saisissez le lieu du rendez-vous dans le champ Emplacement."
+#: ../C/evolution.xml:3819(para) ../C/evolution.xml:3830(para)
+#: ../C/evolution.xml:3988(para) ../C/evolution.xml:4371(para)
+#: ../C/evolution.xml:4425(para) ../C/evolution.xml:4657(para)
+#: ../C/evolution.xml:5723(para)
+msgid "Enter a brief summary in the Summary field."
+msgstr "Saisissez un bref résumé dans le champ Résumé."
 
-#: ../C/evolution.xml:3805(para)
-msgid "Select the date, time and set the duration"
-msgstr "Sélectionnez la date et l'heure et définissez la durée."
+#: ../C/evolution.xml:3824(para) ../C/evolution.xml:3991(para)
+msgid "(Optional) Type a location in the Location field."
+msgstr "(facultatif) Saisissez un emplacement dans le champ Emplacement."
 
-#: ../C/evolution.xml:3808(para)
-msgid "Enter a brief summary of the appointment in the description field."
-msgstr "Saisissez un bref résumé du rendez-vous dans le champ Description."
+#: ../C/evolution.xml:3827(para)
+msgid "Select the date and time."
+msgstr "Choisissez la date et l'heure."
 
-#: ../C/evolution.xml:3811(para)
+#: ../C/evolution.xml:3833(para) ../C/evolution.xml:3994(para)
 msgid ""
 "To select this appointment as an all day event, click Options &gt; All Day "
 "Event."
@@ -9076,98 +9066,112 @@ msgstr ""
 "Pour définir ce rendez-vous comme événement sur une journée entière, "
 "choisissez Options &gt; Toute la journée."
 
-#: ../C/evolution.xml:3813(para)
+#: ../C/evolution.xml:3835(para) ../C/evolution.xml:3996(para)
 msgid "Click the All Day Event button on the toolbar."
 msgstr "Cliquez sur le bouton « Toute la journée » dans la barre d'outils."
 
-#: ../C/evolution.xml:3816(para)
-msgid "If the event is an all day event, specify a starting and ending date."
+#: ../C/evolution.xml:3838(para) ../C/evolution.xml:3999(para)
+msgid ""
+"If the event is an all day event, specify a starting date and an ending date."
 msgstr ""
 "Si c'est un événement d'une journée entière, indiquez une date de début et "
 "une date de fin."
 
-#: ../C/evolution.xml:3819(para)
-msgid "If the event is not an all day event, specify a starting and ending time."
+#: ../C/evolution.xml:3841(para) ../C/evolution.xml:4002(para)
+msgid ""
+"If the event is not an all day event, specify a starting time and an ending "
+"time."
 msgstr ""
 "Si ce n'est pas un événement d'une journée entière, indiquez une heure de "
 "début et une heure de fin."
 
-#: ../C/evolution.xml:3822(para)
+#: ../C/evolution.xml:3844(para) ../C/evolution.xml:4005(para)
 msgid "Select For to specify the duration."
 msgstr "Choisissez « pour » pour indiquer une durée."
 
-#: ../C/evolution.xml:3824(para)
+#: ../C/evolution.xml:3846(para) ../C/evolution.xml:4007(para)
 msgid "Select Until to specify the ending time of the event."
 msgstr "Choisissez « jusqu'à » pour indiquer l'heure de fin de l'événement."
 
-#: ../C/evolution.xml:3827(para) ../C/evolution.xml:3986(para)
-#: ../C/evolution.xml:4355(para) ../C/evolution.xml:4406(para)
+#: ../C/evolution.xml:3849(para) ../C/evolution.xml:4010(para)
+#: ../C/evolution.xml:4380(para) ../C/evolution.xml:4431(para)
 msgid "Type the time zone information in the Time Zone field."
 msgstr "Saisssez le fuseau horaire dans le champ correspondant."
 
-#: ../C/evolution.xml:3829(para) ../C/evolution.xml:3988(para)
-#: ../C/evolution.xml:4357(para) ../C/evolution.xml:4408(para)
+#: ../C/evolution.xml:3851(para) ../C/evolution.xml:4012(para)
+#: ../C/evolution.xml:4382(para) ../C/evolution.xml:4433(para)
 msgid "Click the globe to customize the time zone."
 msgstr "Cliquez sur le globe pour personnaliser le fuseau horaire."
 
-#: ../C/evolution.xml:3830(para) ../C/evolution.xml:3989(para)
-#: ../C/evolution.xml:4358(para) ../C/evolution.xml:4409(para)
+#: ../C/evolution.xml:3852(para) ../C/evolution.xml:4013(para)
+#: ../C/evolution.xml:4383(para) ../C/evolution.xml:4434(para)
 msgid "To hide or show the Time Zone field, click View &gt; Time Zone."
 msgstr ""
 "Pour masquer ou afficher le champ du fuseau horaire, choisissez Affichage "
 "&gt; Fuseau horaire."
 
-#: ../C/evolution.xml:3833(para)
+#: ../C/evolution.xml:3855(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
 msgstr ""
 "Pour que la période s'affiche comme occupée, choisissez Options &gt; "
 "Afficher la période comme occupé."
 
-#: ../C/evolution.xml:3836(para)
-msgid ""
-"(Optional) Type a category in the Categories field. To show or hide the "
-"Categories field, click View &gt; Categories."
+#: ../C/evolution.xml:3858(para) ../C/evolution.xml:3936(para)
+#: ../C/evolution.xml:4386(para) ../C/evolution.xml:4437(para)
+#: ../C/evolution.xml:4653(para)
+msgid "(Optional) Type a category in the Categories field."
+msgstr "(facultatif) Saisissez une catégorie dans le champ Catégories."
+
+#: ../C/evolution.xml:3859(para) ../C/evolution.xml:3942(para)
+#: ../C/evolution.xml:4387(para) ../C/evolution.xml:4438(para)
+msgid "To show or hide the Categories field, click View &gt; Categories."
 msgstr ""
-"(facultatif) Saisissez une catégorie dans le champ Catégories. Pour afficher "
-"ou masquer le champ Catégories, choisissez Affichage &gt; Catégories."
+"Pour afficher ou masquer le champ Catégories, choisissez Affichage &gt; "
+"Catégories."
 
-#: ../C/evolution.xml:3837(para)
+#: ../C/evolution.xml:3862(para) ../C/evolution.xml:4390(para)
+#: ../C/evolution.xml:4441(para) ../C/evolution.xml:4663(para)
+#: ../C/evolution.xml:5732(para)
+msgid "(Optional) Enter a description in the Description field."
+msgstr "(facultatif) Saisissez une description dans le champ Description."
+
+#: ../C/evolution.xml:3865(para) ../C/evolution.xml:3920(para)
+#: ../C/evolution.xml:4016(para)
 msgid ""
-"For more information on categories, see <link linkend=\"bxmtbjb"
-"\">Classifications</link>."
+"To create an alarm for this appointment, click Alarms on the toolbar, or "
+"click Options &gt; Alarms."
 msgstr ""
-"Pour plus d'informations sur les catégories, consultez <link linkend="
-"\"bxmtbjb\">Classifications</link>."
-
-#: ../C/evolution.xml:3840(para)
-msgid "Type a description in the Description field."
-msgstr "Saisissez une description dans le champ correspondant."
+"Pour créer une alarme pour ce rendez-vous, cliquez sur Alarmes dans la barre "
+"d'outils ou choisissez Options &gt; Alarmes."
 
-#: ../C/evolution.xml:3843(para)
-msgid "To select an alarm for this appointment, click Alarm on the toolbar."
+#: ../C/evolution.xml:3866(para) ../C/evolution.xml:3923(para)
+#: ../C/evolution.xml:4017(para)
+msgid "Select Customize to add or remove customized alarms for the event."
 msgstr ""
-"Pour choisir une alarme pour ce rendez-vous, cliquez sur Alarmes dans la "
-"barre d'outils."
+"Sélectionnez Personnaliser pour ajouter ou enlever des alarmes "
+"personnalisées pour l'événement."
 
-#: ../C/evolution.xml:3844(para)
+#: ../C/evolution.xml:3867(para) ../C/evolution.xml:4018(para)
 msgid ""
-"If you select an alarm, specify when and how you want the alarm to notify. "
 "For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
 "link>."
 msgstr ""
-"Si vous choisissez une alarme, indiquez quand et comment la notification "
-"d'alarme doit être faite. Pour plus d'informations sur les rappels, "
-"consultez <link linkend=\"bshly4v\">Rappels</link>."
+"Pour plus d'informations sur les rappels, consultez <link linkend=\"bshly4v"
+"\">Rappels</link>."
 
-#: ../C/evolution.xml:3847(para) ../C/evolution.xml:3996(para)
+#: ../C/evolution.xml:3870(para) ../C/evolution.xml:4021(para)
+#: ../C/evolution.xml:4399(para) ../C/evolution.xml:4444(para)
+#: ../C/evolution.xml:4666(para)
 msgid ""
-"(Optional) To add an attachment to the appointment, drag and drop the "
-"attachment into the attachment bar."
+"(Optional) To add an attachment, drag and drop the attachment into the "
+"attachment bar."
 msgstr ""
-"(facultatif) Pour ajouter une pièce jointe au rendez-vous, faites glisser un "
-"fichier dans la barre des pièces jointes."
+"(facultatif) Pour ajouter une pièce jointe, faites glisser un fichier dans "
+"la barre des pièces jointes."
 
-#: ../C/evolution.xml:3849(para) ../C/evolution.xml:3998(para)
+#: ../C/evolution.xml:3872(para) ../C/evolution.xml:4023(para)
+#: ../C/evolution.xml:4401(para) ../C/evolution.xml:4446(para)
+#: ../C/evolution.xml:4668(para)
 msgid ""
 "Click the Attach button on the toolbar, or click Insert &gt; Attachment and "
 "then browse to the attachment."
@@ -9175,7 +9179,7 @@ msgstr ""
 "Cliquez sur le bouton Joindre dans la barre d'outils ou choisissez Insérer "
 "&gt; Pièce jointe, puis sélectionnez le fichier à joindre."
 
-#: ../C/evolution.xml:3852(para) ../C/evolution.xml:4001(para)
+#: ../C/evolution.xml:3875(para) ../C/evolution.xml:4026(para)
 msgid ""
 "(Optional) Select a classification (Public, Private, or Confidential) by "
 "clicking &gt; Options &gt; Classifications."
@@ -9183,11 +9187,11 @@ msgstr ""
 "(facultatif) Sélectionnez une classification (public, privé, confidentiel) "
 "en choisissant Options &gt; Classifications."
 
-#: ../C/evolution.xml:3855(para) ../C/evolution.xml:4004(para)
+#: ../C/evolution.xml:3878(para) ../C/evolution.xml:4029(para)
 msgid "(Optional) Click the Recurrence button on the toolbar."
 msgstr "(facultatif) Cliquez sur le bouton Récurrence dans la barre d'outils."
 
-#: ../C/evolution.xml:3857(para) ../C/evolution.xml:4006(para)
+#: ../C/evolution.xml:3880(para) ../C/evolution.xml:4031(para)
 msgid ""
 "Click Options &gt; Recurrence, and specify whether you want the appointment "
 "to recur and how often."
@@ -9195,11 +9199,11 @@ msgstr ""
 "Choisissez Options &gt; Récurrence, et indiquez la fréquence et le type de "
 "répétition de l'événement."
 
-#: ../C/evolution.xml:3862(title)
+#: ../C/evolution.xml:3885(title)
 msgid "All Day Event"
 msgstr "Événement sur une journée entière"
 
-#: ../C/evolution.xml:3863(para)
+#: ../C/evolution.xml:3886(para)
 msgid ""
 "An All Day event appears at the top of a day's appointment list, in the "
 "header under the date, rather than inside. That makes it easy to have "
@@ -9218,7 +9222,7 @@ msgstr ""
 "peuvent également se superposer. Lorsque c'est le cas, ils apparaissent sous "
 "forme de colonnes dans la vue journalière du calendrier."
 
-#: ../C/evolution.xml:3864(para)
+#: ../C/evolution.xml:3887(para)
 msgid ""
 "If you create calendar appointments that overlap, Evolution displays them "
 "side by side in your calendar."
@@ -9226,7 +9230,7 @@ msgstr ""
 "Si vous créez des rendez-vous qui se superposent dans le calendrier, "
 "Evolution les affiche côte à côte."
 
-#: ../C/evolution.xml:3872(para)
+#: ../C/evolution.xml:3895(para)
 msgid ""
 "You can have several Reminders for individual appointments, any time prior "
 "to the appointment you schedule. You can have one reminder of each of the "
@@ -9236,27 +9240,29 @@ msgstr ""
 "précédant le rendez-vous planifié. Vous pouvez définir un rappel pour chacun "
 "des types suivants :"
 
-#: ../C/evolution.xml:3876(title)
+#: ../C/evolution.xml:3899(title)
 msgid "Display:"
 msgstr "Affichage :"
 
-#: ../C/evolution.xml:3877(para)
-msgid "A notification pops up on your screen to remind you of your appointment."
-msgstr "Une notification surgit à l'écran pour vous rappeler votre rendez-vous."
+#: ../C/evolution.xml:3900(para)
+msgid ""
+"A notification pops up on your screen to remind you of your appointment."
+msgstr ""
+"Une notification surgit à l'écran pour vous rappeler votre rendez-vous."
 
-#: ../C/evolution.xml:3882(title)
+#: ../C/evolution.xml:3905(title)
 msgid "Audio:"
 msgstr "Audio :"
 
-#: ../C/evolution.xml:3883(para)
+#: ../C/evolution.xml:3906(para)
 msgid "Your computer delivers a sound alarm."
 msgstr "L'ordinateur génère une alarme sonore."
 
-#: ../C/evolution.xml:3888(title)
+#: ../C/evolution.xml:3911(title)
 msgid "Program:"
 msgstr "Programme :"
 
-#: ../C/evolution.xml:3889(para)
+#: ../C/evolution.xml:3912(para)
 msgid ""
 "You can run a program as a reminder. You can enter its name in the text "
 "field, or find it with the Browse button."
@@ -9264,7 +9270,7 @@ msgstr ""
 "Vous pouvez lancer un programme comme rappel. Vous pouvez saisir son nom "
 "dans la zone de texte ou le trouver avec le bouton Parcourir."
 
-#: ../C/evolution.xml:3893(para)
+#: ../C/evolution.xml:3916(para)
 msgid ""
 "Apart from the above notifications, the Evolution alarm icon blinks in the "
 "notification area. To pause the alarm or view the event, click the "
@@ -9274,35 +9280,17 @@ msgstr ""
 "dans la zone de notification. Pour stopper l'alarme ou voir l'événement, "
 "cliquez sur l'icône de notification."
 
-#: ../C/evolution.xml:3894(para)
+#: ../C/evolution.xml:3917(para)
 msgid "To create a reminder:"
 msgstr "Pour créer un rappel :"
 
-#: ../C/evolution.xml:3897(para)
-msgid ""
-"When creating an appointment, click Alarms on the toolbar, or click Options "
-"&gt; Alarms."
-msgstr ""
-"Lorsque vous créer un rendez-vous, cliquez sur Alarmes dans la barre "
-"d'outils ou choisissez Options &gt; Alarmes."
-
-#: ../C/evolution.xml:3900(para)
-msgid "Select the alarm for the event."
-msgstr "Sélectionnez l'alarme pour l'événement."
-
-#: ../C/evolution.xml:3903(para)
-msgid "Select Customize to add or remove customized alarms for the event."
-msgstr ""
-"Sélectionnez Personnaliser pour ajouter ou enlever des alarmes "
-"personnalisées pour l'événement."
-
-#: ../C/evolution.xml:3906(para)
+#: ../C/evolution.xml:3926(para)
 msgid ""
 "If you have stored reminders in a local calendar, they work from the moment "
 "you log in. However, for reminders stored on any remote server like "
-"GroupWise Exchange which requires authentication, you must run Evolution at "
-"least once after logging in. No matter where the reminders are stored, you "
-"can quit Evolution and still be reminded of an upcoming appointment."
+"GroupWise or Exchange which requires authentication, you must run Evolution "
+"at least once after logging in. No matter where the reminders are stored, "
+"you can quit Evolution and still be reminded of an upcoming appointment."
 msgstr ""
 "Si vous avez défini des rappels dans un calendrier local, ils sont actifs "
 "dès le moment de la connexion. Cependant, pour des rappels stockés sur un "
@@ -9312,26 +9300,27 @@ msgstr ""
 "continuent de vous avertir des prochains rendez-vous même si vous quittez "
 "Evolution."
 
-#: ../C/evolution.xml:3911(para)
-msgid ""
-"If you are using a calendar on a Novell GroupWise® or Microsoft Exchange "
-"server, select a classification for the appointment to determine who can "
-"view it. Public is the default category, and a public appointment can be "
-"viewed by anyone on the calendar-sharing network. Private denotes one level "
-"of security, and Confidential an even higher level. The different levels "
-"vary depending on your server settings; check with your system administrator "
-"or adjust your delegation settings."
-msgstr ""
-"Si vous utilisez un calendrier sur un serveur Novell GroupWise ou "
-"Microsoft Exchange, sélectionnez une classification pour le rendez-vous afin "
-"de déterminer qui peut le voir. La catégorie par défaut est « Public », ce "
-"qui rend le rendez-vous visible pour tout utilisateur du réseau où est "
-"partagé le calendrier. « Privé » signale un premier niveau de sécurité, et "
-"« Confidentiel » un niveau encore plus élevé. Les différents niveaux varient "
-"selon les paramètres du serveur ; adressez-vous à votre administrateur "
-"système ou ajustez vos paramètres de délégation."
+#: ../C/evolution.xml:3931(para)
+msgid ""
+"If you are using a calendar on a Novell <trademark class=\"registered"
+"\">GroupWise</trademark> or Microsoft Exchange server, select a "
+"classification for the appointment to determine who can view it. Public is "
+"the default category, and a public appointment can be viewed by anyone on "
+"the calendar-sharing network. Private denotes one level of security, and "
+"Confidential an even higher level. The different levels vary depending on "
+"your server settings; check with your system administrator or adjust your "
+"delegation settings."
+msgstr ""
+"Si vous utilisez un calendrier sur un serveur Novell <trademark class="
+"\"registered\">GroupWise</trademark> ou Microsoft Exchange, sélectionnez une "
+"classification pour le rendez-vous afin de déterminer qui peut le voir. La "
+"catégorie par défaut est « Public », ce qui rend le rendez-vous visible pour "
+"tout utilisateur du réseau où est partagé le calendrier. « Privé » signale un "
+"premier niveau de sécurité, et « Confidentiel » un niveau encore plus élevé. "
+"Les différents niveaux varient selon les paramètres du serveur ; adressez-"
+"vous à votre administrateur système ou ajustez vos paramètres de délégation."
 
-#: ../C/evolution.xml:3912(para)
+#: ../C/evolution.xml:3932(para)
 msgid ""
 "If you are using a Novell GroupWise or Microsoft Exchange server, other "
 "people on the server can check your schedule to see if you are available at "
@@ -9346,15 +9335,13 @@ msgstr ""
 "d'occupée, cochez la case « Libre » dans la section « Afficher la période "
 "comme ». Normalement, les rendez-vous sont signalés occupés."
 
-#: ../C/evolution.xml:3913(para)
-msgid "You can categorize appointments in the same way you can categorize contacts."
-msgstr "Vous pouvez attribuer des catégories aux rendez-vous comme pour les contacts."
-
-#: ../C/evolution.xml:3916(para)
-msgid "Type a category in the Categories field."
-msgstr "Saisissez une catégorie dans le champ Catégories."
+#: ../C/evolution.xml:3933(para)
+msgid ""
+"You can categorize appointments in the same way you can categorize contacts."
+msgstr ""
+"Vous pouvez attribuer des catégories aux rendez-vous comme pour les contacts."
 
-#: ../C/evolution.xml:3919(para)
+#: ../C/evolution.xml:3939(para)
 msgid ""
 "Select the check box next to each category that matches the appointment you "
 "are creating."
@@ -9362,23 +9349,16 @@ msgstr ""
 "Cochez la case en regard de chaque catégorie qui correspond au rendez-vous "
 "en cours d'édition."
 
-#: ../C/evolution.xml:3922(para) ../C/evolution.xml:4413(para)
-#: ../C/evolution.xml:4629(para)
-msgid "To show or hide Categories field, click View &gt; Categories."
-msgstr ""
-"Pour afficher ou masquer le champ Catégories, choisissez Affichage &gt; "
-"Catégories."
-
-#: ../C/evolution.xml:3926(para)
+#: ../C/evolution.xml:3946(para)
 msgid ""
 "You can add a new category to your category list by clicking Edit Master "
 "Category List, then click Click Here To Add A Category."
 msgstr ""
 "Vous pouvez ajouter une nouvelle catégorie dans la liste en cliquant sur "
-"« Éditer la liste maître des catégories », puis cliquez sur « Cliquez ici "
-"pour ajouter une catégorie »."
+"« Éditer la liste maître des catégories », puis cliquez sur « Cliquez ici pour "
+"ajouter une catégorie »."
 
-#: ../C/evolution.xml:3928(para)
+#: ../C/evolution.xml:3948(para)
 msgid ""
 "After you have selected your categories, click OK to assign these categories "
 "to the appointment. The categories you selected are now listed in the text "
@@ -9388,53 +9368,53 @@ msgstr ""
 "ces catégories au rendez-vous. Les catégories sélectionnées apparaissent "
 "dorénavant dans la zone de texte à droite du bouton Catégories."
 
-#: ../C/evolution.xml:3929(para)
+#: ../C/evolution.xml:3949(para)
 msgid ""
 "Appointments with categories appear with icons in the calendar display, and "
 "you can also search for appointments by category. To display only the "
-"appointments in a particular category, select Category Is in the search bar "
-"at the top of the calendar, and select a category."
+"appointments in a particular category, select the corresponding category in "
+"the search bar at the top of the calendar."
 msgstr ""
 "Les rendez-vous avec catégories apparaissent avec des icônes dans "
 "l'affichage du calendrier, et vous pouvez également chercher des rendez-vous "
-"par catégorie. Pour afficher unqiuement les rendez-vous d'une catégorie "
-"particulière, sélectionnez «La catégorie est  » dans la barre de recherche "
-"au sommet du calendrier, et sélectionnez une catégorie."
+"par catégorie. Pour afficher uniquement les rendez-vous d'une catégorie "
+"particulière, sélectionnez la catégorie correspondante dans la barre de "
+"recherche au sommet du calendrier."
 
-#: ../C/evolution.xml:3934(para)
+#: ../C/evolution.xml:3954(para)
 msgid ""
 "The Recurrence tool button lets you describe repetition in appointments "
 "ranging from once every day up to once every 100 years. You can then choose "
 "a time and date when the appointment stops recurring, and, under Exceptions, "
 "pick individual days when the appointment does not recur. Make your "
-"selections from left to right, and you form a sentence: “Every two weeks on "
-"Monday and Friday until January 3, 2008” or “Every month on the first Friday "
-"for 12 occurrences.”"
+"selections from left to right, and you form a sentence: <quote>Every two "
+"weeks on Monday and Friday until January 3, 2008</quote> or <quote>Every "
+"month on the first Friday for 12 occurrences.</quote>"
 msgstr ""
 "Le bouton de barre d'outils Récurrence vous permet de définir des rendez-"
 "vous répétitifs allant de une fois par jour à tous les 100 ans. Vous pouvez "
 "ensuite choisir une heure et une date de fin de récurrence, et, sous "
 "Exceptions, choisir des jours précis où le rendez-vous n'a pas lieu. Faites "
 "votre sélection de gauche à droite, et vous formerez une phrase : « Toutes "
-"les deux semaines le lundi et le vendredi jusqu'au 3 janvier 2008 » ou "
-"« Tous les mois, le premier vendredi durant 12 fois »."
+"les deux semaines le lundi et le vendredi jusqu'au 3 janvier 2008 » ou « Tous "
+"les mois, le premier vendredi durant 12 fois »."
 
-#: ../C/evolution.xml:3935(para)
+#: ../C/evolution.xml:3955(para)
 msgid ""
-"After you have finished settings, click the disk icon in the toolbar to save "
-"and close the appointment editor window. If you want, you can alter an "
+"After you have finished settings, click the Save button in the toolbar to "
+"save and close the appointment editor window. If you want, you can alter an "
 "appointment summary in the calendar view by clicking it and typing. You can "
 "change other settings by right-clicking the appointment then choosing Open, "
 "or double-clicking the appointment."
 msgstr ""
-"Après avoir terminé vos réglages, cliquez sur l'icône de disque dans la "
+"Après avoir terminé vos réglages, cliquez sur le bouton Enregistrer dans la "
 "barre d'outils pour enregistrer et fermer la fenêtre d'édition de rendez-"
 "vous. Si vous le souhaitez, vous pouvez modifier le résumé d'un rendez-vous "
 "dans l'affichage du calendrier en cliquant dessus et en écrivant. Vous "
 "pouvez modifier les autres paramètres en faisant un clic droit sur le rendez-"
 "vous et en choisissant Ouvrir, ou en double-cliquant sur le rendez-vous."
 
-#: ../C/evolution.xml:3941(para)
+#: ../C/evolution.xml:3961(para)
 msgid ""
 "A meeting is an event you schedule for multiple people. Evolution can be "
 "used to schedule group meetings and help you manage responses to meeting "
@@ -9444,12 +9424,13 @@ msgstr ""
 "Evolution peut être utilisé pour planifier des réunions de groupe et pour "
 "vous aider à gérer les réponses aux requêtes de réunion."
 
-#: ../C/evolution.xml:3942(para)
+#: ../C/evolution.xml:3962(para)
 msgid ""
 "When you create a meeting or group appointment, you can specify the "
-"attendees in several categories, such as “chair” or “required.” When you "
-"save the meeting listing, each attendee is sent an e-mail with the meeting "
-"information, which also gives them the option to respond."
+"attendees in several categories, such as <quote>chair</quote> or "
+"<quote>required.</quote> When you save the meeting listing, each attendee is "
+"sent an email with the meeting information, which also gives them the option "
+"to respond."
 msgstr ""
 "Lorsque vous créez une réunion ou un rendez-vous de groupe, vous pouvez "
 "indiquer des participants dans plusieurs catégories, comme « Président » ou "
@@ -9457,61 +9438,58 @@ msgstr ""
 "reçoit un courriel avec les informations de la réunion, leur donnant "
 "également la possibilité de répondre."
 
-#: ../C/evolution.xml:3943(para)
+#: ../C/evolution.xml:3963(para)
 msgid ""
 "If you don't need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
-"and select Forward as iCalendar. This opens a new e-mail message with the "
+"and select Forward as iCalendar. This opens a new email message with the "
 "event notification attached as an announcement. Recipients can add the event "
-"to their calendars with one click, but it won't automatically send you e-"
-"mail about whether they plan to attend."
+"to their calendars with one click, but it won't automatically send you email "
+"about whether they plan to attend."
 msgstr ""
 "Si vous ne souhaitez pas recevoir d'informations sur la participation "
 "lorsque vous planifiez un événement, et que vous souhaitez uniquement "
 "annoncer l'événement, faites un clic droit sur la réunion et choisissez "
-"« Faire suivre comme iCalendar ». Cela ouvre un nouveau courriel contenant "
-"la notification de l'événement en pièce jointe. Les destinataires peuvent "
+"« Faire suivre comme iCalendar ». Cela ouvre un nouveau courriel contenant la "
+"notification de l'événement en pièce jointe. Les destinataires peuvent "
 "ajouter l'événement dans leur calendrier par un seul clic, mais cela ne vous "
 "enverra pas automatiquement un courriel pour vous signaler s'ils "
 "participeront ou pas."
 
-#: ../C/evolution.xml:3944(para)
+#: ../C/evolution.xml:3964(para)
 msgid "To schedule a meeting:"
 msgstr "Pour planifier une réunion :"
 
-#: ../C/evolution.xml:3947(para) ../C/evolution.xml:4052(para)
+#: ../C/evolution.xml:3967(para) ../C/evolution.xml:4077(para)
 msgid "Click File &gt; New &gt; Meeting."
 msgstr "Cliquez sur Fichier &gt; Nouveau &gt; Réunion."
 
-#: ../C/evolution.xml:3950(para) ../C/evolution.xml:4391(para)
+#: ../C/evolution.xml:3970(para) ../C/evolution.xml:4416(para)
 msgid ""
-"If you have multiple e-mail accounts, select the one to use by selecting an "
+"If you have multiple email accounts, select the one to use by selecting an "
 "item in the Organizer field."
 msgstr ""
 "Si vous avez plusieurs comptes de messagerie, sélectionnez celui que vous "
 "voulez utiliser en sélectionnant un élément dans le champ Organisateur."
 
-#: ../C/evolution.xml:3953(para)
-msgid "Select a calendar in the Calendar drop-down list."
-msgstr "Sélectionnez un calendrier dans la liste déroulante Calendrier."
-
-#: ../C/evolution.xml:3956(para) ../C/evolution.xml:4055(para)
-msgid "Click Add to add the e-mail addresses of people you want to invite."
+#: ../C/evolution.xml:3976(para) ../C/evolution.xml:4080(para)
+msgid "Click Add to add the email addresses of people you want to invite."
 msgstr ""
 "Cliquez sur Ajouter pour ajouter les adresses électroniques des personnes "
 "que vous souhaitez inviter."
 
-#: ../C/evolution.xml:3959(para)
-msgid "To remove an attendee from the list, select an attendee and press Remove."
+#: ../C/evolution.xml:3979(para)
+msgid ""
+"To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 "Pour enlever un participant dans la liste, sélectionnez-le et cliquez sur "
 "Enlever."
 
-#: ../C/evolution.xml:3962(para)
+#: ../C/evolution.xml:3982(para)
 msgid "To edit a field, select the field and click Edit."
 msgstr "Pour éditer un champ, sélectionnez-le et cliquez sur Édition."
 
-#: ../C/evolution.xml:3965(para)
+#: ../C/evolution.xml:3985(para)
 msgid ""
 "Click View on the menu bar to show or hide the Type, Role, Status, and RSVP "
 "fields."
@@ -9519,62 +9497,7 @@ msgstr ""
 "Choisissez Affichage dans la barre de menus pour afficher ou masquer les "
 "champs Type, Rôle, État et RSVP."
 
-#: ../C/evolution.xml:3968(para)
-msgid "Type summary of the meeting in the Summary field."
-msgstr "Saisissez le résumé de la réunion dans le champ Résumé."
-
-#: ../C/evolution.xml:3971(para)
-msgid "Type a location for the meeting in the Location field."
-msgstr "Saisissez le lieu de la réunion dans le champ Emplacement."
-
-#: ../C/evolution.xml:3974(para)
-msgid ""
-"To select this meeting as an all day event, click the All Day Event button "
-"on the toolbar."
-msgstr ""
-"Pour sélectionner cette réunion comme un événement d'une journée entière, "
-"cliquez sur le bouton « Toute la journée » dans la barre d'outils."
-
-#: ../C/evolution.xml:3977(para)
-msgid "If the event is an all day event, specify a starting date and an ending date."
-msgstr ""
-"Si c'est un événement d'une journée entière, indiquez une date de début et "
-"une date de fin."
-
-#: ../C/evolution.xml:3980(para)
-msgid ""
-"If the event is not an all day event, specify a starting time and an ending "
-"time."
-msgstr ""
-"Si ce n'est pas un événement d'une journée entière, indiquez une heure de "
-"début et une heure de fin."
-
-#: ../C/evolution.xml:3983(para)
-msgid ""
-"Select For to specify the duration or select Until to specify the ending "
-"time of the event."
-msgstr ""
-"Choisissez « pour » pour indiquer une durée ou « jusqu'à » pour indiquer "
-"l'heure de fin de l'événement."
-
-#: ../C/evolution.xml:3992(para)
-msgid ""
-"(Optional) To set an alarm for this meeting, click Alarms on the toolbar, "
-"then specify when and how you want to the alarm to notify you."
-msgstr ""
-"(facultatif) Pour choisir une alarme pour cette réunion, cliquez sur Alarmes "
-"dans la barre d'outils, et indiquez quand et comment la notification "
-"d'alarme doit être faite."
-
-#: ../C/evolution.xml:3993(para)
-msgid ""
-"For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
-"link>."
-msgstr ""
-"Pour plus d'informations sur les rappels, consultez <link linkend=\"bshly4v"
-"\">Rappels</link>."
-
-#: ../C/evolution.xml:4009(para)
+#: ../C/evolution.xml:4034(para)
 msgid ""
 "To query free/busy information for the attendees, click the Free/Busy button "
 "on the toolbar."
@@ -9582,36 +9505,39 @@ msgstr ""
 "Pour interroger les informations de disponibilité des participants, cliquez "
 "sur le bouton Libre/Occupé dans la barre d'outils."
 
-#: ../C/evolution.xml:4011(para)
+#: ../C/evolution.xml:4036(para)
 msgid "Click Options &gt; Free/Busy."
 msgstr "Choisissez Options &gt; Libre/Occupé."
 
-#: ../C/evolution.xml:4014(para)
+#: ../C/evolution.xml:4039(para)
 msgid "Click Save to save the meeting."
 msgstr "Cliquez sur Enregistrer pour enregistrer la réunion."
 
-#: ../C/evolution.xml:4017(para)
-msgid "An e-mail is sent out to all the recipients, inviting them to your event."
-msgstr "Un courriel est envoyé à tous les participants, les invitant à l'événement."
+#: ../C/evolution.xml:4042(para)
+msgid ""
+"An email is sent out to all the recipients, inviting them to your event."
+msgstr ""
+"Un courriel est envoyé à tous les participants, les invitant à l'événement."
 
-#: ../C/evolution.xml:4019(para)
+#: ../C/evolution.xml:4044(para)
 msgid ""
-"A meeting can have only one organizer, and only the organizer can add "
-"participants. You can designate yourself the organizer of the meeting, but "
-"if you are not the original organizer, you can create confusion in the "
-"scheduling process. If you want to invite additional people to a meeting "
-"without changing the organizer, it is best to forward the first organizer's "
-"message to the additional participants."
+"In Evolution, a meeting can have only one organizer, and only the organizer "
+"can add participants to that meeting. Though it is possible to change the "
+"organizer of a meeting, this is not recommended as a means to invite "
+"additional participants to meetings. If you want to invite additional people "
+"to a meeting and are not that meeting's organizer, it is recommended that "
+"you forward the invitation message you received from the original meeting "
+"organiser to additional participants."
 msgstr ""
-"Une réunion ne peut avoir qu'un seul organisateur, et c'est lui seul qui "
-"peut ajouter des participants. Vous pouvez désigner vous-même l'organisateur "
-"de la réunion, mais si vous n'êtes pas l'organisateur d'origine, vous pouvez "
-"créer de la confusion sur le processus de planification. Si vous souhaitez "
-"inviter des personnes supplémentaires à une réunion sans changer "
-"d'organisateur, la meilleure solution est de faire suivre le message "
-"originel de l'organisateur à ces personnes."
+"Dans Evolution, une réunion ne peut avoir qu'un seul organisateur, et c'est "
+"lui seul qui peut ajouter des participants à la réunion. Bien qu'il soit "
+"possible de changer l'organisateur d'une réunion, ce n'est pas la manière "
+"recommandée d'inviter des participants supplémentaires aux réunions. Si vous "
+"souhaitez inviter des personnes supplémentaires à une réunion et que vous "
+"n'en êtes pas l'organisateur, la meilleure solution est de faire suivre le "
+"message d'invitationoriginel de l'organisateur à ces personnes."
 
-#: ../C/evolution.xml:4025(para)
+#: ../C/evolution.xml:4050(para)
 msgid ""
 "Meeting requests are sent as iCal attachments. To view or respond to one, "
 "click the attachment icon and view it inline in the mail window. All the "
@@ -9624,27 +9550,27 @@ msgstr ""
 "apparaissent, y compris l'heure et la date. Vous pouvez alors choisir "
 "comment répondre à l'invitation. Les choix sont :"
 
-#: ../C/evolution.xml:4028(para)
+#: ../C/evolution.xml:4053(para)
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../C/evolution.xml:4031(para)
+#: ../C/evolution.xml:4056(para)
 msgid "Tentatively Accept"
 msgstr "Accepter provisoirement"
 
-#: ../C/evolution.xml:4034(para)
+#: ../C/evolution.xml:4059(para)
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../C/evolution.xml:4037(para)
+#: ../C/evolution.xml:4062(para)
 msgid ""
-"Click OK to send an e-mail to the organizer with your answer. The event is "
+"Click OK to send an email to the organizer with your answer. The event is "
 "also added to your calendar if you accept."
 msgstr ""
 "Cliquez sur Valider pour envoyer un courriel à l'organisateur avec votre "
 "réponse. L'événement est aussi ajouté à votre calendrier si vous l'acceptez."
 
-#: ../C/evolution.xml:4038(para)
+#: ../C/evolution.xml:4063(para)
 msgid ""
 "After you add the meeting to your calendar, you can make changes to the "
 "information, but if the original organizer sends out another update, your "
@@ -9654,18 +9580,16 @@ msgstr ""
 "informations, mais si l'organisateur original envoie une mise à jour, il se "
 "peut que vos modifications soient écrasées."
 
-#: ../C/evolution.xml:4043(para)
+#: ../C/evolution.xml:4068(para)
 msgid ""
 "When you get a reply to a meeting invitation you sent, you can view it "
-"inline by clicking the attachment and selecting View Inline. At the bottom, "
-"you can click OK to update your attendee list."
+"inline by clicking the attachment and selecting View Inline."
 msgstr ""
 "Lorsque vous recevez une réponse à une invitation de réunion que vous avez "
 "envoyée, vous pouvez la voir dans le message en cliquant sur la pièce jointe "
-"et en choisissant « Afficher dans le corps ». Au bas de l'élément, vous "
-"pouvez cliquer sur Valider pour mettre à jour la liste des participants."
+"et en choisissant « Afficher dans le corps »."
 
-#: ../C/evolution.xml:4048(para)
+#: ../C/evolution.xml:4073(para)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -9687,22 +9611,23 @@ msgstr ""
 "tout de même utiliser les invitations à des événements avec iCal pour "
 "coordonner la planification d'événements avec d'autres personnes."
 
-#: ../C/evolution.xml:4049(para)
+#: ../C/evolution.xml:4074(para)
 msgid "To access the free/busy view:"
 msgstr "Pour accéder à l'affichage Libre/Occupé :"
 
-#: ../C/evolution.xml:4058(para)
-msgid "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
+#: ../C/evolution.xml:4083(para)
+msgid ""
+"Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
 msgstr ""
 "Cliquez sur le bouton Libre/Occupé dans la barre d'outils ou choisissez "
 "Options &gt; Libre/Occupé."
 
-#: ../C/evolution.xml:4063(para)
+#: ../C/evolution.xml:4088(para)
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
 "the Autopick buttons to choose a time automatically, then click Save and "
 "Close. Attendees on an Exchange server have the appointment updated "
-"automatically; others receive e-mail notification of any change in plans."
+"automatically; others receive email notification of any change in plans."
 msgstr ""
 "Affinez les horaires de la réunion, soit en glissant les bords de la "
 "réunion, soit en utilisant les boutons de choix automatique pour choisir "
@@ -9711,19 +9636,20 @@ msgstr ""
 "participants invités ; dans les autres cas, un courriel de notification de "
 "mise à jour est envoyé aux particpants."
 
-#: ../C/evolution.xml:4067(title)
+#: ../C/evolution.xml:4092(title)
 msgid "Attendee List:"
 msgstr "Liste des participants :"
 
-#: ../C/evolution.xml:4068(para)
-msgid "The Attendee List shows the people who have been invited to the appointment."
+#: ../C/evolution.xml:4093(para)
+msgid ""
+"The Attendee List shows the people who have been invited to the appointment."
 msgstr "La liste des participants montre les personnes invitées à la réunion."
 
-#: ../C/evolution.xml:4071(title)
+#: ../C/evolution.xml:4096(title)
 msgid "Schedule Grid:"
 msgstr "Grille horaire :"
 
-#: ../C/evolution.xml:4072(para)
+#: ../C/evolution.xml:4097(para)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -9742,7 +9668,7 @@ msgstr ""
 "publiées à un URL accessible et que vous l'avez saisi dans leur carte de "
 "contact avec l'éditeur de contact."
 
-#: ../C/evolution.xml:4077(para)
+#: ../C/evolution.xml:4102(para)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV, FTP server, "
 "or remote machine through secure shell or other Web server with HTTP PUT "
@@ -9755,15 +9681,16 @@ msgstr ""
 "administrateur système si vous n'êtes pas certain de disposer de cette "
 "fonctionnalité."
 
-#: ../C/evolution.xml:4078(para)
+#: ../C/evolution.xml:4103(para)
 msgid "To set up Calendar or Free/Busy publishing:"
 msgstr "Pour configurer la publication de calendrier ou de disponibilité :"
 
-#: ../C/evolution.xml:4081(para) ../C/evolution.xml:4816(para)
+#: ../C/evolution.xml:4106(para) ../C/evolution.xml:4840(para)
 msgid "Click Edit &gt; Preferences, then click Calendar and Tasks."
-msgstr "Choisissez Édition &gt; Préférences, puis cliquez sur Calendrier et tâches."
+msgstr ""
+"Choisissez Édition &gt; Préférences, puis cliquez sur Calendrier et tâches."
 
-#: ../C/evolution.xml:4084(para)
+#: ../C/evolution.xml:4109(para)
 msgid ""
 "Click the Calendar Publishing tab, click Add, then select the information "
 "you want to publish."
@@ -9771,23 +9698,23 @@ msgstr ""
 "Cliquez sur l'onglet Publication de calendrier, cliquez sur Ajouter, puis "
 "sélectionnez l'information que vous souhaitez publier."
 
-#: ../C/evolution.xml:4087(para)
+#: ../C/evolution.xml:4112(para)
 msgid "Select the frequency with which you want to upload data."
 msgstr "Choisissez la fréquence de publication des données."
 
-#: ../C/evolution.xml:4090(para)
+#: ../C/evolution.xml:4115(para)
 msgid "Select the calendars you want to display data for."
 msgstr "Sélectionnez les calendriers dont vous voulez publier les données."
 
-#: ../C/evolution.xml:4093(para)
+#: ../C/evolution.xml:4118(para)
 msgid "Specify the publishing location for the upload server."
 msgstr "Indiquez l'emplacement de publication du serveur distant."
 
-#: ../C/evolution.xml:4096(para)
+#: ../C/evolution.xml:4121(para)
 msgid "Type your username and password."
 msgstr "Saisissez votre nom d'utilisateur et votre mot de passe."
 
-#: ../C/evolution.xml:4102(para)
+#: ../C/evolution.xml:4127(para)
 msgid ""
 "To immediately publish calendar information, go to the Calendar tool and "
 "click Actions &gt; Publish Calendar Information."
@@ -9796,15 +9723,13 @@ msgstr ""
 "l'outil Calendriers et choisissez Actions &gt; Publier l'information "
 "iCalendar."
 
-#: ../C/evolution.xml:4104(para)
-msgid ""
-"Evolution allows you to specify a template to use when posting to the Free/"
-"Busy server."
+#: ../C/evolution.xml:4129(para) ../C/evolution.xml:6706(para)
+msgid "You can specify a template to use when posting to the Free/Busy server."
 msgstr ""
-"Evolution vous permet d'indiquer un modèle à utiliser lors de la publication "
-"vers un serveur de disponibilité."
+"Vous pouvez indiquer un modèle à utiliser lors de la publication vers un "
+"serveur de disponibilité."
 
-#: ../C/evolution.xml:4110(para)
+#: ../C/evolution.xml:4135(para)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their Web calendar, "
 "you can enter it as part of the contact information in the Contacts tool. "
@@ -9817,163 +9742,116 @@ msgstr ""
 "eux, Evolution consulte leur agenda et l'affiche dans les informations de "
 "disponibilité."
 
-#: ../C/evolution.xml:4119(para)
+#: ../C/evolution.xml:4142(para)
 msgid ""
-"Evolution enables you to find the Calender items by using Customized Search. "
-"To start searching for various calendar items, use the following procedure:"
+"You can use a customized search, an advanced search, or a quick search to "
+"search for Calendar items."
 msgstr ""
-"Evolution vous permet de chercher des éléments de calendrier en utilisant la "
-"recherche personnalisée. Pour initier une recherche de divers éléments de "
-"calendrier, utilisez la procédure suivante :"
+"Vous pouvez utiliser une recherche personnalisée, une recherche avancée ou "
+"une recherche rapide pour rechercher des éléments de calendrier."
 
-#: ../C/evolution.xml:4123(para) ../C/evolution.xml:4440(para)
-#: ../C/evolution.xml:4675(para)
+#: ../C/evolution.xml:4145(para)
 msgid ""
-"Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"stock_search.png\"/> to expand the drop-down list"
+"Evolution enables you to find the Calendar items by using a Customized "
+"Search."
 msgstr ""
-"Cliquez sur l'icône de recherche <inlinegraphic format=\"PNG\" fileref="
-"\"figures/stock_search.png\"/> pour ouvrir la liste déroulante."
-
-#: ../C/evolution.xml:4126(para) ../C/evolution.xml:4443(para)
-#: ../C/evolution.xml:4678(para)
-msgid "Select the search type:"
-msgstr "Sélectionnez le type de recherche :"
+"Evolution vous permet de chercher des éléments de calendrier en utilisant "
+"une recherche personnalisée."
 
-#: ../C/evolution.xml:4129(para) ../C/evolution.xml:4446(para)
-#: ../C/evolution.xml:4681(para)
+#: ../C/evolution.xml:4155(para) ../C/evolution.xml:4471(para)
+#: ../C/evolution.xml:4707(para)
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: ../C/evolution.xml:4132(para) ../C/evolution.xml:4449(para)
-#: ../C/evolution.xml:4684(para)
+#: ../C/evolution.xml:4158(para) ../C/evolution.xml:4474(para)
+#: ../C/evolution.xml:4710(para)
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../C/evolution.xml:4135(para) ../C/evolution.xml:4452(para)
-#: ../C/evolution.xml:4687(para)
+#: ../C/evolution.xml:4161(para) ../C/evolution.xml:4477(para)
+#: ../C/evolution.xml:4713(para)
 msgid "Any field Contains"
 msgstr "N'importe quel champ contient"
 
-#: ../C/evolution.xml:4140(para) ../C/evolution.xml:4692(para)
+#: ../C/evolution.xml:4166(para) ../C/evolution.xml:4718(para)
 msgid "Evolution displays the desired Calendar items."
 msgstr "Evolution affiche les éléments de calendrier souhaités."
 
-#: ../C/evolution.xml:4145(para) ../C/evolution.xml:4462(para)
-#: ../C/evolution.xml:4697(para)
-msgid ""
-"You can perform an advanced search based on any of the search type mentioned "
-"above."
-msgstr ""
-"Vous pouvez effectuer une recherche avancée sur la base de n'importe quel "
-"type de recherche mentionné ci-dessus."
-
-#: ../C/evolution.xml:4147(para) ../C/evolution.xml:4464(para)
-#: ../C/evolution.xml:4699(para)
-msgid "To perform an advanced search:"
-msgstr "Pour effectuer une recherche avancée :"
-
-#: ../C/evolution.xml:4150(para) ../C/evolution.xml:4702(para)
-msgid "Select the desired search type from the drop-down list."
-msgstr "Choisissez le type de recherche souhaité dans la liste déroulante."
-
-#: ../C/evolution.xml:4153(para) ../C/evolution.xml:4467(para)
-#: ../C/evolution.xml:4705(para)
-msgid "Select Advanced Search to open Advanced Search dialogue box."
+#: ../C/evolution.xml:4178(para) ../C/evolution.xml:4492(para)
+#: ../C/evolution.xml:4730(para)
+msgid "Select Advanced Search to open Advanced Search dialog box."
 msgstr ""
 "Choisissez Recherche avancée afin d'ouvrir la boîte de dialogue Recherche "
 "avancée."
 
-#: ../C/evolution.xml:4154(para) ../C/evolution.xml:4468(para)
-#: ../C/evolution.xml:4706(para)
+#: ../C/evolution.xml:4179(para) ../C/evolution.xml:4493(para)
+#: ../C/evolution.xml:4731(para)
 msgid "Search name field displays the search type you have selected."
-msgstr "Le champ Nom de recherche affiche le type de recherche que vous avez choisi."
+msgstr ""
+"Le champ Nom de recherche affiche le type de recherche que vous avez choisi."
 
-#: ../C/evolution.xml:4159(para) ../C/evolution.xml:4473(para)
-#: ../C/evolution.xml:4711(para)
+#: ../C/evolution.xml:4184(para) ../C/evolution.xml:4498(para)
+#: ../C/evolution.xml:4736(para)
 msgid "Click Add to add rules."
 msgstr "Cliquez sur Ajouter pour ajouter des règles."
 
-#: ../C/evolution.xml:4162(para) ../C/evolution.xml:4476(para)
-#: ../C/evolution.xml:4714(para)
-msgid "Select the criteria and then, type a search entry in the given field."
+#: ../C/evolution.xml:4187(para) ../C/evolution.xml:4501(para)
+#: ../C/evolution.xml:4739(para)
+msgid "Select the criteria, and then type a search entry in the given field."
 msgstr ""
 "Sélectionnez un critère puis saisissez un terme de recherche dans le champ "
 "correspondant."
 
-#: ../C/evolution.xml:4168(para) ../C/evolution.xml:4720(para)
+#: ../C/evolution.xml:4193(para) ../C/evolution.xml:4745(para)
 msgid "Click Save to save your search results."
 msgstr "Cliquez sur Enregistrer pour conserver les résultats de la recherche."
 
-#: ../C/evolution.xml:4173(para)
+#: ../C/evolution.xml:4198(para)
 msgid ""
-"Displays all the Calendar items that match the in-built criteria that you "
-"have selected from the drop-down list in the Search bar."
+"Displays all the Calendar items that match the criteria that you have "
+"selected from the drop-down list in the Search bar."
 msgstr ""
-"Affiche tous les éléments de calendrier correspondant aux critères "
-"prédéfinis que vous avez sélectionnés dans la liste déroulante de la barre "
-"de recherche."
+"Affiche tous les éléments de calendrier correspondant aux critères que vous "
+"avez sélectionnés dans la liste déroulante de la barre de recherche."
 
-#: ../C/evolution.xml:4178(para) ../C/evolution.xml:4730(para)
+#: ../C/evolution.xml:4202(para) ../C/evolution.xml:4754(para)
 msgid "Click the Show drop-down list."
 msgstr "Cliquez sur la liste déroulante Afficher."
 
-#: ../C/evolution.xml:4181(para) ../C/evolution.xml:4522(para)
-#: ../C/evolution.xml:4733(para)
-msgid "Select the search criteria:"
-msgstr "Sélectionnez un critère de recherche :"
-
-#: ../C/evolution.xml:4184(para) ../C/evolution.xml:4525(para)
-#: ../C/evolution.xml:4736(para)
+#: ../C/evolution.xml:4208(para) ../C/evolution.xml:4550(para)
+#: ../C/evolution.xml:4760(para)
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: ../C/evolution.xml:4187(para) ../C/evolution.xml:4528(para)
-#: ../C/evolution.xml:4739(para)
+#: ../C/evolution.xml:4211(para) ../C/evolution.xml:4553(para)
+#: ../C/evolution.xml:4763(para)
 msgid "Unmatched"
 msgstr "Différent"
 
-#: ../C/evolution.xml:4190(para)
+#: ../C/evolution.xml:4214(para)
 msgid "Active Appointments"
 msgstr "Rendez-vous actuels"
 
-#: ../C/evolution.xml:4193(para)
+#: ../C/evolution.xml:4217(para)
 msgid "Next 7 Days' Appointments"
 msgstr "Rendez-vous des 7 prochains jours"
 
-#: ../C/evolution.xml:4208(para) ../C/evolution.xml:4558(para)
+#: ../C/evolution.xml:4232(para) ../C/evolution.xml:4583(para)
 msgid "Favourites"
 msgstr "Favoris"
 
-#: ../C/evolution.xml:4217(para) ../C/evolution.xml:4567(para)
-#: ../C/evolution.xml:4763(para)
-msgid "Holidays"
-msgstr "Vacances"
-
-#: ../C/evolution.xml:4229(para) ../C/evolution.xml:4579(para)
-#: ../C/evolution.xml:4775(para)
-msgid "Key Customers"
-msgstr "Clients clés"
-
-#: ../C/evolution.xml:4250(para) ../C/evolution.xml:4600(para)
-#: ../C/evolution.xml:4796(para)
-msgid "Time &amp; Expenses"
-msgstr "Temps &amp; dépenses"
-
-#: ../C/evolution.xml:4261(para)
-msgid "You can view the desired items listed in the Calender view."
-msgstr "Vous voyez apparaître les éléments souhaités dans l'affichage du calendrier."
+#: ../C/evolution.xml:4285(para)
+msgid "You can view the desired items listed in the Calendar view."
+msgstr ""
+"Vous voyez apparaître les éléments souhaités dans l'affichage du calendrier."
 
-#: ../C/evolution.xml:4266(para)
-msgid ""
-"To print the displayed calendar items, click File &gt; Print or right click "
-"on the calendar item &gt; Print."
+#: ../C/evolution.xml:4290(para)
+msgid "To print the displayed calendar items, click File &gt; Print."
 msgstr ""
 "Pour imprimer les éléments de calendrier affichés, choisissez Fichier &gt; "
-"Imprimer ou faites un clic droit sur un élément de calendrier et choisissez "
 "Imprimer."
 
-#: ../C/evolution.xml:4271(para)
+#: ../C/evolution.xml:4295(para)
 msgid ""
 "Keeping a list of everything you did in the past eventually slows down your "
 "calendar. To delete old events, click Actions &gt; Purge, then enter the "
@@ -9985,29 +9863,29 @@ msgstr ""
 "lesquels vous souhaitez conserver les éléments passés. Cliquez sur Valider "
 "pour effacer les éléments plus anciens."
 
-#: ../C/evolution.xml:4276(para)
+#: ../C/evolution.xml:4300(para)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr "Seuls les particpants à une réunion peuvent déléguer une réunion."
 
-#: ../C/evolution.xml:4279(para)
+#: ../C/evolution.xml:4303(para)
 msgid "In the Calendar, right-click the meeting you want to delegate."
 msgstr ""
 "Dans le calendrier, faites un clic droit sur la réunion que vous souhaitez "
 "déléguer."
 
-#: ../C/evolution.xml:4282(para)
-msgid "Click Delegate Meetings."
+#: ../C/evolution.xml:4306(para)
+msgid "Click Delegate Meeting."
 msgstr "Cliquez sur Déléguer une réunion."
 
-#: ../C/evolution.xml:4285(para)
+#: ../C/evolution.xml:4309(para)
 msgid "Select the contacts you want to delegate the meeting to."
 msgstr "Sélectionnez les contacts auxquels vous souhaitez déléguer la réunion."
 
-#: ../C/evolution.xml:4291(para)
-msgid "Each contact receives a copy of the meeting."
-msgstr "Chaque contact reçoit une copie de la réunion."
+#: ../C/evolution.xml:4315(para)
+msgid "Each contact receives a copy of the meeting invitation."
+msgstr "Chaque contact reçoit une copie de l'invitation à la réunion."
 
-#: ../C/evolution.xml:4296(para)
+#: ../C/evolution.xml:4320(para)
 msgid ""
 "To create a new calendar, click File &gt; New &gt; Calendar. If the calendar "
 "is one you plan to store locally, you need only provide a name and color. If "
@@ -10030,7 +9908,7 @@ msgstr ""
 "si vous utilisez le calendrier pour afficher l'agenda d'une équipe sportive, "
 "il semble suffisant de le rafraîchir une fois par semaine."
 
-#: ../C/evolution.xml:4297(para)
+#: ../C/evolution.xml:4321(para)
 msgid ""
 "The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has "
 "an extensive list of shared online calendars, including national and "
@@ -10042,37 +9920,42 @@ msgstr ""
 "nationaux et religieux, des phases lunaires, des événements sportifs et des "
 "événements locaux et régionaux."
 
-#: ../C/evolution.xml:4298(para)
+#: ../C/evolution.xml:4322(para)
 msgid ""
 "Evolution lets you view and manage calendars on remote CalDAV servers such "
-"as Hula®. For more information about Hula, see the <ulink url=\"http://www."
-"hula-project.org\">Hula Project Web site</ulink>. The procedure to create a "
-"CalDAV calendar source is similar to that of a remote Web calendar source. "
-"You can view and create calendar events on CalDav accounts just like other "
-"calendars on Evolution."
+"as <trademark class=\"registered\">Hula</trademark>. For more information "
+"about Hula, see the <ulink url=\"http://www.hula-project.org\">Hula Project "
+"Web site</ulink>. The procedure to create a CalDAV calendar source is "
+"similar to that of a remote Web calendar source. You can view and create "
+"calendar events on CalDav accounts just like other calendars on Evolution."
 msgstr ""
 "Evolution vous permet de visualiser et de gérer des calendriers sur des "
-"serveurs CalDAV distants tels que Hula&reg;. Pour plus d'informations sur "
-"Hula, consultez le <ulink url=\"http://www.hula-project.org\">site Web du "
-"projet Hula</ulink>. La procédure pour créer une source de calendrier CalDAV "
-"est identique à celle utilisée pour une source de calendrier Web distante. "
-"Vous pouvez afficher et créer des événements de calendrier sur des comptes "
-"CalDAV tout comme sur d'autres calendriers Evolution."
+"serveurs CalDAV distants tels que <trademark class=\"registered\">Hula</"
+"trademark>. Pour plus d'informations sur Hula, consultez le <ulink url="
+"\"http://www.hula-project.org\">site Web du projet Hula</ulink>. La "
+"procédure pour créer une source de calendrier CalDAV est identique à celle "
+"utilisée pour une source de calendrier Web distante. Vous pouvez afficher et "
+"créer des événements de calendrier sur des comptes CalDAV tout comme sur "
+"d'autres calendriers Evolution."
 
-#: ../C/evolution.xml:4303(para)
+#: ../C/evolution.xml:4327(para)
 msgid ""
-"The Task List, located in the lower-right corner of the calendar, lets you "
-"keep a list of tasks separate from your calendar appointments. You can use "
-"the list in a larger window by clicking the Tasks button in the switcher or "
-"in the folder tree."
+"The Task List, located in the upper-right corner of the calendar, lets you "
+"keep a list of tasks separate from your calendar appointments."
 msgstr ""
-"La liste des tâches, située dans le coin inférieur droit du calendrier, vous "
+"La liste des tâches, située dans le coin supérieur droit du calendrier, vous "
 "permet de conserver une liste de tâches indépendamment des rendez-vous du "
-"calendrier. Vous pouvez afficher cette liste dans une fenêtre lpus grande en "
-"cliquant sur le bouton Tâches dans le sélecteur ou dans l'arborescence des "
-"dossiers."
+"calendrier."
+
+#: ../C/evolution.xml:4328(para)
+msgid ""
+"You can use the list in a larger window by clicking the Tasks button in the "
+"side bar."
+msgstr ""
+"Vous pouvez afficher cette liste dans une fenêtre plus grande en cliquant "
+"sur le bouton Tâches dans la barre latérale."
 
-#: ../C/evolution.xml:4304(para)
+#: ../C/evolution.xml:4329(para)
 msgid ""
 "Task Lists are more easily organized in the dedicated Tasks tool. Each task "
 "list is assigned a color, and you can use the Tasks tool switcher to hide "
@@ -10086,39 +9969,40 @@ msgstr ""
 "de l'affichage du calendrier, les tâches de toutes les listes de tâches "
 "visibles apparaissent, avec leur couleur respective."
 
-#: ../C/evolution.xml:4307(link) ../C/evolution.xml:4318(title)
+#: ../C/evolution.xml:4332(link) ../C/evolution.xml:4343(title)
 msgid "Creating a New Task List"
 msgstr "Création d'une nouvelle liste de tâches"
 
-#: ../C/evolution.xml:4310(link) ../C/evolution.xml:4337(title)
+#: ../C/evolution.xml:4335(link) ../C/evolution.xml:4362(title)
 msgid "Creating a New Task"
 msgstr "Création d'une nouvelle tâche"
 
-#: ../C/evolution.xml:4313(link) ../C/evolution.xml:4382(title)
+#: ../C/evolution.xml:4338(link) ../C/evolution.xml:4407(title)
 msgid "Assigned Tasks"
 msgstr "Tâches attribuées"
 
-#: ../C/evolution.xml:4321(para)
+#: ../C/evolution.xml:4346(para)
 msgid "Click File &gt; New &gt; Task List."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Liste de tâches"
 
-#: ../C/evolution.xml:4324(para)
+#: ../C/evolution.xml:4349(para)
 msgid "Specify the name and color for the task list."
 msgstr "Indiquez le nom et la couleur de la liste de tâches."
 
-#: ../C/evolution.xml:4327(para)
-msgid "(Optional) If the task is an online list, specify the URL of the task list."
+#: ../C/evolution.xml:4352(para)
+msgid ""
+"(Optional) If the task is an online list, specify the URL of the task list."
 msgstr ""
 "(facultatif) Si la liste est publiée en ligne, indiquez l'URL de la liste de "
 "tâches."
 
-#: ../C/evolution.xml:4333(para)
+#: ../C/evolution.xml:4358(para)
 msgid ""
 "After you have added a task to your to-do list, its summary appears in the "
 "Summary section of the task list. To view or edit a detailed description of "
 "an item, double-click it, or right-click it and select Open. You can delete "
-"items by selecting them, then clicking Delete.The list of tasks is sorted in "
-"a similar way to the list of e-mail messages in Evolution Mail. Click once "
+"items by selecting them, then clicking Delete. The list of tasks is sorted "
+"in a similar way to the list of email messages in Evolution Mail. Click once "
 "on a message header to change the direction and type of sorting, or right-"
 "click to add or remove columns from the display."
 msgstr ""
@@ -10132,50 +10016,34 @@ msgstr ""
 "modifier l'ordre et le type de tri, ou utilisez le clic droit pour ajouter "
 "ou enlever des colonnes de l'affichage."
 
-#: ../C/evolution.xml:4340(para)
-msgid "Click New &gt; Task."
-msgstr "Cliquez sur Nouveau &gt; Tâche."
+#: ../C/evolution.xml:4365(para)
+msgid "Click File &gt; New &gt; Task."
+msgstr "Choisissez Fichier &gt; Nouveau &gt; Tâche."
 
-#: ../C/evolution.xml:4343(para) ../C/evolution.xml:4394(para)
+#: ../C/evolution.xml:4368(para) ../C/evolution.xml:4419(para)
 msgid "Select a group for the task."
 msgstr "Sélectionnez un groupe pour la tâche."
 
-#: ../C/evolution.xml:4346(para)
-msgid "Type a brief summary for the task in the Summary field."
-msgstr "Saisissez un bref résumé de la tâche dans le champ Résumé."
-
-#: ../C/evolution.xml:4349(para)
-msgid "(Optional) Specify a starting date and ending date for the task"
-msgstr "(facultatif) Indiquez une date de début et une date de fin pour la tâche."
-
-#: ../C/evolution.xml:4352(para)
-msgid "(Optional) Specify a starting time and ending time for the task"
-msgstr "(facultatif) Indiquez une heure de début et une heure de fin pour la tâche."
-
-#: ../C/evolution.xml:4361(para) ../C/evolution.xml:4412(para)
-#: ../C/evolution.xml:4628(para)
-msgid "(Optional) Type a category in the Categories field."
-msgstr "(facultatif) Saisissez une catégorie dans le champ Catégories."
-
-#: ../C/evolution.xml:4362(para)
-msgid "To show or hide the Categories field, click View &gt; Categories."
+#: ../C/evolution.xml:4374(para)
+msgid "(Optional) Specify a starting date and ending date for the task."
 msgstr ""
-"Pour afficher ou masquer le champ Catégories, choisissez Affichage &gt; "
-"Catégories."
+"(facultatif) Indiquez une date de début et une date de fin pour la tâche."
 
-#: ../C/evolution.xml:4365(para) ../C/evolution.xml:4416(para)
-msgid "Type a description for the task."
-msgstr "Saisissez une description pour la tâche."
+#: ../C/evolution.xml:4377(para)
+msgid "(Optional) Specify a starting time and ending time for the task."
+msgstr ""
+"(facultatif) Indiquez une heure de début et une heure de fin pour la tâche."
 
-#: ../C/evolution.xml:4368(para) ../C/evolution.xml:4424(para)
+#: ../C/evolution.xml:4393(para) ../C/evolution.xml:4449(para)
+#: ../C/evolution.xml:4671(para)
 msgid ""
 "(Optional) Click Options &gt; Classifications, then select a classification "
-"(as Public, Private or Confidential) for the task."
+"(as Public, Private or Confidential)."
 msgstr ""
 "(facultatif) Choisissez Options &gt; Classifications, puis sélectionnez une "
-"classification pour la tâche (Public, Privé ou Confidentiel)."
+"classification (Public, Privé ou Confidentiel)."
 
-#: ../C/evolution.xml:4371(para) ../C/evolution.xml:4427(para)
+#: ../C/evolution.xml:4396(para) ../C/evolution.xml:4452(para)
 msgid ""
 "(Optional) To specify a status for the task, click Options &gt; Status "
 "Details."
@@ -10183,49 +10051,34 @@ msgstr ""
 "(facultatif) Pour indiquer l'état d'une tâche, choisissez Options &gt; "
 "Détails de l'état."
 
-#: ../C/evolution.xml:4374(para)
-msgid ""
-"(Optional) To add an attachment to the task, drag and drop the attachment "
-"into the attachment bar."
-msgstr ""
-"(facultatif) Pour ajouter une pièce jointe à la tâche, faites glisser un "
-"fichier dans la barre des pièces jointes."
-
-#: ../C/evolution.xml:4376(para) ../C/evolution.xml:4421(para)
-#: ../C/evolution.xml:4643(para)
-msgid "Click the Attach button on the toolbar, then browse to the attachment."
-msgstr ""
-"Cliquez sur le bouton Joindre de la barre d'outils, puis sélectionnez une "
-"pièce jointe."
-
-#: ../C/evolution.xml:4383(para)
+#: ../C/evolution.xml:4408(para)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution permet d'attribuer des tâches à plusieurs personnes."
 
-#: ../C/evolution.xml:4384(para)
+#: ../C/evolution.xml:4409(para)
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
-"such as “chair” or “required.” When you save the task, each attendee is sent "
-"an e-mail with the task information, which also gives them the option to "
-"respond."
+"such as <quote>chair</quote> or <quote>required.</quote> When you save the "
+"task, each attendee is sent an email with the task information, which also "
+"gives them the option to respond."
 msgstr ""
 "Lorsque vous attribuez une tâche, vous pouvez indiquer les participants dans "
-"plusieurs catégories, telles que « présidents » ou « attendus ». Lorsque "
-"vous enregistrez la tâche, chaque participant reçoit un courriel avec les "
+"plusieurs catégories, telles que « présidents » ou « attendus ». Lorsque vous "
+"enregistrez la tâche, chaque participant reçoit un courriel avec les "
 "informations de la tâche, et leur donne également la possibilité de répondre."
 
-#: ../C/evolution.xml:4385(para)
+#: ../C/evolution.xml:4410(para)
 msgid "To assign a new task:"
 msgstr "Pour attribuer une nouvelle tâche :"
 
-#: ../C/evolution.xml:4388(para)
+#: ../C/evolution.xml:4413(para)
 msgid "Click File &gt; New &gt; Assigned Task."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Tâche attribuée."
 
-#: ../C/evolution.xml:4397(para)
+#: ../C/evolution.xml:4422(para)
 msgid ""
 "Click Add, or press Insert key, or right click and then press Add to add the "
-"e-mail addresses of people you want to assign the task.To remove an attendee "
+"email addresses of people you want to assign the task.To remove an attendee "
 "from the list, select an attendee, then press Remove.To edit a field, select "
 "the field, then click Edit.Click View on the menu bar to show or hide the "
 "Type, Role, Status, and RSVP fields."
@@ -10237,11 +10090,7 @@ msgstr ""
 "sélectionnez-le et cliquez sur Édition. Ouvrez le menu Affichage pour "
 "afficher ou masquer les champs Type, Rôle, État ou RSVP."
 
-#: ../C/evolution.xml:4400(para)
-msgid "Type a brief summary of the task in the Summary field."
-msgstr "Saisissez un bref résumé de la tâche dans le champ Résumé."
-
-#: ../C/evolution.xml:4403(para)
+#: ../C/evolution.xml:4428(para)
 msgid ""
 "(Optional) Specify a starting date and time, and a due date and time for the "
 "task."
@@ -10249,42 +10098,31 @@ msgstr ""
 "(facultatif) Indiquez une date et une heure de début, ainsi qu'une date et "
 "une heure d'échéance pour la tâche."
 
-#: ../C/evolution.xml:4419(para)
-msgid ""
-"(Optional) To add an attachment to the assigned task, drag and drop the "
-"attachment into the attachment bar."
-msgstr ""
-"(facultatif) Pour ajouter une pièce jointe à la tâche attribuée, faites "
-"glisser un fichier dans la barre des pièces jointes."
-
-#: ../C/evolution.xml:4433(title)
-msgid "Searching For Task Items"
+#: ../C/evolution.xml:4458(title)
+msgid "Searching for Task Items"
 msgstr "Recherche de tâches"
 
-#: ../C/evolution.xml:4436(para)
+#: ../C/evolution.xml:4461(para)
 msgid ""
-"Evolution enables you to find the task items by using Customized Search. To "
-"start searching for various task items, use the following procedure:"
+"Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 "Evolution vous permet de chercher des tâches en utilisant la recherche "
-"personnalisée. Pour initier une recherche de diverses tâches, utilisez la "
-"procédure suivante :"
+"personnalisée."
 
-#: ../C/evolution.xml:4457(para)
+#: ../C/evolution.xml:4482(para)
 msgid "Evolution displays the desired Task items."
 msgstr "Evolution affiche les tâches correspondantes."
 
-#: ../C/evolution.xml:4481(para)
+#: ../C/evolution.xml:4506(para)
 msgid ""
-"Displays all the task items that match the in-built criteria that you have "
-"selected from the drop-down list at the top left side, just above the "
-"display pane."
+"Displays all the task items that match the criteria that you have selected "
+"from the drop-down list at the top left side, just above the display pane."
 msgstr ""
-"Affiche toutes les tâches correspondant aux critères prédéfinis que vous "
-"avez sélectionnés dans la liste déroulante en haut à gauche, juste au-dessus "
-"de la zone d'affichage."
+"Affiche toutes les tâches correspondant aux critères que vous avez "
+"sélectionnés dans la liste déroulante en haut à gauche, juste au-dessus de "
+"la zone d'affichage."
 
-#: ../C/evolution.xml:4483(para)
+#: ../C/evolution.xml:4508(para)
 msgid ""
 "This feature provides the following best quick search options. This allows "
 "you to quickly see when tasks are due, as it can become unwieldy for "
@@ -10295,122 +10133,127 @@ msgstr ""
 "planification peut se révéler assez vite problématique si vous avez un grand "
 "nombre de tâches."
 
-#: ../C/evolution.xml:4485(title)
+#: ../C/evolution.xml:4510(title)
 msgid "Any Category:"
 msgstr "Toute catégorie :"
 
-#: ../C/evolution.xml:4486(para)
-msgid "It shows all the tasks that fall under any category."
-msgstr "Toutes les tâches ayant une catégorie apparaissent."
+#: ../C/evolution.xml:4511(para)
+msgid "Displays all the tasks that fall under any category."
+msgstr "Affiche toutes les tâches ayant une catégorie."
 
-#: ../C/evolution.xml:4489(title)
+#: ../C/evolution.xml:4514(title)
 msgid "Unmatched:"
 msgstr "Différent :"
 
-#: ../C/evolution.xml:4490(para)
+#: ../C/evolution.xml:4515(para)
 msgid ""
-"It shows all the tasks that do not fall under any of the categories listed "
+"Displays all the tasks that do not fall under any of the categories listed "
 "here."
 msgstr ""
-"Toutes les tâches n'appartenant à aucune des catégories énumérées ici "
-"apparaissent."
+"Affiche toutes les tâches n'appartenant à aucune des catégories énumérées "
+"ici."
 
-#: ../C/evolution.xml:4493(title)
+#: ../C/evolution.xml:4518(title)
 msgid "Next 7 Days' Tasks:"
 msgstr "Tâches des 7 prochains jours :"
 
-#: ../C/evolution.xml:4494(para)
-msgid ""
-"It shows all the active tasks that are due within the next seven dates. You "
-"can view all the tasks that end within the next seven days from the current "
-"date."
+#: ../C/evolution.xml:4519(para)
+msgid "Displays all the active tasks that are due within the next seven days."
 msgstr ""
-"Toutes les tâches actives arrivant à échéance dans les 7 prochains jours "
-"apparaissent. Vous pouvez ainsi voir toutes les tâches devant se terminer "
-"dans les 7 jours suivant la date actuelle."
+"Affiche toutes les tâches actives arrivant à échéance dans les 7 prochains "
+"jours."
 
-#: ../C/evolution.xml:4497(title)
+#: ../C/evolution.xml:4522(title)
 msgid "Active Tasks:"
 msgstr "Tâches actuelles :"
 
-#: ../C/evolution.xml:4498(para)
+#: ../C/evolution.xml:4523(para)
 msgid ""
-"It shows all the tasks whose due date is yet to come. This allows you to see "
+"Displays all the tasks whose due date is yet to come. This allows you to see "
 "the date due for tasks due in the future."
 msgstr ""
-"Toutes les tâches dont la date d'échéance se situe dans le futur "
-"apparaissent. Cela vous permet de voir les dates d'échéances de toutes les "
-"tâches dont la date d'échéance n'est pas encore passée."
+"Affiche toutes les tâches dont la date d'échéance se situe dans le futur. "
+"Cela vous permet de voir les dates d'échéances de toutes les tâches dont la "
+"date d'échéance n'est pas encore passée."
 
-#: ../C/evolution.xml:4501(title)
+#: ../C/evolution.xml:4526(title)
 msgid "Over Due Tasks:"
 msgstr "Tâches en retard :"
 
-#: ../C/evolution.xml:4502(para)
-msgid "It shows all the tasks whose end date has already passed."
-msgstr "Toutes les tâches dont la date d'échéance est passée apparaissent."
+#: ../C/evolution.xml:4527(para)
+msgid "Displays all the tasks whose end date has already passed."
+msgstr "Affiche toutes les tâches dont la date d'échéance est passée."
 
-#: ../C/evolution.xml:4505(title)
+#: ../C/evolution.xml:4530(title)
 msgid "Completed Tasks:"
 msgstr "Tâches terminées :"
 
-#: ../C/evolution.xml:4506(para)
-msgid "It shows the tasks whose status is 100% completed."
-msgstr "Toutes les tâches dont l'état est terminé à 100 % apparaissent."
+#: ../C/evolution.xml:4531(para)
+msgid "Displays the tasks whose status is 100% completed."
+msgstr "Affiche toutes les tâches dont l'état est terminé à 100 %."
 
-#: ../C/evolution.xml:4509(title)
+#: ../C/evolution.xml:4534(title)
 msgid "Tasks With Attachment:"
 msgstr "Tâches avec une pièce jointe :"
 
-#: ../C/evolution.xml:4510(para)
-msgid "It shows all the tasks with attachment."
-msgstr "Toutes les tâches possédant une pièce jointe apparaissent."
+#: ../C/evolution.xml:4535(para)
+msgid "Displays all the tasks with attachments."
+msgstr "Affiche toutes les tâches possédant au moins une pièce jointe."
 
-#: ../C/evolution.xml:4513(title)
+#: ../C/evolution.xml:4538(title)
 msgid "&lt;List of Categories&gt;:"
 msgstr "&lt;Liste de catégories&gt; :"
 
-#: ../C/evolution.xml:4514(para)
+#: ../C/evolution.xml:4539(para)
 msgid ""
 "Lists all the tasks that belong to a particular category such as "
-"Anniversary, Holidays, Gifts etc."
+"Anniversary, Holidays, Gifts, etc."
 msgstr ""
 "Affiche la liste de toutes les tâches appartenant à une catégorie précise, "
 "telle que Anniversaire, Vacances, Cadeaux, etc."
 
-#: ../C/evolution.xml:4516(para) ../C/evolution.xml:4727(para)
+#: ../C/evolution.xml:4541(para)
 msgid "To perform quick search,"
 msgstr "Pour effectuer une recherche rapide,"
 
-#: ../C/evolution.xml:4519(para)
+#: ../C/evolution.xml:4544(para)
 msgid "Click the Show drop-down list from the Search bar."
 msgstr "Cliquez sur la liste déroulante Afficher dans la barre de recherche."
 
-#: ../C/evolution.xml:4531(para)
+#: ../C/evolution.xml:4556(para)
 msgid "Next 7 Days Tasks"
 msgstr "Tâches des 7 prochains jours"
 
-#: ../C/evolution.xml:4534(para)
+#: ../C/evolution.xml:4559(para)
 msgid "Active Tasks"
 msgstr "Tâches actuelles"
 
-#: ../C/evolution.xml:4537(para)
+#: ../C/evolution.xml:4562(para)
 msgid "Over Due Tasks"
 msgstr "Tâches en retard"
 
-#: ../C/evolution.xml:4540(para)
+#: ../C/evolution.xml:4565(para)
 msgid "Completed Tasks"
 msgstr "Tâches terminées"
 
-#: ../C/evolution.xml:4543(para)
+#: ../C/evolution.xml:4568(para)
 msgid "Tasks With Attachments"
 msgstr "Tâches avec une pièce jointe"
 
-#: ../C/evolution.xml:4611(para)
+#: ../C/evolution.xml:4592(para) ../C/evolution.xml:4787(para)
+msgid "Holidays"
+msgstr "Vacances"
+
+#: ../C/evolution.xml:4604(para) ../C/evolution.xml:4799(para)
+msgid "Key Customers"
+msgstr "Clients clés"
+
+#: ../C/evolution.xml:4636(para)
 msgid "You can view the desired items listed in the Task view."
-msgstr "Vous voyez apparaître les éléments souhaités dans l'affichage des tâches."
+msgstr ""
+"Vous voyez apparaître les éléments souhaités dans l'affichage des tâches."
 
-#: ../C/evolution.xml:4617(para)
+#: ../C/evolution.xml:4642(para)
 msgid ""
 "In Evolution, the Memos component lets you create, edit, and store journal "
 "entries without dates, using the filesystem as a backend."
@@ -10419,23 +10262,25 @@ msgstr ""
 "stocker des notes journalisées sans date, stockées sur le système de "
 "fichiers."
 
-#: ../C/evolution.xml:4619(para)
+#: ../C/evolution.xml:4644(para)
 msgid "To create a new memo entry:"
 msgstr "Pour créer une nouvelle note mémo :"
 
-#: ../C/evolution.xml:4622(para)
+#: ../C/evolution.xml:4647(para)
 msgid "Click File &gt; New &gt; Memo."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Mémo."
 
-#: ../C/evolution.xml:4625(para)
-msgid "Select a group in which you would create a memo entry."
-msgstr "Sélectionnez un groupe dans lequel vous souhaitez créer le mémo."
+#: ../C/evolution.xml:4650(para) ../C/evolution.xml:5720(para)
+msgid "Select the Group in which you would like to create the entry."
+msgstr "Sélectionnez le groupe dans lequel vous souhaitez créer l'élément."
 
-#: ../C/evolution.xml:4632(para)
-msgid "Type text for the memo in the Summary field."
-msgstr "Saisissez le texte du mémo dans le champ Résumé."
+#: ../C/evolution.xml:4654(para)
+msgid "To show or hide Categories field, click View &gt; Categories."
+msgstr ""
+"Pour afficher ou masquer le champ Catégories, choisissez Affichage &gt; "
+"Catégories."
 
-#: ../C/evolution.xml:4635(para) ../C/evolution.xml:5747(para)
+#: ../C/evolution.xml:4660(para) ../C/evolution.xml:5726(para)
 msgid ""
 "In the Start Date field, type the date this reminder note should appear in "
 "the recipients' Calendars."
@@ -10443,78 +10288,69 @@ msgstr ""
 "Dans le champ « Date de début », saisissez la date à laquelle cette note de "
 "rappel doit apparaître dans le calendrier des destinataires."
 
-#: ../C/evolution.xml:4638(para)
-msgid "Type text for the memo in the Memo Content field."
-msgstr "Saisissez le texte du mémo dans le champ Contenu du mémo."
-
-#: ../C/evolution.xml:4641(para)
-msgid ""
-"(Optional) To add an attachment to the memo, drag and drop the attachment "
-"into the attachment bar."
-msgstr ""
-"(facultatif) Pour ajouter une pièce jointe au mémo, faites glisser un "
-"fichier dans la barre des pièces jointes."
-
-#: ../C/evolution.xml:4646(para)
-msgid ""
-"(Optional) Click Options &gt; Classifications, then select a classification "
-"(as Public, Private or Confidential) for the memo."
-msgstr ""
-"(facultatif) Choisissez Options &gt; Classifications, puis sélectionnez une "
-"classification pour le mémo (Public, Privé ou Confidentiel)."
-
-#: ../C/evolution.xml:4651(title)
-msgid "The Memo list"
+#: ../C/evolution.xml:4676(title)
+msgid "The Memo List"
 msgstr "La liste des mémos"
 
-#: ../C/evolution.xml:4652(para)
+#: ../C/evolution.xml:4677(para)
 msgid ""
 "As with calendars and tasks, you can create multiple memo lists. Each memo "
-"list is assigned a color, and you can use the Memos switcher to hide and "
-"show memos."
+"list is assigned a color, and you can use the side bar to hide and show memo "
+"lists."
 msgstr ""
 "Comme pour les calendriers et les tâches, vous pouvez créer plusieurs listes "
-"de mémos. Chaque liste reçoit une couleur, et il est possible de masquer et "
-"d'afficher les différentes listes dans le sélecteur de l'outil Mémos."
+"de mémos. Une couleur est attribuée à chaque liste, et il est possible de "
+"masquer et d'afficher les différentes listes à l'aide de la barre latérale."
 
-#: ../C/evolution.xml:4653(para)
+#: ../C/evolution.xml:4678(para)
 msgid "To create a new memo list:"
 msgstr "Pour créer une nouvelle liste de mémos :"
 
-#: ../C/evolution.xml:4656(para)
+#: ../C/evolution.xml:4681(para)
 msgid "Click File &gt; New &gt; Memo List."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Liste de mémos."
 
-#: ../C/evolution.xml:4659(para)
-msgid "Type the group, name and color for the memo list."
-msgstr "Saisissez le groupe, le nom et la couleur de la liste de mémos."
+#: ../C/evolution.xml:4684(para)
+msgid "Enter the type, name and color for the memo list."
+msgstr "Saisissez le type, le nom et la couleur de la liste de mémos."
 
-#: ../C/evolution.xml:4668(title)
-msgid "Searching For Memo Items"
+#: ../C/evolution.xml:4693(title)
+msgid "Searching for Memo Items"
 msgstr "Recherche de mémos"
 
-#: ../C/evolution.xml:4671(para)
+#: ../C/evolution.xml:4694(para)
 msgid ""
-"Evolution enables you to find the Memo items by using Customized Search. To "
-"start searching for various Memo items, use the following procedure:"
+"You can use a customized search, an advanced search, or a quick search to "
+"search for Memo Items."
+msgstr ""
+"Vous pouvez utiliser une recherche personnalisée, une recherche avancée ou "
+"une recherche rapide pour chercher des mémos."
+
+#: ../C/evolution.xml:4697(para)
+msgid ""
+"Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 "Evolution vous permet de chercher des mémos en utilisant la recherche "
-"personnalisée. Pour initier une recherche de divers mémos, utilisez la "
-"procédure suivante :"
+"personnalisée."
 
-#: ../C/evolution.xml:4725(para)
+#: ../C/evolution.xml:4727(para)
+msgid "Select the desired search type from the drop-down list."
+msgstr "Choisissez le type de recherche souhaité dans la liste déroulante."
+
+#: ../C/evolution.xml:4750(para)
 msgid ""
-"Displays all the Memo items that match the in-built criteria that you have "
-"selected from the Show drop-down list in the Search bar."
+"Displays all the Memo items that match the criteria that you have selected "
+"from the Show drop-down list in the Search bar."
 msgstr ""
-"Affiche tous les mémos correspondant aux critères prédéfinis que vous avez "
-"sélectionnés dans la liste déroulante Afficher dans la barre de recherche."
+"Affiche tous les mémos correspondant aux critères que vous avez sélectionnés "
+"dans la liste déroulante Afficher dans la barre de recherche."
 
-#: ../C/evolution.xml:4805(para)
+#: ../C/evolution.xml:4829(para)
 msgid "You can view the desired items listed in the Memo view."
-msgstr "Vous voyez apparaître les éléments souhaités dans l'affichage des mémos."
+msgstr ""
+"Vous voyez apparaître les éléments souhaités dans l'affichage des mémos."
 
-#: ../C/evolution.xml:4813(para)
+#: ../C/evolution.xml:4837(para)
 msgid ""
 "Evolution supports the use of time zones. If you share calendar files with "
 "friends or co-workers, you might need to configure your time zone."
@@ -10523,21 +10359,21 @@ msgstr ""
 "avec des amis ou des collègues de travail, il se peut que vous deviez "
 "configurer votre fuseau horaire."
 
-#: ../C/evolution.xml:4819(para)
+#: ../C/evolution.xml:4843(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
 msgstr ""
 "Cliquez sur l'icône à côté du champ Fuseau horaire, puis choisissez votre "
 "emplacement."
 
-#: ../C/evolution.xml:4820(para)
+#: ../C/evolution.xml:4844(para)
 msgid "Each red dot represents a major city."
 msgstr "Chaque point rouge représente une ville importante."
 
-#: ../C/evolution.xml:4823(para)
+#: ../C/evolution.xml:4847(para)
 msgid "Select a city, then click OK."
 msgstr "Sélectionnez une ville, puis cliquez sur Valider."
 
-#: ../C/evolution.xml:4826(para)
+#: ../C/evolution.xml:4850(para)
 msgid ""
 "You can also configure time zone information specific to each appointment. "
 "To do that, simply create a new appointment and click the globe to customize "
@@ -10554,51 +10390,51 @@ msgstr ""
 "assurer de bien coordonner vos horaires. La définition de fuseaux horaires "
 "spécifiques par rendez-vous aide à éviter les confusions possibles."
 
-#: ../C/evolution.xml:4830(title)
+#: ../C/evolution.xml:4854(title)
 msgid "Marcus Bains Line"
 msgstr "Ligne de l'heure courante"
 
-#: ../C/evolution.xml:4831(para)
+#: ../C/evolution.xml:4855(para)
 msgid ""
 "The Marcus Bains Line is a marker to show the current date and time. This "
-"feature is now available in the Evolution calendar."
+"feature is available in the Evolution calendar."
 msgstr ""
 "La ligne de l'heure courante est une marque pour afficher la date et l'heure "
-"actuelle. Cette fonctionnalité est dorénavant disponible dans le calendrier "
-"d'Evolution."
+"actuelle. Cette fonctionnalité est disponible dans le calendrier d'Evolution."
 
-#: ../C/evolution.xml:4837(para)
+#: ../C/evolution.xml:4861(para)
 msgid ""
-"Evolution™ Exchange for Microsoft Exchange allows Evolution clients to "
-"access accounts on Microsoft Exchange 2000 and 2003 servers. Like Evolution, "
-"it is free software and is licensed under the GPL."
+"<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
+"Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
+"servers. Like Evolution, it is free software and is licensed under the GPL."
 msgstr ""
-"Evolution&trade; Exchange pour Microsoft Exchange autorise les clients "
-"Evolution à accéder aux comptes de serveurs Microsoft Exchange 2000 et 2003. "
-"Comme Evolution, c'estégalement du logiciel libre et placé sous licence GPL."
+"<trademark>Evolution</trademark> Exchange pour Microsoft Exchange autorise "
+"les clients Evolution à accéder aux comptes de serveurs Microsoft Exchange "
+"2000 et 2003. Comme Evolution, c'estégalement du logiciel libre et placé "
+"sous licence GPL."
 
-#: ../C/evolution.xml:4840(link) ../C/evolution.xml:4860(title)
+#: ../C/evolution.xml:4864(link) ../C/evolution.xml:4884(title)
 msgid "Evolution Exchange Features"
 msgstr "Fonctionnalités de Evolution Exchange"
 
-#: ../C/evolution.xml:4843(link) ../C/evolution.xml:4962(title)
+#: ../C/evolution.xml:4867(link) ../C/evolution.xml:4986(title)
 msgid "Adding Your Exchange Account to Evolution"
 msgstr "Ajout d'un compte Exchange à Evolution"
 
-#: ../C/evolution.xml:4846(link) ../C/evolution.xml:5129(title)
+#: ../C/evolution.xml:4870(link) ../C/evolution.xml:5104(title)
 msgid "Accessing the Exchange Server"
 msgstr "Accès au serveur Exchange"
 
-#: ../C/evolution.xml:4849(link) ../C/evolution.xml:5137(title)
+#: ../C/evolution.xml:4873(link) ../C/evolution.xml:5112(title)
 msgid "Settings Exclusive to Evolution Exchange"
 msgstr "Paramètres propres à Evolution Exchange"
 
-#: ../C/evolution.xml:4852(link) ../C/evolution.xml:5160(link)
-#: ../C/evolution.xml:5380(title)
+#: ../C/evolution.xml:4876(link) ../C/evolution.xml:5135(link)
+#: ../C/evolution.xml:5357(title)
 msgid "Scheduling Meetings with Free/Busy"
 msgstr "Planification de réunions avec Libre/Occupé"
 
-#: ../C/evolution.xml:4856(para)
+#: ../C/evolution.xml:4880(para)
 msgid ""
 "Evolution Exchange works only with Exchange 2000 and later, and requires "
 "that Outlook Web Access be enabled. Each user needs a valid Microsoft "
@@ -10608,23 +10444,24 @@ msgstr ""
 "et requiert que Outlook Web Access soit activé. Chaque utilisateur doit "
 "avoir un compte serveur Exchange valide, et une licence."
 
-#: ../C/evolution.xml:4861(para)
-msgid "Evolution Exchange supports the following basic Microsoft Exchange features:"
+#: ../C/evolution.xml:4885(para)
+msgid ""
+"Evolution Exchange supports the following basic Microsoft Exchange features:"
 msgstr ""
 "Evolution Exchange prend en charge les fonctionnalités basiques de Microsoft "
 "Exchange suivantes :"
 
-#: ../C/evolution.xml:4864(para) ../C/evolution.xml:6599(link)
-#: ../C/evolution.xml:6610(title) ../C/evolution.xml:6657(link)
-#: ../C/evolution.xml:6671(title)
+#: ../C/evolution.xml:4888(para) ../C/evolution.xml:6562(link)
+#: ../C/evolution.xml:6573(title) ../C/evolution.xml:6621(link)
+#: ../C/evolution.xml:6635(title)
 msgid "General"
 msgstr "Général"
 
-#: ../C/evolution.xml:4868(title)
+#: ../C/evolution.xml:4892(title)
 msgid "Remote Exchange Information Store:"
 msgstr "Stockage d'informations Exchange distant :"
 
-#: ../C/evolution.xml:4869(para)
+#: ../C/evolution.xml:4893(para)
 msgid ""
 "Allows you to access mail, address book (including the Global Address List "
 "folder), calendars, and task folders on an Exchange server from Evolution."
@@ -10633,19 +10470,19 @@ msgstr ""
 "dossier Liste d'adresses globale), calendriers et dossiers de tâches sur un "
 "serveur Exchange à partir d'Evolution."
 
-#: ../C/evolution.xml:4874(title)
+#: ../C/evolution.xml:4898(title)
 msgid "Palm Synchronization:"
 msgstr "Synchronisation du Palm :"
 
-#: ../C/evolution.xml:4875(para)
+#: ../C/evolution.xml:4899(para)
 msgid "Supported for Contacts and Calendars on Exchange."
 msgstr "Prise en charge pour les contacts et calendriers sur Exchange."
 
-#: ../C/evolution.xml:4880(title)
+#: ../C/evolution.xml:4904(title)
 msgid "Password Management:"
 msgstr "Gestion du mot de passe :"
 
-#: ../C/evolution.xml:4881(para)
+#: ../C/evolution.xml:4905(para)
 msgid ""
 "Allows you to reset your password. If your password has expired, Evolution "
 "asks you to change your password at startup."
@@ -10653,15 +10490,15 @@ msgstr ""
 "Vous permet de réinitialiser votre mot de passe. Si celui-ci a expiré,"
 "Evolution demande de le changer au démarrage."
 
-#: ../C/evolution.xml:4887(para) ../C/evolution.xml:5469(para)
+#: ../C/evolution.xml:4911(para) ../C/evolution.xml:5446(para)
 msgid "Mail"
 msgstr "Messagerie"
 
-#: ../C/evolution.xml:4891(title)
+#: ../C/evolution.xml:4915(title)
 msgid "Viewing Mail in Exchange Folders:"
 msgstr "Affichage des courriels dans les dossiers Exchange :"
 
-#: ../C/evolution.xml:4892(para)
+#: ../C/evolution.xml:4916(para)
 msgid ""
 "Mail stored on the Exchange server is visible in the Mail component in "
 "Evolution."
@@ -10669,41 +10506,41 @@ msgstr ""
 "Les courriels stockés sur un serveur Exchange sont visibles dans le "
 "composant Courriel d'Evolution."
 
-#: ../C/evolution.xml:4897(title)
-msgid "Sending E-mail via Exchange Protocols:"
+#: ../C/evolution.xml:4921(title)
+msgid "Sending Email via Exchange Protocols:"
 msgstr "Envoi de courriels via les protocoles Exchange :"
 
-#: ../C/evolution.xml:4898(para)
+#: ../C/evolution.xml:4922(para)
 msgid ""
-"If you use the Microsoft Exchange mail transport protocol to send e-mail, "
-"make sure that the address you have entered as your e-mail address is "
-"exactly the one that the Exchange server has on file. This might be "
-"“yourname@exchange-server.example.com” rather than “yourname@example.com”."
+"If you use the Microsoft Exchange mail transport protocol to send email, "
+"make sure that the address you have entered as your email address is exactly "
+"the one that the Exchange server has on file. This might be "
+"<quote>yourname@exchange-server.example.com</quote> rather than "
+"<quote>yourname@example.com.</quote>"
 msgstr ""
 "Si vous utilisez le protocole de transport de messages de Microsoft Exchange "
 "pour envoyer des courriels, assurez-vous que l'adresse de l'expéditeur "
 "correspond exactement à celle du serveur Exchange. Cela pourrait être "
-"« votrenom@exchange-serveur.exemple.com » plutôt que « votrenom@exemple."
-"com »."
+"« votrenom@exchange-serveur.exemple.com » plutôt que « votrenom@exemple.com »."
 
-#: ../C/evolution.xml:4903(title)
+#: ../C/evolution.xml:4927(title)
 msgid "Out of Office Message:"
 msgstr "Message d'absence du bureau :"
 
-#: ../C/evolution.xml:4904(para)
+#: ../C/evolution.xml:4928(para)
 msgid ""
-"You can set ‘out of Office’ message that will automatically be sent to "
-"people who send mails to you while you are away from office."
+"You can set <quote>out of Office</quote> message that will automatically be "
+"sent to people who send mail to you while you are away from office."
 msgstr ""
-"Vous pouvez définir un message d'absence qui sera automatiquement envoyé "
-"à tous les gens qui vous envoient des messages lorsque vous n'êtes pas au "
+"Vous pouvez définir un message d'absence qui sera automatiquement envoyé à "
+"tous les gens qui vous envoient des messages lorsque vous n'êtes pas au "
 "bureau."
 
-#: ../C/evolution.xml:4909(title)
+#: ../C/evolution.xml:4933(title)
 msgid "Send Options:"
 msgstr "Options d'envoi :"
 
-#: ../C/evolution.xml:4910(para)
+#: ../C/evolution.xml:4934(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message so that the "
 "recipients will know how important the message is.The priority can have one "
@@ -10719,16 +10556,16 @@ msgstr ""
 "Confidentiel). Vous pouvez aussi activer l'accusé de réception et l'accusé "
 "de lecture pour les messages envoyés."
 
-#: ../C/evolution.xml:4916(para) ../C/evolution.xml:5492(para)
-#: ../C/evolution.xml:7053(link) ../C/evolution.xml:7123(title)
+#: ../C/evolution.xml:4940(para) ../C/evolution.xml:5469(para)
+#: ../C/evolution.xml:7017(link) ../C/evolution.xml:7087(title)
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: ../C/evolution.xml:4920(title)
+#: ../C/evolution.xml:4944(title)
 msgid "Meeting Requests/Proposal:"
 msgstr "Demande/proposition de réunion :"
 
-#: ../C/evolution.xml:4921(para)
+#: ../C/evolution.xml:4945(para)
 msgid ""
 "Allows Evolution users to schedule meetings. You can check when other users "
 "are busy according to their calendars and send the meeting requests "
@@ -10738,11 +10575,11 @@ msgstr ""
 "vérifier les disponibilités des autres utilisateurs et envoyer les demandes "
 "de réunion possibles."
 
-#: ../C/evolution.xml:4926(title)
+#: ../C/evolution.xml:4950(title)
 msgid "Adding iCalendar Meeting Requests to the Calendar:"
 msgstr "Ajout de demandes de réunion iCalendar au calendrier :"
 
-#: ../C/evolution.xml:4927(para)
+#: ../C/evolution.xml:4951(para)
 msgid ""
 "Allows you to add the iCalendar meeting requests you receive to your "
 "Exchange calendar. Note that you need to specify the calendar from the list, "
@@ -10752,38 +10589,38 @@ msgstr ""
 "votre calendrier Exchange. Remarquez que vous devez indiquer le calendrier "
 "auquel vous  voulez ajouter les réunions planifiées à partir de la liste."
 
-#: ../C/evolution.xml:4933(para) ../C/evolution.xml:5404(para)
-#: ../C/evolution.xml:5503(para)
+#: ../C/evolution.xml:4957(para) ../C/evolution.xml:5381(para)
+#: ../C/evolution.xml:5480(para)
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../C/evolution.xml:4937(title)
+#: ../C/evolution.xml:4961(title)
 msgid "Address Completion:"
 msgstr "Saisie automatique d'adresse :"
 
-#: ../C/evolution.xml:4938(para)
+#: ../C/evolution.xml:4962(para)
 msgid "Supported for your Exchange Contacts folder."
 msgstr "Pris en charge pour votre dossier de contacts Exchange."
 
-#: ../C/evolution.xml:4943(title)
+#: ../C/evolution.xml:4967(title)
 msgid "Adding vCards to the Address Book:"
 msgstr "Ajout de cartes de visite vCards au carnet d'adresses :"
 
-#: ../C/evolution.xml:4944(para)
+#: ../C/evolution.xml:4968(para)
 msgid ""
 "Allows you to save the vCards you receive in attachment to your Exchange "
 "address book.New Address Book entries can also be created on Exchange from "
-"received e-mail messages with a single click."
+"received email messages with a single click."
 msgstr ""
 "Vous permet d'enregistrer les cartes de visite vCard reçues en pièces "
 "jointes au carnet d'adresses Evolution. De nouvelles adresses peuvent aussi "
 "être créées dans Exchange à partir des courriels reçus par un simple clic."
 
-#: ../C/evolution.xml:4950(para)
+#: ../C/evolution.xml:4974(para)
 msgid "Work Offline (disconnected mode)"
 msgstr "Travail hors ligne (mode déconnecté)"
 
-#: ../C/evolution.xml:4951(para)
+#: ../C/evolution.xml:4975(para)
 msgid ""
 "To mark a folder for offline usage, right-click the folder, then click "
 "Properties. Click Copy Folder Content Locally for Offline Operation. For "
@@ -10796,11 +10633,11 @@ msgstr ""
 "d'informations, voir <link linkend=\"usage-mail-getnsend-offline\">Travail "
 "hors ligne</link>."
 
-#: ../C/evolution.xml:4956(para)
+#: ../C/evolution.xml:4980(para)
 msgid "Recall Message function is not available."
 msgstr "La fonction de rappel de message n'est pas disponible."
 
-#: ../C/evolution.xml:4963(para)
+#: ../C/evolution.xml:4987(para)
 msgid ""
 "After you have installed Evolution Exchange, you need to set up access for "
 "your Exchange account on both the Exchange server and within Evolution."
@@ -10808,35 +10645,35 @@ msgstr ""
 "Après l'installation de Evolution Exchange, vous devez configurer l'accès à "
 "votre compte Exchange aussi bien sur le serveur Exchange que dans Evolution."
 
-#: ../C/evolution.xml:4966(link) ../C/evolution.xml:4983(title)
+#: ../C/evolution.xml:4990(link) ../C/evolution.xml:5007(title)
 msgid "Exchange Server Settings"
 msgstr "Paramètres du serveur Exchange"
 
-#: ../C/evolution.xml:4969(link) ../C/evolution.xml:4997(title)
+#: ../C/evolution.xml:4993(link) ../C/evolution.xml:5021(title)
 msgid "Standard Configuration Tool for Evolution Exchange"
 msgstr "Outil de configuration standard pour Evolution Exchange"
 
-#: ../C/evolution.xml:4972(link) ../C/evolution.xml:5001(title)
+#: ../C/evolution.xml:4996(link) ../C/evolution.xml:5025(title)
 msgid "Simple Configuration Tool for Evolution Exchange"
 msgstr "Outil de configuration simplifié pour Evolution Exchange"
 
-#: ../C/evolution.xml:4975(link) ../C/evolution.xml:5008(title)
+#: ../C/evolution.xml:4999(link) ../C/evolution.xml:5032(title)
 msgid "Creating a New Exchange Account"
 msgstr "Création d'un compte Exchange"
 
-#: ../C/evolution.xml:4978(link) ../C/evolution.xml:5050(title)
+#: ../C/evolution.xml:5002(link) ../C/evolution.xml:5056(title)
 msgid "Configuring an Existing Account for Evolution Exchange Account"
 msgstr "Configuration d'un compte existant pour l'utiliser avec Exchange"
 
-#: ../C/evolution.xml:4984(para)
+#: ../C/evolution.xml:5008(para)
 msgid "Check with your system administrator to ensure that:"
 msgstr "Contactez votre administrateur système pour vérifier que :"
 
-#: ../C/evolution.xml:4987(para)
+#: ../C/evolution.xml:5011(para)
 msgid "You have a valid account on the Exchange server."
 msgstr "Vous disposez d'un compte valide sur le serveur Exchange."
 
-#: ../C/evolution.xml:4990(para)
+#: ../C/evolution.xml:5014(para)
 msgid ""
 "You are permitted to access the account with WebDAV. This is the default "
 "setting for the Exchange server, so unless your system administrator has "
@@ -10846,17 +10683,19 @@ msgstr ""
 "par défaut du serveur Exchange. Si votre administrateur système ne l'a pas "
 "désactivé, aucun changement n'est nécessaire."
 
-#: ../C/evolution.xml:4993(para)
+#: ../C/evolution.xml:5017(para)
 msgid ""
-"The <ulink url=\"http://support.novell.com\">Novell® Web site Knowledgebase</"
-"ulink> has additional information about checking to make sure that your "
-"Exchange server accepts connections from Evolution."
+"The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
+"\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
+"information about checking to make sure that your Exchange server accepts "
+"connections from Evolution."
 msgstr ""
 "La <ulink url=\"http://support.novell.com\">base de connaissance du site Web "
-"Novell</ulink> contient des informations supplémentaires pour vérifier "
-"que votre serveur Exchange accepte les connexions provenant d'Evolution."
+"<trademark class=\"registered\">Novell</trademark></ulink> contient des "
+"informations supplémentaires pour vérifier que votre serveur Exchange "
+"accepte les connexions provenant d'Evolution."
 
-#: ../C/evolution.xml:4998(para)
+#: ../C/evolution.xml:5022(para)
 msgid ""
 "When you know that your server is ready for you to connect, you are ready to "
 "add your Exchange account to Evolution Exchange."
@@ -10864,7 +10703,7 @@ msgstr ""
 "Lorsque vous savez que le serveur est prêt à accepter les connexions, vous "
 "pouvez ajouter votre compte Exchange à Evolution Exchange."
 
-#: ../C/evolution.xml:5002(para)
+#: ../C/evolution.xml:5026(para)
 msgid ""
 "Evolution Exchange comes with a simple account creation tool for Exchange "
 "accounts."
@@ -10872,7 +10711,7 @@ msgstr ""
 "Evolution Exchange fournit un outil simplifié de création de compte pour "
 "Exchange."
 
-#: ../C/evolution.xml:5003(para)
+#: ../C/evolution.xml:5027(para)
 msgid ""
 "If you have no accounts configured, the simple account configuration "
 "assistant starts when you start Evolution. It asks only for the Outlook Web "
@@ -10884,7 +10723,7 @@ msgstr ""
 "d'Outlook Web Access, votre nom d'utilisateur et votre mot de passe. "
 "Evolution Exchange détermine les informations restantes pour vous."
 
-#: ../C/evolution.xml:5004(para)
+#: ../C/evolution.xml:5028(para)
 msgid ""
 "If the simple account configuration tool does not run automatically, you "
 "need to create an account manually. For more information on how to do this, "
@@ -10896,11 +10735,7 @@ msgstr ""
 "<link linkend=\"config-exchange-new-account\">Création d'un compte Exchange</"
 "link>."
 
-#: ../C/evolution.xml:5011(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S"
-msgstr "Choisissez Édition &gt; Préférences ou appuyez sur Ctrl+Maj+S"
-
-#: ../C/evolution.xml:5019(para)
+#: ../C/evolution.xml:5043(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>. Remember "
@@ -10911,15 +10746,13 @@ msgstr ""
 "Pensez  à sélectionner Microsoft Exchange comme type de serveur dans la "
 "section Réception de messages."
 
-#: ../C/evolution.xml:5030(para)
-msgid ""
-"You may configure only Only one Microsoft Exchange account can be configured "
-"in Evolution."
+#: ../C/evolution.xml:5049(para)
+msgid "Only one Microsoft Exchange account can be configured in Evolution."
 msgstr ""
 "Vous ne pouvez configurer qu'un seul compte Microsoft Exchange dans "
 "Evolution."
 
-#: ../C/evolution.xml:5051(para)
+#: ../C/evolution.xml:5057(para)
 msgid ""
 "Use the following procedure to configure your existing account for Evolution "
 "Exchange:"
@@ -10927,13 +10760,7 @@ msgstr ""
 "Suivez la procédure ci-après pour configurer un compte déjà existant afin de "
 "l'utiliser avec Evolution Exchange."
 
-#: ../C/evolution.xml:5054(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S, then click Mail Accounts."
-msgstr ""
-"Choisissez Édition &gt; Préférences ou appuyez sur Ctrl+Maj+S, puis cliquez "
-"sur Comptes de messagerie."
-
-#: ../C/evolution.xml:5057(para)
+#: ../C/evolution.xml:5063(para)
 msgid ""
 "Select the account you want to convert, then click Edit to appear the "
 "Account Editor."
@@ -10941,15 +10768,15 @@ msgstr ""
 "Sélectionnez le compte à convertir, puis cliquez sur Édition pour afficher "
 "l'éditeur de compte."
 
-#: ../C/evolution.xml:5058(para)
+#: ../C/evolution.xml:5064(para)
 msgid "You can view Identity tab enabled."
 msgstr "Vous pouvez voir l'onglet Identité."
 
-#: ../C/evolution.xml:5072(para) ../C/evolution.xml:5666(para)
-msgid "Change your e-mail address as needed."
+#: ../C/evolution.xml:5069(para) ../C/evolution.xml:5643(para)
+msgid "Change your email address as needed."
 msgstr "Changez votre adresse électronique si nécessaire."
 
-#: ../C/evolution.xml:5075(para)
+#: ../C/evolution.xml:5072(para)
 msgid ""
 "Click the Receiving Mail tab, then select Microsoft Exchange as your server "
 "type."
@@ -10957,7 +10784,7 @@ msgstr ""
 "Cliquez sur l'onglet de Réception des courriels, puis sélectionnez Microsoft "
 "Exchange comme type de serveur."
 
-#: ../C/evolution.xml:5094(para)
+#: ../C/evolution.xml:5077(para)
 msgid ""
 "Type your user name, and the Outlook Web Access (OWA) URL. Click "
 "Authenticate, then enter the password at the prompt. The Exchange server "
@@ -10967,24 +10794,23 @@ msgstr ""
 "Cliquez sur S'authentifier, puis saisissez le mot de passe lorsqu'on vous le "
 "demande. Le serveur Exchange authentifie votre compte."
 
-#: ../C/evolution.xml:5097(para)
-msgid "Select your authentication method."
-msgstr "Choisissez une méthode d'authentification."
+#: ../C/evolution.xml:5085(para) ../C/evolution.xml:5657(para)
+msgid "Click the Receiving Options tab."
+msgstr "Cliquez sur l'onglet des Options de réception."
 
-#: ../C/evolution.xml:5111(para)
+#: ../C/evolution.xml:5086(para)
 msgid ""
-"Click the Receiving Options tab, then specify how often to check for new "
-"mail, your Global Catalog server name and whether to apply filters to "
-"messages in your Inbox, check for junk, set a password expiry period, and "
-"any other settings you want to include."
+"Specify how often to check for new mail, your Global Catalog server name and "
+"whether to apply filters to messages in your Inbox, check for junk, set a "
+"password expiry period, and any other settings you want to include."
 msgstr ""
-"Cliquez sur l'onglet des Options de réception, puis indiquez la fréquence de "
-"vérification de nouveaux courriels, le nom du serveur de catalogue global, "
-"s'il faut appliquer le filtrage de courriels de la boîte de reception, "
-"rechercher les pourriels, définir une période d'expiration du mot de passe, "
-"et tout autre paramètre que vous souhaitez inclure."
+"Indiquez la fréquence de vérification de nouveaux courriels, le nom du "
+"serveur de catalogue global, s'il faut appliquer le filtrage de courriels de "
+"la boîte de reception, rechercher les pourriels, définir une période "
+"d'expiration du mot de passe, et tout autre paramètre que vous souhaitez "
+"inclure."
 
-#: ../C/evolution.xml:5114(para)
+#: ../C/evolution.xml:5089(para)
 msgid ""
 "Use the Defaults tab to define folders, send cc: or bcc: messages to certain "
 "IDs, and set options for message receipts."
@@ -10993,15 +10819,15 @@ msgstr ""
 "copies cc: ou cci: à certaines personnes, et pour définir les options "
 "d'accusés de réception."
 
-#: ../C/evolution.xml:5117(para)
+#: ../C/evolution.xml:5092(para)
 msgid "Use the Security tab to set PGP and s/MIME options."
 msgstr "Utilisez l'onglet Sécurité pour définir les options PGP et s/MIME."
 
-#: ../C/evolution.xml:5120(para)
+#: ../C/evolution.xml:5095(para)
 msgid "Quit Evolution and restart it."
 msgstr "Quittez, puis redémarrez Evolution."
 
-#: ../C/evolution.xml:5121(para)
+#: ../C/evolution.xml:5096(para)
 msgid ""
 "Changes to Evolution Exchange accounts configuration are not active until "
 "you have restarted the application."
@@ -11009,7 +10835,7 @@ msgstr ""
 "Les modifications de la configuration du compte Exchange ne prendront effet "
 "qu'après un redémarrage de l'application."
 
-#: ../C/evolution.xml:5130(para)
+#: ../C/evolution.xml:5105(para)
 msgid ""
 "When you have installed Evolution Exchange, you can access public folders "
 "and perform certain Exchange actions like delegation and password "
@@ -11029,11 +10855,11 @@ msgstr ""
 "composant Contacts pour les contacts et le composant Calendrier pour "
 "planifier votre emploi du temps."
 
-#: ../C/evolution.xml:5131(para)
+#: ../C/evolution.xml:5106(para)
 msgid ""
 "If you are using both an Exchange account and a local mail account, you "
-"should be aware that whenever you save an e-mail address or appointment from "
-"an e-mail message, it is saved in your Exchange contacts list or calendar, "
+"should be aware that whenever you save an email address or appointment from "
+"an email message, it is saved in your Exchange contacts list or calendar, "
 "rather than in your local account. The same is true for synchronization with "
 "Palm OS devices; tasks, and appointments.Addresses from your Palm OS device "
 "are synchronized in the Exchange folders rather than in local folders."
@@ -11047,7 +10873,7 @@ msgstr ""
 "sont synchronisés dans les dossiers Exchange, plutôt quand dans les dossiers "
 "locaux."
 
-#: ../C/evolution.xml:5132(para)
+#: ../C/evolution.xml:5107(para)
 msgid ""
 "To avoid unnecessary strain on the server, the Global Address List (GAL) "
 "appears empty until you search for something in it."
@@ -11055,42 +10881,42 @@ msgstr ""
 "Pour éviter de surcharger le serveur, la liste d'adresses globale est vide "
 "tant que vous n'y recherchez pas un élément."
 
-#: ../C/evolution.xml:5138(para)
+#: ../C/evolution.xml:5113(para)
 msgid ""
 "There are some settings in Evolution that are available only with Evolution "
-"Exchange, like delegation and permission handling, creating “Out of Office” "
-"messages, changing password and viewing folder size."
+"Exchange, like delegation and permission handling, creating <quote>Out of "
+"Office</quote> messages, changing password and viewing folder size."
 msgstr ""
 "Certaines préférences d'Evolution ne sont disponibles qu'avec Evolution "
 "Exchange, comme la gestion de la délégation et des autorisations, la "
 "création des messages « Absent du bureau », la modification du mot de passe "
 "et l'affichage de la taille des dossiers."
 
-#: ../C/evolution.xml:5142(link) ../C/evolution.xml:5165(title)
+#: ../C/evolution.xml:5117(link) ../C/evolution.xml:5140(title)
 msgid "Send Options"
 msgstr "Options d'envoi"
 
-#: ../C/evolution.xml:5145(link) ../C/evolution.xml:5247(title)
+#: ../C/evolution.xml:5120(link) ../C/evolution.xml:5221(title)
 msgid "Access Delegation"
 msgstr "Délégation des accès"
 
-#: ../C/evolution.xml:5148(link) ../C/evolution.xml:5251(title)
+#: ../C/evolution.xml:5123(link) ../C/evolution.xml:5225(title)
 msgid "Delegating Access to Others"
 msgstr "Délégation des accès"
 
-#: ../C/evolution.xml:5151(link) ../C/evolution.xml:5298(title)
+#: ../C/evolution.xml:5126(link) ../C/evolution.xml:5275(title)
 msgid "Subscribe to Other Users' Folders"
 msgstr "Abonnement aux dossiers d'autres utilisateurs"
 
-#: ../C/evolution.xml:5154(link) ../C/evolution.xml:5322(title)
+#: ../C/evolution.xml:5129(link) ../C/evolution.xml:5299(title)
 msgid "Subscribe to Public Folders"
 msgstr "Abonnement à des dossiers publics"
 
-#: ../C/evolution.xml:5157(link) ../C/evolution.xml:5352(title)
+#: ../C/evolution.xml:5132(link) ../C/evolution.xml:5329(title)
 msgid "Setting an Out of Office Message"
 msgstr "Définition d'un message d'absence du bureau"
 
-#: ../C/evolution.xml:5166(para)
+#: ../C/evolution.xml:5141(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message from an "
 "exchange account so that the recipients will know how important the message "
@@ -11106,11 +10932,11 @@ msgstr ""
 "(Normal, Personnel, Privé, Confidentiel). Vous pouvez aussi activer l'accusé "
 "de réception et l'accusé de lecture pour les messages envoyés."
 
-#: ../C/evolution.xml:5169(title)
+#: ../C/evolution.xml:5144(title)
 msgid "Tracking Options"
 msgstr "Options de suivi"
 
-#: ../C/evolution.xml:5170(para)
+#: ../C/evolution.xml:5145(para)
 msgid ""
 "Evolution lets you track the status of an item you have sent. You can enable "
 "the Delivery Receipt request as well as Read Receipt request so that you "
@@ -11121,25 +10947,25 @@ msgstr ""
 "lecture afin de savoir quand l'élément envoyé est arrivé chez les "
 "destinataires et quand il a été lu."
 
-#: ../C/evolution.xml:5171(para)
+#: ../C/evolution.xml:5146(para)
 msgid "To set the importance and sensitivity of the message:"
 msgstr "Pour définir l'importance et la sensibilité d'un message :"
 
-#: ../C/evolution.xml:5174(para)
+#: ../C/evolution.xml:5149(para)
 msgid "Open a Compose Message window."
 msgstr "Ouvrez la fenêtre d'édition d'un message."
 
-#: ../C/evolution.xml:5177(para)
+#: ../C/evolution.xml:5152(para)
 msgid "Select the exchange account from the From field."
 msgstr "Sélectionnez le compte Exchange à partir du champ De."
 
-#: ../C/evolution.xml:5180(para)
+#: ../C/evolution.xml:5155(para)
 msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
 msgstr ""
 "Choisissez Insertion &gt; Options d'envoi pour ouvrir la boîte de dialogue "
 "des options d'envoi."
 
-#: ../C/evolution.xml:5185(para)
+#: ../C/evolution.xml:5160(para)
 msgid ""
 "Select the priority for your sent message from the given three options "
 "(Normal, High, Low)"
@@ -11147,7 +10973,7 @@ msgstr ""
 "Choisissez la priorité du message à envoyer parmi les trois options "
 "disponibles (Normale, Élevée, Faible)."
 
-#: ../C/evolution.xml:5188(para)
+#: ../C/evolution.xml:5163(para)
 msgid ""
 "Select the sensitivity for your sent message from the given four options "
 "(Normal, Personal, Private, Confidential)."
@@ -11155,11 +10981,11 @@ msgstr ""
 "Choisissez la sensibilité du message à envoyer parmi les quatre options "
 "disponibles (Normal, Personnel, Privé, Confidentiel)."
 
-#: ../C/evolution.xml:5192(title)
+#: ../C/evolution.xml:5167(title)
 msgid "Message Access Delegation:"
 msgstr "Délégation d'accès aux messages :"
 
-#: ../C/evolution.xml:5193(para)
+#: ../C/evolution.xml:5168(para)
 msgid ""
 "Click Send as Delegate to send the message to the recipient on behalf of "
 "someone else."
@@ -11167,7 +10993,7 @@ msgstr ""
 "Cliquez sur « Envoyer en tant que délégué » pour envoyer le message au "
 "destinataire au nom de quelqu'un d'autre."
 
-#: ../C/evolution.xml:5196(para)
+#: ../C/evolution.xml:5171(para)
 msgid ""
 "To send a calendar item as delegate, you should subscribe to the delegator's "
 "message and also you should have necessary rights assigned to you by the "
@@ -11177,21 +11003,21 @@ msgstr ""
 "abonner aux messages de la personne concernée, et celle-ci doit vous avoir "
 "donné les permissions nécessaires."
 
-#: ../C/evolution.xml:5200(para)
-msgid "Click User to open Show Contacts dialogue box."
+#: ../C/evolution.xml:5175(para)
+msgid "Click User to open Show Contacts dialog box."
 msgstr ""
 "Cliquez sur Utilisateur pour ouvrir la boîte de dialogue Afficher les "
 "contacts."
 
-#: ../C/evolution.xml:5203(para)
+#: ../C/evolution.xml:5178(para)
 msgid ""
 "Select the contact from the desired Address book and click Add, then close "
-"the dialogue box."
+"the dialog box."
 msgstr ""
 "Choisissez le contact à partir du carnet d'adresses souhaité, cliquez sur "
 "Ajouter, puis fermez la boîte de dialogue."
 
-#: ../C/evolution.xml:5205(para)
+#: ../C/evolution.xml:5180(para)
 msgid ""
 "You are not permitted to send a message on behalf of more than one person at "
 "a time."
@@ -11199,19 +11025,18 @@ msgstr ""
 "Vous n'avez pas le droit d'envoyer un message de la part de plus d'une "
 "personne à la fois."
 
-#: ../C/evolution.xml:5207(para)
+#: ../C/evolution.xml:5182(para)
 msgid ""
 "When the recipient opens the mail, he or she can also read a message that "
-"‘The message was sent by &lt;<emphasis>Delegator's name</emphasis>&gt; on "
-"behalf of &lt;<emphasis>Delegate's name</emphasis>&gt; on the preview pane "
-"header bar."
+"<guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;"
+"Delegate's name&gt;</guilabel> on the preview pane header bar."
 msgstr ""
 "Lorsque le destinataire ouvre le message, il voit également un message "
-"disant que « Le message a été envoyé par &lt;<emphasis>Nom de la personne "
-"qui a délégué</emphasis>&gt; de la part de &lt;<emphasis>Nom du délégué</"
-"emphasis>&gt; » sur la barre d'en-tête de la zone d'aperçu."
+"disant que « Le message a été envoyé par &lt;Nom de la personne qui a "
+"délégué&gt; de la part de &lt;Nom du délégué&gt; » sur la barre d'en-tête de "
+"la zone d'aperçu."
 
-#: ../C/evolution.xml:5212(para)
+#: ../C/evolution.xml:5187(para)
 msgid ""
 "Select the Request a delivery receipt for this message check box to get a "
 "delivery receipt from your recipient."
@@ -11219,7 +11044,7 @@ msgstr ""
 "Cochez « Demander un accusé de réception pour ce message » pour obtenir un "
 "accusé de réception de la part de vos destinataires."
 
-#: ../C/evolution.xml:5215(para)
+#: ../C/evolution.xml:5190(para)
 msgid ""
 "Select the Request a read receipt for this message to get a read receipt for "
 "the message you have sent."
@@ -11227,15 +11052,11 @@ msgstr ""
 "Cochez « Demander un accusé de lecture pour ce message » pour obtenir un "
 "accusé de lecture de messages envoyés."
 
-#: ../C/evolution.xml:5218(para)
-msgid "Click OK to confirm your selection."
-msgstr "Cliquez sur Valider pour confirmer vos choix."
-
-#: ../C/evolution.xml:5224(title)
+#: ../C/evolution.xml:5199(title)
 msgid "Delegating Calendar Items"
 msgstr "Délégation d'éléments de calendrier"
 
-#: ../C/evolution.xml:5225(para)
+#: ../C/evolution.xml:5200(para)
 msgid ""
 "You can send Meetings or Appointments on behalf of someone else if you have "
 "subscribed to his or her Calendar."
@@ -11243,53 +11064,32 @@ msgstr ""
 "Vous pouvez envoyez des réunions ou des rendez-vous de la part de quelqu'un "
 "d'autre si vous vous êtes abonné à son calendrier."
 
-#: ../C/evolution.xml:5226(para)
-msgid "To delegate a Meeting,"
-msgstr "Pour déléguer une réunion,"
-
-#: ../C/evolution.xml:5229(para)
-msgid "Select the delegator's calendar."
+#: ../C/evolution.xml:5203(para)
+msgid "Select the delegator's Calendar."
 msgstr "Sélectionnez le calendrier de la personne pour laquelle vous agissez."
 
-#: ../C/evolution.xml:5232(para)
+#: ../C/evolution.xml:5206(para)
 msgid "Open a new Meeting composer window."
 msgstr "Ouvrez la fenêtre d'édition d'une nouvelle réunion."
 
-#: ../C/evolution.xml:5235(para)
+#: ../C/evolution.xml:5209(para)
 msgid "Add the recipients."
 msgstr "Ajoutez les destinataires."
 
-#: ../C/evolution.xml:5238(para)
-msgid "Click Send after filling in all other informations required."
-msgstr "Cliquez sur Envoyer après avoir rempli toutes les informations requises."
+#: ../C/evolution.xml:5212(para)
+msgid "Fill in the information."
+msgstr "Complétez les informations."
 
-#: ../C/evolution.xml:5239(para)
+#: ../C/evolution.xml:5214(para)
 msgid ""
-"When the recipient receives the calendar item, he or she can read the "
-"message on top that the <emphasis>&lt;Delegator&gt;</emphasis> through "
-"<emphasis>&lt;Delegate&gt;</emphasis> requests your presence at the "
-"following meeting."
+"When the recipient receives the calendar item, a message indicates that the "
+"item was created by someone on behalf of the Delegator."
 msgstr ""
-"Lorsque le destinataire reçoit l'élément de calendrier, il voit apparaître "
-"un message signalant que <emphasis>&lt;la personne ayant délégué&gt;</"
-"emphasis> par l'intermédiaire de <emphasis>&lt;délégué&gt;</emphasis> "
-"demande votre présence à la réunion ci-après."
-
-#: ../C/evolution.xml:5240(para)
-msgid ""
-"When a delegate receives the calendar item from another delegate, he or she "
-"can read that the &lt;<emphasis>Delegator</emphasis>&gt; through &lt;"
-"<emphasis>Delegate</emphasis>&gt; request the presence at the following "
-"meeting. Please respond of behalf of his or her &lt;<emphasis>Delegator</"
-"emphasis>&gt;."
-msgstr ""
-"Lorsqu'un délégué reçoit l'élément de calendrier d'un autre délégué, il peut "
-"lire que <emphasis>&lt;la personne ayant délégué&gt;</emphasis> par "
-"l'intermédiaire de <emphasis>&lt;délégué&gt;</emphasis> demande votre "
-"présence à la réunion ci-après. Veuillez répondre de la part de "
-"<emphasis>&lt;la personne ayant délégué&gt;</emphasis>."
+"Lorsque le destinataire reçoit l'élément de calendrier, un message signale "
+"que l'élément a été créé par quelqu'un qui agit pour le compte d'une autre "
+"personne."
 
-#: ../C/evolution.xml:5248(para)
+#: ../C/evolution.xml:5222(para)
 msgid ""
 "You can allow other people in your organization's Global Address List to "
 "access your calendar, address book, and messages, and they can let you "
@@ -11303,31 +11103,27 @@ msgstr ""
 "telles que vérifier mutuellement leurs planifications ou gérer mutuellement "
 "et complètement leurs informations personnelles."
 
-#: ../C/evolution.xml:5252(para)
+#: ../C/evolution.xml:5226(para)
 msgid "To add someone to your list of delegates:"
 msgstr "Pour ajouter une personne à votre liste de délégués :"
 
-#: ../C/evolution.xml:5255(para)
-msgid ""
-"Click Edit &gt; Preferences or press Shift+Ctrl+S, then click the Exchange "
-"Settings tab."
-msgstr ""
-"Choisissez Édition &gt; Préférences ou appuyez sur Ctrl+Maj+S, puis cliquez "
-"sur l'onglet Paramètres Exchange."
+#: ../C/evolution.xml:5232(para)
+msgid "Click the Exchange Settings tab."
+msgstr "Cliquez sur l'onglet Paramètres Exchange."
 
-#: ../C/evolution.xml:5258(para)
-msgid "Click Delegation Assistant to open the Delegates dialogue box."
+#: ../C/evolution.xml:5235(para)
+msgid "Click Delegation Assistant to open the Delegates dialog box."
 msgstr ""
 "Cliquez sur Assistant de délégation pour ouvrir la boîte de dialogue de "
 "délégation."
 
-#: ../C/evolution.xml:5263(para)
+#: ../C/evolution.xml:5240(para)
 msgid "Click Add, then search for a contact in the Global Address List."
 msgstr ""
 "Cliquez sur Ajouter, puis recherchez un contact dans la liste d'adresses "
 "globale."
 
-#: ../C/evolution.xml:5264(para)
+#: ../C/evolution.xml:5241(para)
 msgid ""
 "Remember that the Global Address List (GAL) appears empty until you have "
 "searched for something in it."
@@ -11335,15 +11131,15 @@ msgstr ""
 "Souvenez-vous que la liste d'adresses globale (GAL) paraît vide tant que "
 "vous n'avez pas effectué une première recherche."
 
-#: ../C/evolution.xml:5267(para)
+#: ../C/evolution.xml:5244(para)
 msgid ""
-"Select the delegate and click Edit to open the delegate permission dialogue "
+"Select the delegate and click Edit to open the delegate permission dialog "
 "box."
 msgstr ""
 "Sélectionnez le délégué et cliquez sur Édition pour ouvrir la boîte de "
 "dialogue de délégation de permissions."
 
-#: ../C/evolution.xml:5272(para)
+#: ../C/evolution.xml:5249(para)
 msgid ""
 "Select from the following access levels for each of the four types of "
 "folders:"
@@ -11351,15 +11147,15 @@ msgstr ""
 "Pour chacun des quatre types de dossiers, vous pouvez sélectionner l'un des "
 "niveaux d'accès suivants :"
 
-#: ../C/evolution.xml:5275(para)
+#: ../C/evolution.xml:5252(para)
 msgid "Do not allow this person to access any folders of this type."
 msgstr "ne permet pas à la personne d'accéder à ce type de dossier."
 
-#: ../C/evolution.xml:5278(title)
+#: ../C/evolution.xml:5255(title)
 msgid "Reviewer (read-only):"
 msgstr "Relecteur (lecture seule) :"
 
-#: ../C/evolution.xml:5279(para)
+#: ../C/evolution.xml:5256(para)
 msgid ""
 "Allows the delegate to see items in this type of folder, but not create new "
 "items or edit existing items."
@@ -11367,11 +11163,11 @@ msgstr ""
 "permet à la personne d'afficher les éléments de ce type de dossier, mais pas "
 "de créer des éléments, ni d'en modifier."
 
-#: ../C/evolution.xml:5282(title)
+#: ../C/evolution.xml:5259(title)
 msgid "Author (read, create):"
 msgstr "Auteur (lecture, création) :"
 
-#: ../C/evolution.xml:5283(para)
+#: ../C/evolution.xml:5260(para)
 msgid ""
 "The delegate can view items in your folders, and can create new items, but "
 "cannot change any existing items."
@@ -11379,47 +11175,47 @@ msgstr ""
 "le délégué peut afficher les éléments de vos dossiers et peut en créer, mais "
 "il ne peut pas modifier les éléments existants."
 
-#: ../C/evolution.xml:5286(title)
+#: ../C/evolution.xml:5263(title)
 msgid "Editor (read, create, edit):"
 msgstr "Éditeur (lecture, création, modification) :"
 
-#: ../C/evolution.xml:5287(para)
+#: ../C/evolution.xml:5264(para)
 msgid "The delegate can view, create, and change items in your folders."
 msgstr ""
 "le délégué peut afficher et modifier les éléments de vos dossiers et en "
 "créer."
 
-#: ../C/evolution.xml:5294(para)
+#: ../C/evolution.xml:5271(para)
 msgid ""
-"The delegate will be notified through a separate mail that he/she is being "
-"added to your list of delegates. The mail summarizes all the rights that has "
-"been assigned to him or her."
+"The delegate is notified through a separate mail that he or she is being "
+"added to your list of delegates. The mail summarizes all the rights that "
+"have been assigned to the delegate."
 msgstr ""
-"Le délégué sera averti par un courriel distinct qu'il a été ajouté à votre "
+"Le délégué est averti par un courriel distinct qu'il a été ajouté à votre "
 "liste de délégués. Le message résume tous les droits qu'il a reçus."
 
-#: ../C/evolution.xml:5299(para)
+#: ../C/evolution.xml:5276(para)
 msgid "To access the folders delegated to you:"
 msgstr "Pour accéder aux dossiers qui vous sont délégués :"
 
-#: ../C/evolution.xml:5302(para)
+#: ../C/evolution.xml:5279(para)
 msgid "Click File &gt; Subscribe to Other User's Exchange Folder."
 msgstr "Choisissez Fichier &gt; S'abonner à un dossier d'un autre utilisateur."
 
-#: ../C/evolution.xml:5307(para)
+#: ../C/evolution.xml:5284(para)
 msgid ""
-"Specify the e-mail address of the user who has delegated to you, or click "
+"Specify the email address of the user who has delegated to you, or click "
 "User to select the user from your address book."
 msgstr ""
 "Définissez l'adresse électronique de l'utilisateur dont vous êtes le délégué "
 "ou cliquez sur Utilisateur pour sélectionner l'utilisateur dans votre carnet "
 "d'adresses."
 
-#: ../C/evolution.xml:5310(para)
+#: ../C/evolution.xml:5287(para)
 msgid "Select the folder you want to open."
 msgstr "Sélectionnez le dossier à ouvrir."
 
-#: ../C/evolution.xml:5316(para)
+#: ../C/evolution.xml:5293(para)
 msgid ""
 "Folders delegated to you appear in your folder list inside a folder labeled "
 "with the name of its owner. For example, if Martha Thompson delegates "
@@ -11428,11 +11224,11 @@ msgid ""
 msgstr ""
 "Les dossiers qui vous sont délégués figurent dans votre liste de dossiers "
 "dans un dossier portant le nom de son propriétaire. Si, par exemple, Denise "
-"Clin vous délègue des dossiers, le dossier « Dossiers de Denise Clin » "
-"figure dans l'arborescence des dossiers au même niveau que vos dossiers "
-"personnels et publics."
+"Clin vous délègue des dossiers, le dossier « Dossiers de Denise Clin » figure "
+"dans l'arborescence des dossiers au même niveau que vos dossiers personnels "
+"et publics."
 
-#: ../C/evolution.xml:5317(para)
+#: ../C/evolution.xml:5294(para)
 msgid ""
 "If the folder fails to open properly, check with the folder owner to make "
 "sure that you have been granted the correct access permissions."
@@ -11441,55 +11237,57 @@ msgstr ""
 "dossier pour vérifier s'il vous a accordé les autorisations d'accès "
 "appropriées."
 
-#: ../C/evolution.xml:5323(para)
+#: ../C/evolution.xml:5300(para)
 msgid "You can subscribe to public folders available on the Exchange server."
 msgstr ""
 "Vous pouvez vous abonner aux dossiers publics disponibles sur le serveur "
 "Exchange."
 
-#: ../C/evolution.xml:5329(para)
+#: ../C/evolution.xml:5306(para)
 msgid "Select the Exchange account."
 msgstr "Sélectionnez le compte Exchange."
 
-#: ../C/evolution.xml:5332(para)
+#: ../C/evolution.xml:5309(para)
 msgid "Check the folders you want to subscribe to."
 msgstr "Cochez les dossiers auxquels vous souhaitez vous abonner."
 
-#: ../C/evolution.xml:5338(para)
-msgid "The folders you have subscribed to appear in the folder list at the left."
+#: ../C/evolution.xml:5315(para)
+msgid ""
+"The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 "Les dossiers auxquels vous vous êtes abonnés apparaissent dans la liste des "
 "dossiers sur la gauche."
 
-#: ../C/evolution.xml:5341(para)
+#: ../C/evolution.xml:5318(para)
 msgid "To view contents of a folder, click it."
 msgstr "Pour afficher le contenu d'un dossier, cliquez sur celui-ci."
 
-#: ../C/evolution.xml:5348(para)
+#: ../C/evolution.xml:5325(para)
 msgid ""
 "Reminders for meetings in your Exchange calendar do not work until you have "
 "run Evolution at least once after logging in. This is different from locally "
 "stored reminders, which work from the moment you log in, regardless of "
-"whether you have run Evolution in the session.so that you can fix a "
-"convenient time for a meeting.To enable Reminder setting in your Exchange "
-"account, select ‘Remember the password’ checkbox. To find more information "
-"about Reminders see<link linkend=\"bshly4v\">Reminders</link>"
+"whether you have run Evolution in the session so that you can fix a "
+"convenient time for a meeting. To enable Reminder setting in your Exchange "
+"account, select <guilabel>Remember the password</guilabel> checkbox. To find "
+"more information about Reminders see<link linkend=\"bshly4v\">Reminders</"
+"link>."
 msgstr ""
 "Les rappels de rendez-vous dans votre calendrier Exchange ne fonctionnent "
 "pas tant que vous n'avez pas exécuté Evolution au moins fois après vous être "
 "connecté. Ces rappels sont différents des rappels stockés localement qui "
 "fonctionnent dès que vous êtes connecté, que vous ayez exécuté ou non "
 "Evolution dans la session. Pour activer les rappels de votre compte "
-"Exchange, cochez la case « Se souvenir du mot de passe ». Pour en savoir "
-"plus sur les rappels, consultez <link linkend=\"bshly4v\">Rappels</link>."
+"Exchange, cochez la case « Se souvenir du mot de passe ». Pour en savoir plus "
+"sur les rappels, consultez <link linkend=\"bshly4v\">Rappels</link>."
 
-#: ../C/evolution.xml:5353(para)
+#: ../C/evolution.xml:5330(para)
 msgid ""
 "An Out of Office message is an automatic reply that you can send as a reply "
-"to messages, explaining why you aren't immediately responding to their "
-"messages. For example, if you go on vacation for a week and won't access "
-"your e-mail, you can set an automatic reply so that people know that you "
-"aren't ignoring them."
+"to messages, explaining why you are not immediately responding to their "
+"messages. For example, if you go on vacation for a week and will not access "
+"your email, you can set an automatic reply so that people know that you are "
+"not ignoring them."
 msgstr ""
 "Un message d'absence du bureau est un message que vous envoyez "
 "automatiquement en réponse aux messages que vous recevez et qui explique la "
@@ -11498,15 +11296,11 @@ msgstr ""
 "accéder à votre courrier, vous pouvez définir une réponse automatique pour "
 "indiquer aux personnes que vous ne les ignorez pas."
 
-#: ../C/evolution.xml:5356(para)
-msgid "Click Edit &gt; Preferences &gt; Mail Accounts."
-msgstr "Choisissez Édition &gt; Préférences &gt; Comptes de messagerie."
-
-#: ../C/evolution.xml:5359(para)
+#: ../C/evolution.xml:5336(para)
 msgid "Select the Exchange account, then click Edit."
 msgstr "Sélectionnez le compte Exchange, puis cliquez sur Édition."
 
-#: ../C/evolution.xml:5362(para)
+#: ../C/evolution.xml:5339(para)
 msgid ""
 "Select the Exchange Settings tab. The top option allows you to set an Out of "
 "Office message."
@@ -11514,15 +11308,15 @@ msgstr ""
 "Sélectionnez l'onglet Paramètres Exchange. La première option vous permet de "
 "définir un message d'absence du bureau."
 
-#: ../C/evolution.xml:5365(para)
+#: ../C/evolution.xml:5342(para)
 msgid "Click I Am Currently Out of the Office."
 msgstr "Cochez « Je suis actuellement absent du bureau »."
 
-#: ../C/evolution.xml:5368(para)
+#: ../C/evolution.xml:5345(para)
 msgid "Type a short message in the text field."
 msgstr "Saisissez un bref message dans le champ de texte."
 
-#: ../C/evolution.xml:5375(para)
+#: ../C/evolution.xml:5352(para)
 msgid ""
 "Your message is automatically sent to anyone who sends you mail until you "
 "return and select I Am in the office."
@@ -11531,7 +11325,7 @@ msgstr ""
 "écrivent jusqu'à ce que vous soyez de retour et cliquiez sur « Je suis "
 "actuellement au bureau »."
 
-#: ../C/evolution.xml:5381(para)
+#: ../C/evolution.xml:5358(para)
 msgid ""
 "Evolution helps you fix a convenient time for a meeting according to the "
 "availability of the attendees.It's Free/Busy feature allows you to perform a "
@@ -11545,11 +11339,11 @@ msgstr ""
 "sont disponibles d'après leur calendrier Exchange. En cas de non "
 "disponibilité, vous pouvez réagender la réunion."
 
-#: ../C/evolution.xml:5385(para)
+#: ../C/evolution.xml:5362(para)
 msgid "Create a new appointment in the calendar."
 msgstr "Ouvrez un nouveau rendez-vous dans le calendrier."
 
-#: ../C/evolution.xml:5388(para)
+#: ../C/evolution.xml:5365(para)
 msgid ""
 "Right-click the appointment, then select Schedule Meeting to appear "
 "Evolution Meeting editor."
@@ -11557,11 +11351,12 @@ msgstr ""
 "Faites un clic droit sur le rendez-vous, puis choisissez « Planifier une "
 "réunion » pour faire apparaître l'éditeur de réunion d'Evolution."
 
-#: ../C/evolution.xml:5391(para)
+#: ../C/evolution.xml:5368(para)
 msgid "Click the Add tab to enter the email addresses into the list."
-msgstr "Cliquez sur Ajouter pour ajouter des adresses électroniques dans la liste."
+msgstr ""
+"Cliquez sur Ajouter pour ajouter des adresses électroniques dans la liste."
 
-#: ../C/evolution.xml:5394(para)
+#: ../C/evolution.xml:5371(para)
 msgid ""
 "Click the Attendees tab to select the participants from Global Address List "
 "(GAL)."
@@ -11569,17 +11364,18 @@ msgstr ""
 "Cliquez sur Participants pour sélectionner des participants à partir de la "
 "liste d'adresses globale (GAL)."
 
-#: ../C/evolution.xml:5395(para)
-msgid "You can directly select the participants from the following address lists."
+#: ../C/evolution.xml:5372(para)
+msgid ""
+"You can directly select the participants from the following address lists."
 msgstr ""
 "Vous pouvez sélectionnez directement des participants dans les listes "
 "d'adresses suivantes."
 
-#: ../C/evolution.xml:5401(para)
+#: ../C/evolution.xml:5378(para)
 msgid "Global Address List"
 msgstr "Liste d'adresses globale"
 
-#: ../C/evolution.xml:5407(para)
+#: ../C/evolution.xml:5384(para)
 msgid ""
 "You can also specify the category as Anniversary, Birthday, Business etc. "
 "from the drop-down list for each address list given."
@@ -11587,31 +11383,31 @@ msgstr ""
 "Vous pouvez aussi indiquer une catégorie (Anniversaire, Bureau, etc.) dans "
 "la liste déroulante correspondante de chaque liste d'adresses."
 
-#: ../C/evolution.xml:5410(para)
+#: ../C/evolution.xml:5387(para)
 msgid "Add the participants to the following categories of attendees."
 msgstr "Ajoutez des participants dans les catégories suivantes."
 
-#: ../C/evolution.xml:5413(para)
+#: ../C/evolution.xml:5390(para)
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: ../C/evolution.xml:5416(para)
+#: ../C/evolution.xml:5393(para)
 msgid "Required Participants"
 msgstr "Participants attendus"
 
-#: ../C/evolution.xml:5419(para)
+#: ../C/evolution.xml:5396(para)
 msgid "Optional Participants"
 msgstr "Participants optionnels"
 
-#: ../C/evolution.xml:5422(para)
+#: ../C/evolution.xml:5399(para)
 msgid "Resources"
 msgstr "Ressources"
 
-#: ../C/evolution.xml:5427(para)
+#: ../C/evolution.xml:5404(para)
 msgid "Click Free/Busy tool at the top right corner."
 msgstr "Cliquez sur Libre/Occupé à droite de la barre d'outils."
 
-#: ../C/evolution.xml:5430(para)
+#: ../C/evolution.xml:5407(para)
 msgid ""
 "Click Options &gt; Update Free/Busy to check participant schedules and, if "
 "possible, update the meeting in all participants' calendars"
@@ -11620,15 +11416,15 @@ msgstr ""
 "planifications des participants et, si possible, mettre à jour la réunion "
 "dans les calendriers de tous les participants."
 
-#: ../C/evolution.xml:5433(para)
+#: ../C/evolution.xml:5410(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
-"meeting, you can “nudge” the meeting forward or backward to the nearest "
-"available time. To do so, just click the arrows to the left or right of the "
-"Autopick button. The Autopick tool lets you move the meeting to the nearest "
-"time during which all attendees are available. If you are not satisfied with "
-"those results, you can also drag the edges of the area marked as meeting "
-"time to the hours that you want to select."
+"meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
+"nearest available time. To do so, just click the arrows to the left or right "
+"of the Autopick button. The Autopick tool lets you move the meeting to the "
+"nearest time during which all attendees are available. If you are not "
+"satisfied with those results, you can also drag the edges of the area marked "
+"as meeting time to the hours that you want to select."
 msgstr ""
 "Si des personnes ne sont pas disponibles pour l'horaire de réunion que vous "
 "avez planifié, vous pouvez « décaler » la réunion en l'avançant ou en la "
@@ -11639,41 +11435,45 @@ msgstr ""
 "convient pas, vous pouvez faire glisser les bords de l'horaire de la réunion "
 "vers les heures que vous voulez sélectionner."
 
-#: ../C/evolution.xml:5439(para)
-msgid "Evolution™ can access accounts on Novell® GroupWise® 7 system."
+#: ../C/evolution.xml:5416(para)
+msgid ""
+"<trademark>Evolution</trademark> can access accounts on <trademark class="
+"\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
+"trademark> 7 system."
 msgstr ""
-"Evolution peut accéder à des comptes sur le système GroupWise&reg; de "
-"Novell&reg;."
+"<trademark>Evolution</trademark> peut accéder à des comptes du système "
+"<trademark class=\"registered\">Novell</trademark><trademark class="
+"\"registered\">GroupWise</trademark> 7."
 
-#: ../C/evolution.xml:5442(link) ../C/evolution.xml:5465(title)
+#: ../C/evolution.xml:5419(link) ../C/evolution.xml:5442(title)
 msgid "GroupWise Features"
 msgstr "Fonctionnalités GroupWise"
 
-#: ../C/evolution.xml:5445(link) ../C/evolution.xml:5554(title)
+#: ../C/evolution.xml:5422(link) ../C/evolution.xml:5531(title)
 msgid "GroupWise Terminology vs. Evolution Terminology"
 msgstr "Terminologie GroupWise vs. terminologie Evolution"
 
-#: ../C/evolution.xml:5448(link) ../C/evolution.xml:5625(title)
+#: ../C/evolution.xml:5425(link) ../C/evolution.xml:5602(title)
 msgid "Adding your GroupWise Account to Evolution"
 msgstr "Ajout d'un compte GroupWise à Evolution"
 
-#: ../C/evolution.xml:5451(link) ../C/evolution.xml:5764(title)
+#: ../C/evolution.xml:5428(link) ../C/evolution.xml:5743(title)
 msgid "Scheduling Appointments with Free/Busy"
 msgstr "Planification de rendez-vous avec Libre/Occupé"
 
-#: ../C/evolution.xml:5454(link) ../C/evolution.xml:5786(title)
+#: ../C/evolution.xml:5431(link) ../C/evolution.xml:5765(title)
 msgid "Managing Sent Items"
 msgstr "Gestion des éléments envoyés"
 
-#: ../C/evolution.xml:5457(link) ../C/evolution.xml:5982(title)
+#: ../C/evolution.xml:5434(link) ../C/evolution.xml:5946(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
 msgstr "Accès à la messagerie et au calendrier par d'autres personnes"
 
-#: ../C/evolution.xml:5460(link) ../C/evolution.xml:6152(title)
+#: ../C/evolution.xml:5437(link) ../C/evolution.xml:6117(title)
 msgid "Junk Mail Handling"
 msgstr "Gestion du pourriel"
 
-#: ../C/evolution.xml:5466(para)
+#: ../C/evolution.xml:5443(para)
 msgid ""
 "GroupWise connectivity in Evolution supports the following basic Novell "
 "GroupWise features:"
@@ -11681,23 +11481,24 @@ msgstr ""
 "La connectivité GroupWise dans Evolution gère les fonctionnalités GroupWise "
 "de base suivantes :"
 
-#: ../C/evolution.xml:5472(para)
+#: ../C/evolution.xml:5449(para)
 msgid "Viewing mail and folders stored on the GroupWise system."
-msgstr "Affichage des courriels et des dossiers stockés sur un système GroupWise."
+msgstr ""
+"Affichage des courriels et des dossiers stockés sur un système GroupWise."
 
-#: ../C/evolution.xml:5475(para)
+#: ../C/evolution.xml:5452(para)
 msgid "Sending mail from you GroupWise account."
 msgstr "Envoi de messages depuis votre compte GroupWise."
 
-#: ../C/evolution.xml:5478(para)
+#: ../C/evolution.xml:5455(para)
 msgid "Converting mail to a task or meeting."
 msgstr "Conversion de messages en tâches ou rendez-vous."
 
-#: ../C/evolution.xml:5481(para)
+#: ../C/evolution.xml:5458(para)
 msgid "Tracking the status of a message."
 msgstr "Suivi de l'état d'un message."
 
-#: ../C/evolution.xml:5484(para)
+#: ../C/evolution.xml:5461(para)
 msgid ""
 "Marking a message as junk mail adds the sender to your GroupWise junk mail "
 "list."
@@ -11705,11 +11506,11 @@ msgstr ""
 "Le signalement d'un message comme pourriel ajoute l'expéditeur à votre liste "
 "de pourriels GroupWise."
 
-#: ../C/evolution.xml:5487(para)
+#: ../C/evolution.xml:5464(para)
 msgid "Improved Status Tracking."
 msgstr "Suivi d'état amélioré."
 
-#: ../C/evolution.xml:5495(para)
+#: ../C/evolution.xml:5472(para)
 msgid ""
 "You can send and receive appointment and meeting requests. Allows Evolution "
 "users to schedule meetings and view attendee availability for other users on "
@@ -11719,7 +11520,7 @@ msgstr ""
 "Cela permet aux utilisateurs d'Evolution de planifier des réunions et de "
 "consulter la disponibilité d'autres utilisateurs de GroupWise."
 
-#: ../C/evolution.xml:5498(para)
+#: ../C/evolution.xml:5475(para)
 msgid ""
 "You can receive an iCalendar meeting request and add it to your GroupWise "
 "calendar."
@@ -11727,7 +11528,7 @@ msgstr ""
 "Vous pouvez recevoir une demande de réunion iCalendar et l'ajouter à votre "
 "calendrier GroupWise."
 
-#: ../C/evolution.xml:5506(para)
+#: ../C/evolution.xml:5483(para)
 msgid ""
 "Address Completion is supported for your GroupWise address books, including "
 "the System address book, the Frequent Contacts address book, and your "
@@ -11737,22 +11538,22 @@ msgstr ""
 "d'adresses GroupWise, y compris le carnet d'adresses système, le carnet "
 "d'adresses Contacts fréquents et le carnet d'adresses personnel."
 
-#: ../C/evolution.xml:5509(para)
+#: ../C/evolution.xml:5486(para)
 msgid ""
 "If you receive a card attachment and click Save in Address Book, it is saved "
 "to your Personal address book. New Address Book entries can also be added to "
-"your personal address book from received E-mail messages."
+"your personal address book from received Email messages."
 msgstr ""
 "Si vous recevez une carte de visite en pièce jointe et que vous choisissez "
 "de l'enregistrer dans le carnet d'adresses, elle est enregistrée dans votre "
 "carnet d'adresses personnel. De nouvelles adresses peuvent également être "
 "ajoutées à votre carnet d'adresses personnel à partir de courriels reçus."
 
-#: ../C/evolution.xml:5512(para)
+#: ../C/evolution.xml:5489(para)
 msgid ""
 "To create your GroupWise Frequent contacts and Personal address books, you "
 "need to access your GroupWise account once through GroupWise Java client "
-"because Evolution currently does not support creating them.The GroupWise "
+"because Evolution currently does not support creating them. The GroupWise "
 "system address book is marked for offline use by default.This boosts "
 "performance."
 msgstr ""
@@ -11762,11 +11563,11 @@ msgstr ""
 "carnet d'adresses système de GroupWise est par défaut marqué accessible hors "
 "ligne. Cela améliore les performances."
 
-#: ../C/evolution.xml:5517(para) ../C/evolution.xml:5589(para)
+#: ../C/evolution.xml:5494(para) ../C/evolution.xml:5566(para)
 msgid "Reminder Note"
 msgstr "Notes de rappel"
 
-#: ../C/evolution.xml:5520(para)
+#: ../C/evolution.xml:5497(para)
 msgid ""
 "GroupWise Reminder Note is integrated into Memo component. You can view the "
 "Reminder notes listed under Memos at the bottom right of the Calendar view "
@@ -11777,39 +11578,40 @@ msgstr ""
 "l'affichage du calendrier, pour autant que vous les ayez sélectionnées dans "
 "le composant Mémos."
 
-#: ../C/evolution.xml:5525(para)
+#: ../C/evolution.xml:5502(para)
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../C/evolution.xml:5528(para)
+#: ../C/evolution.xml:5505(para)
 msgid "You can assign Proxy access to other users."
 msgstr "Vous pouvez attribuer un accès Proxy à d'autres utilisateurs."
 
-#: ../C/evolution.xml:5531(para)
+#: ../C/evolution.xml:5508(para)
 msgid "You can view other users' accounts through Proxy access."
-msgstr "Vous pouvez voir les comptes d'autres utilisateurs au moyen de l'accès Proxy."
+msgstr ""
+"Vous pouvez voir les comptes d'autres utilisateurs au moyen de l'accès Proxy."
 
-#: ../C/evolution.xml:5536(para)
+#: ../C/evolution.xml:5513(para)
 msgid "There are, however, some features that are not available:"
 msgstr "Certaines fonctionnalités ne sont cependant pas disponibles :"
 
-#: ../C/evolution.xml:5539(para)
+#: ../C/evolution.xml:5516(para)
 msgid "Resending items"
 msgstr "Renvois d'éléments"
 
-#: ../C/evolution.xml:5542(para)
+#: ../C/evolution.xml:5519(para)
 msgid "Retracting items"
 msgstr "Retraits d'éléments"
 
-#: ../C/evolution.xml:5545(para)
+#: ../C/evolution.xml:5522(para)
 msgid "Accepting appointments or meetings in offline mode"
 msgstr "Acceptation de rendez-vous ou de réunions en mode hors ligne."
 
-#: ../C/evolution.xml:5548(para)
+#: ../C/evolution.xml:5525(para)
 msgid "Archive"
 msgstr "Archive"
 
-#: ../C/evolution.xml:5555(para)
+#: ../C/evolution.xml:5532(para)
 msgid ""
 "GroupWise and Evolution sometimes uses different terminology for different "
 "types of items. The following table compares GroupWise terminology to "
@@ -11819,59 +11621,55 @@ msgstr ""
 "certains types d'éléments. Le tableau ci-après compare la terminologie "
 "GroupWise avec la terminologie Evolution."
 
-#: ../C/evolution.xml:5563(para)
+#: ../C/evolution.xml:5540(para)
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../C/evolution.xml:5566(para) ../C/evolution.xml:7262(glossterm)
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../C/evolution.xml:5573(para) ../C/evolution.xml:5584(para)
+#: ../C/evolution.xml:5550(para) ../C/evolution.xml:5561(para)
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: ../C/evolution.xml:5576(para)
+#: ../C/evolution.xml:5553(para)
 msgid "Meeting"
 msgstr "Réunion"
 
-#: ../C/evolution.xml:5581(para)
+#: ../C/evolution.xml:5558(para)
 msgid "Posted Appointment"
 msgstr "Rendez-vous posté"
 
-#: ../C/evolution.xml:5592(para) ../C/evolution.xml:5616(para)
+#: ../C/evolution.xml:5569(para) ../C/evolution.xml:5593(para)
 msgid "None; use a task"
 msgstr "Aucun ; utilisez les tâches"
 
-#: ../C/evolution.xml:5597(para)
+#: ../C/evolution.xml:5574(para)
 msgid "Discussion Note"
 msgstr "Note de discussion"
 
-#: ../C/evolution.xml:5600(para)
+#: ../C/evolution.xml:5577(para)
 msgid "None; use an assigned task"
 msgstr "Aucun ; utilisez les tâches attribuées"
 
-#: ../C/evolution.xml:5605(para)
+#: ../C/evolution.xml:5582(para)
 msgid "Phone Message"
 msgstr "Message téléphonique"
 
-#: ../C/evolution.xml:5608(para)
+#: ../C/evolution.xml:5585(para)
 msgid "None; use a message"
 msgstr "Aucun ; utilisez les messages"
 
-#: ../C/evolution.xml:5613(para)
+#: ../C/evolution.xml:5590(para)
 msgid "Checklist"
 msgstr "Liste de contrôle"
 
-#: ../C/evolution.xml:5628(link) ../C/evolution.xml:5636(title)
+#: ../C/evolution.xml:5605(link) ../C/evolution.xml:5613(title)
 msgid "Creating a New GroupWise Account"
 msgstr "Création d'un compte GroupWise"
 
-#: ../C/evolution.xml:5631(link) ../C/evolution.xml:5651(title)
+#: ../C/evolution.xml:5608(link) ../C/evolution.xml:5628(title)
 msgid "Changing an Existing Account to Work with GroupWise"
 msgstr "Modification d'un compte existant pour l'utiliser avec GroupWise"
 
-#: ../C/evolution.xml:5645(para)
+#: ../C/evolution.xml:5622(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>."
@@ -11879,23 +11677,23 @@ msgstr ""
 "Créez un compte selon la procédure indiquée dans <link linkend=\"usage-"
 "mainwindow-starting\">Démarrage d'Evolution pour la première fois</link>."
 
-#: ../C/evolution.xml:5652(para)
+#: ../C/evolution.xml:5629(para)
 msgid ""
-"If you have an existing e-mail account, and want to convert it to use with "
+"If you have an existing email account, and want to convert it to use with "
 "GroupWise:"
 msgstr ""
 "Si vous disposez d'un compte de messagerie et que vous voulez le convertir "
 "afin de l'utiliser avec GroupWise :"
 
-#: ../C/evolution.xml:5658(para)
+#: ../C/evolution.xml:5635(para)
 msgid "Select the account you want to convert, then click Edit."
 msgstr "Sélectionnez le compte à convertir, puis cliquez sur Édition."
 
-#: ../C/evolution.xml:5661(para)
+#: ../C/evolution.xml:5638(para)
 msgid "Click the Identity tab."
 msgstr "Cliquez sur l'onglet Identité."
 
-#: ../C/evolution.xml:5669(para)
+#: ../C/evolution.xml:5646(para)
 msgid ""
 "Click the Receiving Email tab, then select Novell GroupWise as your server "
 "type."
@@ -11903,7 +11701,7 @@ msgstr ""
 "Cliquez sur l'onglet Réception des courriels, puis sélectionnez Novell "
 "GroupWise comme type de serveur."
 
-#: ../C/evolution.xml:5674(para)
+#: ../C/evolution.xml:5651(para)
 msgid ""
 "Type the name of your mail server, your user name, and select whether to use "
 "SSL."
@@ -11911,7 +11709,7 @@ msgstr ""
 "Saisissez le nom de votre serveur de messagerie, votre nom d'utilisateur et "
 "choisissez s'il faut utiliser SSL."
 
-#: ../C/evolution.xml:5676(para)
+#: ../C/evolution.xml:5653(para)
 msgid ""
 "Select SSL for a highly secured connection between your client and server. "
 "Contact your administrator for further details."
@@ -11919,15 +11717,7 @@ msgstr ""
 "Choisissez SSL pour une connexion hautement sécurisée entre le client et le "
 "serveur. Contactez votre administrateur pour plus de détails."
 
-#: ../C/evolution.xml:5680(para)
-msgid ""
-"Click the Receiving Options tab, then select if you want Evolution to "
-"automatically check for new mail."
-msgstr ""
-"Cliquez sur l'onglet Options de réception, puis cochez si vous souhaitez "
-"qu'Evolution relève automatiquement les nouveaux messages."
-
-#: ../C/evolution.xml:5700(para)
+#: ../C/evolution.xml:5678(para)
 msgid ""
 "Select if you want to automatically synchronize your remote calendar and "
 "contacts locally."
@@ -11935,7 +11725,7 @@ msgstr ""
 "Choisisssez si vous voulez synchroniser automatiquement les contacts et le "
 "calendrier avec votre système local."
 
-#: ../C/evolution.xml:5701(para)
+#: ../C/evolution.xml:5679(para)
 msgid ""
 "It fetches the remote calendar and contact information and stores it on your "
 "local drive."
@@ -11943,7 +11733,7 @@ msgstr ""
 "Evolution récupère les informations des contacts et du calendrier distants "
 "et les stocke sur votre disque local."
 
-#: ../C/evolution.xml:5703(para)
+#: ../C/evolution.xml:5681(para)
 msgid ""
 "Remote calendar and contacts are typically stored remotely on servers rather "
 "than on local hard disk."
@@ -11951,7 +11741,7 @@ msgstr ""
 "Les contacts et le calendrier distants sont généralement stockés à distance "
 "sur les serveurs plutôt que sur les disques durs locaux."
 
-#: ../C/evolution.xml:5707(para)
+#: ../C/evolution.xml:5685(para)
 msgid ""
 "Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -11959,7 +11749,7 @@ msgstr ""
 "Indiquez le port SOAP de l'agent de bureau de poste dans le champ "
 "correspondant."
 
-#: ../C/evolution.xml:5711(para)
+#: ../C/evolution.xml:5689(para)
 msgid ""
 "(Optional) Click the Proxy tab, then click Add to add any Proxy users to "
 "your account."
@@ -11967,15 +11757,11 @@ msgstr ""
 "(facultatif) Cliquez sur l'onglet Proxy, puis sur Ajouter pour ajouter des "
 "utilisateurs Proxy à votre compte."
 
-#: ../C/evolution.xml:5714(para) ../C/evolution.xml:6106(para)
-msgid "Click OK, then click Close."
-msgstr "Cliquez sur Valider, puis sur Fermer."
-
-#: ../C/evolution.xml:5721(title)
+#: ../C/evolution.xml:5700(title)
 msgid "Reminder Notes"
 msgstr "Notes de rappel"
 
-#: ../C/evolution.xml:5722(para)
+#: ../C/evolution.xml:5701(para)
 msgid ""
 "GroupWise Reminder notes are like mail messages except they are scheduled "
 "for a particular day and appear on the Calendar for that date. You can use "
@@ -11991,7 +11777,7 @@ msgstr ""
 "indiquée. Elles n'apparaissent pas dans votre boîte de messagerie ni dans "
 "celle d'autres utilisateurs."
 
-#: ../C/evolution.xml:5723(para)
+#: ../C/evolution.xml:5702(para)
 msgid ""
 "Evolution integrates this feature into its Memo component so that you can "
 "view the Reminder notes listed under Memo at the right bottom side of the "
@@ -12001,7 +11787,7 @@ msgstr ""
 "vous puissiez voir les notes de rappel dans la liste des mémos en bas à "
 "droite de la vue calendrier."
 
-#: ../C/evolution.xml:5725(para)
+#: ../C/evolution.xml:5704(para)
 msgid ""
 "Select the memo or the Reminder notes under the Memo component to display it "
 "on the Calendar view."
@@ -12009,7 +11795,7 @@ msgstr ""
 "Sélectionnez le mémo ou la note de rappel dans le composant Mémos afin de "
 "l'afficher dans la vue Calendrier."
 
-#: ../C/evolution.xml:5728(para)
+#: ../C/evolution.xml:5707(para)
 msgid ""
 "To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</"
 "link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend="
@@ -12019,15 +11805,15 @@ msgstr ""
 "\"b1012vde\">1</link> à <link linkend=\"b10fqh6r\">8</link> dans la rubrique "
 "<link linkend=\"b1012vdd\">Mémos</link>."
 
-#: ../C/evolution.xml:5729(para)
+#: ../C/evolution.xml:5708(para)
 msgid "To send a Reminder Note,"
 msgstr "Pour envoyer une note de rappel :"
 
-#: ../C/evolution.xml:5732(para)
-msgid "Click New &gt; Shared Memo to open the new window."
-msgstr "Choisissez Nouveau &gt; Mémo partagé pour ouvrir une nouvelle fenêtre."
+#: ../C/evolution.xml:5711(para)
+msgid "Click File &gt; New &gt; Shared Memo."
+msgstr "Choisissez Fichier &gt; Nouveau &gt; Mémo partagé."
 
-#: ../C/evolution.xml:5735(para)
+#: ../C/evolution.xml:5714(para)
 msgid ""
 "Select the Organizer's account name from the drop-down list given next to "
 "the Organizer field."
@@ -12035,7 +11821,7 @@ msgstr ""
 "Sélectionnez le nom du compte de l'organisateur dans la liste déroulante "
 "« Organisateur »."
 
-#: ../C/evolution.xml:5738(para)
+#: ../C/evolution.xml:5717(para)
 msgid ""
 "In the To field, type a username, then press Enter. Repeat for additional "
 "users."
@@ -12043,27 +11829,15 @@ msgstr ""
 "Dans le champ À, saisissez un nom d'utilisateur, puis appuyez sur Entrée. "
 "Répétez l'opération pour ajouter d'autres utilisateurs."
 
-#: ../C/evolution.xml:5741(para)
-msgid "Select the Group in which you would create the entry."
-msgstr "Sélectionnez le groupe dans lequel vous souhaitez créer le mémo."
-
-#: ../C/evolution.xml:5744(para)
-msgid "Enter a brief description about the Reminder Note in the Summary field."
-msgstr "Saisissez une brève description de la note de rappel dans le champ Résumé."
-
-#: ../C/evolution.xml:5750(para)
+#: ../C/evolution.xml:5729(para)
 msgid "Specify the category that the Reminder note falls under."
 msgstr "Indiquez la catégorie sous laquelle doit apparaître la note de rappel."
 
-#: ../C/evolution.xml:5753(para)
-msgid "Enter the description for the Reminder Note."
-msgstr "Saisissez la description de la note de rappel."
-
-#: ../C/evolution.xml:5756(para)
+#: ../C/evolution.xml:5735(para)
 msgid "Click Save."
 msgstr "Cliquez sur « Enregistrer »."
 
-#: ../C/evolution.xml:5765(para)
+#: ../C/evolution.xml:5744(para)
 msgid ""
 "When you schedule a meeting with your calendar on GroupWise, you can check "
 "when other local GroupWise users are busy according to their GroupWise "
@@ -12073,7 +11847,7 @@ msgstr ""
 "pouvez consulter la disponibilité d'autres utilisateurs GroupWise locaux "
 "selon leurs agendas."
 
-#: ../C/evolution.xml:5767(para)
+#: ../C/evolution.xml:5746(para)
 msgid ""
 "Reminders for appointments in your GroupWise calendar do not work until you "
 "have run Evolution at least once after logging in. This is different from "
@@ -12086,23 +11860,23 @@ msgstr ""
 "fonctionnent dès que vous êtes connecté, que vous ayez exécuté ou non "
 "Evolution dans la session."
 
-#: ../C/evolution.xml:5770(para)
+#: ../C/evolution.xml:5749(para)
 msgid "Open a new appointment in the calendar."
 msgstr "Ouvrez un nouveau rendez-vous dans le calendrier."
 
-#: ../C/evolution.xml:5773(para)
+#: ../C/evolution.xml:5752(para)
 msgid "Click Actions &gt; Schedule Meeting."
 msgstr "Cliquez sur Actions &gt; Planifier une réunion."
 
-#: ../C/evolution.xml:5776(para)
+#: ../C/evolution.xml:5755(para)
 msgid ""
-"Add attendees, either by entering their e-mail addresses into the list, or "
-"by clicking the Invite Others button."
+"Add attendees, either by entering their email addresses into the list, or by "
+"clicking the Invite Others button."
 msgstr ""
 "Ajoutez des participants, soit en saisissant des adresses électroniques dans "
 "la liste, soit en cliquant sur le bouton Participants."
 
-#: ../C/evolution.xml:5779(para)
+#: ../C/evolution.xml:5758(para)
 msgid ""
 "Click Options, then click Update Free/Busy to check participant schedules "
 "and, if possible, update the meeting in all participants' calendars."
@@ -12111,15 +11885,15 @@ msgstr ""
 "agendas des participants et, si possible, mettre à jour la réunion dans les "
 "calendriers de tous les participants."
 
-#: ../C/evolution.xml:5782(para)
+#: ../C/evolution.xml:5761(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
-"meeting, you can “nudge” the meeting forward or backward to the nearest "
-"available time. To do so, just click the arrows to the left or right of the "
-"Autopick button. The Autopick tool moves the meeting to the nearest time "
-"during which all attendees are available. If you aren't satisfied with those "
-"results, you can drag the edges of the meeting time to the hours that you "
-"want to select."
+"meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
+"nearest available time. To do so, just click the arrows to the left or right "
+"of the Autopick button. The Autopick tool moves the meeting to the nearest "
+"time during which all attendees are available. If you aren't satisfied with "
+"those results, you can drag the edges of the meeting time to the hours that "
+"you want to select."
 msgstr ""
 "Si des personnes ne sont pas disponibles pour l'horaire de réunion que vous "
 "avez planifié, vous pouvez « décaler » la réunion en l'avançant ou en la "
@@ -12130,60 +11904,61 @@ msgstr ""
 "convient pas, vous pouvez faire glisser les bords de l'horaire de la réunion "
 "vers les heures que vous voulez sélectionner."
 
-#: ../C/evolution.xml:5789(link) ../C/evolution.xml:5809(title)
+#: ../C/evolution.xml:5768(link) ../C/evolution.xml:5788(title)
 msgid "Confirming Delivery of Items You have Sent"
 msgstr "Confirmation de réception des éléments envoyés"
 
-#: ../C/evolution.xml:5792(link) ../C/evolution.xml:5923(title)
+#: ../C/evolution.xml:5771(link) ../C/evolution.xml:5894(title)
 msgid "Displaying Sent Items"
 msgstr "Affichage des éléments envoyés"
 
-#: ../C/evolution.xml:5795(link) ../C/evolution.xml:5858(title)
+#: ../C/evolution.xml:5774(link) ../C/evolution.xml:5833(title)
 msgid "Checking the Status of an Item You Have Sent"
 msgstr "Contrôle de l'état d'un élément envoyé"
 
-#: ../C/evolution.xml:5798(link) ../C/evolution.xml:5801(link)
-#: ../C/evolution.xml:5885(title)
+#: ../C/evolution.xml:5777(link) ../C/evolution.xml:5780(link)
+#: ../C/evolution.xml:5860(title)
 msgid "Requesting a Reply for Items You Send"
 msgstr "Demande de réponse pour des éléments envoyés"
 
-#: ../C/evolution.xml:5805(para)
+#: ../C/evolution.xml:5784(para)
 msgid ""
-"You can manage your sent items for GroupWise e-mail only if the recipient is "
+"You can manage your sent items for GroupWise email only if the recipient is "
 "located on the same GroupWise system as you."
 msgstr ""
 "Vous pouvez gérer les éléments envoyés de la messagerie GroupWise uniquement "
 "si le destinataire se trouve dans le même système GroupWise que vous."
 
-#: ../C/evolution.xml:5810(para)
+#: ../C/evolution.xml:5789(para)
 msgid ""
 "Evolution provides several ways for you to confirm that your item was "
 "delivered. You can easily track message status of any message you have sent. "
-"For example, you can see when an e-mail was delivered and when the recipient "
-"opened or deleted the e-mail."
+"For example, you can see when an email was delivered and when the recipient "
+"opened or deleted the email."
 msgstr ""
 "Evolution peut vous confirmer de plusieurs manières qu'un élément a bien été "
 "envoyé. Vous pouvez facilement suivre l'état de tout message envoyé. Par "
 "exemple, vous pouvez voir quand un courriel a été reçu et que le "
 "destinataire a ouvert ou détruit le message."
 
-#: ../C/evolution.xml:5812(title)
+#: ../C/evolution.xml:5791(title)
 msgid "Track an Item You Sent:"
 msgstr "Suivi d'un élément envoyé :"
 
-#: ../C/evolution.xml:5813(para)
+#: ../C/evolution.xml:5792(para)
 msgid ""
-"You can check the status in the Message Status window of an e-mail You have "
+"You can check the status in the Message Status window of an email you have "
 "sent."
 msgstr ""
 "Vous pouvez consulter l'état d'un courriel envoyé dans la fenêtre État du "
 "message."
 
-#: ../C/evolution.xml:5816(title)
+#: ../C/evolution.xml:5795(title)
 msgid "Receive Notification When the Item is Opened or Deleted:"
-msgstr "Réception d'une notification à l'ouverture ou à la suppression d'un élément :"
+msgstr ""
+"Réception d'une notification à l'ouverture ou à la suppression d'un élément :"
 
-#: ../C/evolution.xml:5817(para)
+#: ../C/evolution.xml:5796(para)
 msgid ""
 "You can receive notification when the recipient opens or deletes a message. "
 "For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items "
@@ -12193,13 +11968,13 @@ msgstr ""
 "détruit un message. Pour en savoir plus, consultez <link linkend=\"Ak05sv1"
 "\">Demande de réponse pour des éléments envoyés</link>."
 
-#: ../C/evolution.xml:5820(title)
+#: ../C/evolution.xml:5799(title)
 msgid "Request a Reply:"
 msgstr "Demande de réponse :"
 
-#: ../C/evolution.xml:5821(para)
+#: ../C/evolution.xml:5800(para)
 msgid ""
-"You can inform the recipient that you need a reply to an e-mail. Evolution "
+"You can inform the recipient that you need a reply to an email. Evolution "
 "adds a sentence to the item stating that a reply is requested and changes "
 "the icon in the recipient's Mailbox to a double arrow. For information, see "
 "<link linkend=\"Ak05sv1\">Requesting a Reply for Items You Send</link>."
@@ -12210,33 +11985,28 @@ msgstr ""
 "destinataire en une double flèche. Pour en savoir plus, consultez <link "
 "linkend=\"Ak05sv1\">Demande de réponse pour des éléments envoyés</link>."
 
-#: ../C/evolution.xml:5825(title) ../C/evolution.xml:5949(title)
-msgid "Status Tracking"
-msgstr "Suivi d'état"
-
-#: ../C/evolution.xml:5826(para)
-msgid "You can enable Status Tracking before you send any messages."
-msgstr "Vous pouvez activer le suivi d'état avant d'envoyer un message."
+#: ../C/evolution.xml:5804(title) ../C/evolution.xml:5918(title)
+msgid "Enabling Status Tracking"
+msgstr "Activation du suivi d'état"
 
-#: ../C/evolution.xml:5827(para)
-msgid "To track the status of the message you are sending,"
-msgstr "Pour suivre l'état d'un message que vous êtes sur le point d'envoyer,"
-
-#: ../C/evolution.xml:5830(para)
-msgid ""
-"In the Compose Message window, click Insert &gt; Send Options &gt; Status "
-"Tracking"
+#: ../C/evolution.xml:5807(para) ../C/evolution.xml:5847(para)
+#: ../C/evolution.xml:5863(para)
+msgid "In the Compose Message window, click Insert &gt; Send Options."
 msgstr ""
 "Dans la fenêtre de rédaction d'un message, choisissez Insertion &gt; Options "
-"d'envoi &gt; Suivi d'état."
+"d'envoi."
 
-#: ../C/evolution.xml:5835(para) ../C/evolution.xml:5958(para)
+#: ../C/evolution.xml:5808(para)
+msgid "Select Status Tracking."
+msgstr "Sélectionnez Suivi de l'état"
+
+#: ../C/evolution.xml:5813(para) ../C/evolution.xml:5925(para)
 msgid "Select the check box next to Create a sent item to track information."
 msgstr ""
 "Cochez la case en regard de Créer un élément envoyé pour effectuer le suivi "
 "d'information."
 
-#: ../C/evolution.xml:5838(para) ../C/evolution.xml:5961(para)
+#: ../C/evolution.xml:5816(para) ../C/evolution.xml:5928(para)
 msgid ""
 "Select any of the options given (Delivered, Delivered and opened, All "
 "information)"
@@ -12244,7 +12014,7 @@ msgstr ""
 "Cochez les options souhaitées (Livré, Livré et ouvert, Toutes les "
 "informations)."
 
-#: ../C/evolution.xml:5839(para) ../C/evolution.xml:5962(para)
+#: ../C/evolution.xml:5817(para) ../C/evolution.xml:5929(para)
 msgid ""
 "Based on this selection, you can view the status of the send message in the "
 "Sent Items folder."
@@ -12252,7 +12022,7 @@ msgstr ""
 "Sur la base de vos choix, vous pouvez ensuite voir l'état d'un message "
 "envoyé dans le dossier des Éléments envoyés."
 
-#: ../C/evolution.xml:5840(para)
+#: ../C/evolution.xml:5818(para)
 msgid ""
 "For more information, see <link linkend=\"Aal54a9\">Checking the Status of "
 "an Item You Have Sent</link>."
@@ -12260,56 +12030,48 @@ msgstr ""
 "Pour plus d'informations, voyez <link linkend=\"Aal54a9\">Consultation de "
 "l'état d'un élément envoyé</link>."
 
-#: ../C/evolution.xml:5843(para) ../C/evolution.xml:5965(para)
+#: ../C/evolution.xml:5821(para) ../C/evolution.xml:5932(para)
 msgid ""
-"Select the check box next to Auto-delete sent item to delete the sent item "
-"automatically from the Sent folder."
+"(Optional)Select the check box next to Auto-delete sent item to "
+"automatically delete the sent item from the Sent folder."
 msgstr ""
-"Cochez l'option « Supprimer automatiquement l'élément envoyé » afin de "
-"supprimer automatiquement un élément envoyé dans le dossier Envoyé."
-
-#: ../C/evolution.xml:5847(title) ../C/evolution.xml:5969(title)
-msgid "Return Notification:"
-msgstr "Renvoyer une notification :"
+"(facultatif) Cochez l'option « Supprimer automatiquement l'élément envoyé » "
+"afin de supprimer automatiquement un élément envoyé dans le dossier Envoyés."
 
-#: ../C/evolution.xml:5848(para) ../C/evolution.xml:5970(para)
-msgid "In the Return Notification, specify the type of return receipt you want."
+#: ../C/evolution.xml:5824(para) ../C/evolution.xml:5935(para)
+msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
-"Dans la boîte de groupe « Renvoyer une notification », indiquez le type "
-"d'accusé de retour souhaité."
+"Sous « Renvoyer une notification », indiquez le type d'accusé de retour "
+"souhaité."
 
-#: ../C/evolution.xml:5861(para)
-msgid "Right-click an e-mail in your Sent folder, then click Track Message Status."
+#: ../C/evolution.xml:5836(para)
+msgid ""
+"Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
 "Faites un clic droit sur un courriel dans votre dossier des éléments "
 "envoyés, puis choisissez « Surveiller l'état du message »."
 
-#: ../C/evolution.xml:5862(para)
+#: ../C/evolution.xml:5837(para)
 msgid ""
-"With Message Tracking, you will know when the item reached the recipients or "
-"read by them. You will also know exactly who received your message, who read "
-"your message, who deleted and when."
+"With Message Tracking, you know when the item reaches the recipients or is "
+"read by them. You also know exactly who received your message, who read your "
+"message, and who deleted it and when."
 msgstr ""
 "Au moyen du suivi des messages, vous pouvez savoir quand les messages ont "
 "été livrés à leurs destinataires et quand ils ont été lus. Vous pouvez aussi "
 "savoir exactement qui a reçu votre message, par qui et quand il a été lu et "
 "supprimé."
 
-#: ../C/evolution.xml:5869(title)
-msgid "Changing the Priority of an E-Mail"
+#: ../C/evolution.xml:5844(title)
+msgid "Changing the Priority of an Email"
 msgstr "Modification de la priorité d'un courriel"
 
-#: ../C/evolution.xml:5872(para) ../C/evolution.xml:5888(para)
-msgid "In the Compose Message window, click Insert &gt; Send Options."
-msgstr ""
-"Dans la fenêtre de rédaction d'un message, choisissez Insertion &gt; Options "
-"d'envoi."
-
-#: ../C/evolution.xml:5875(para)
+#: ../C/evolution.xml:5850(para)
 msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
-msgstr "Sélectionnez haute priorité, priorité standard, basse priorité ou indéfinie."
+msgstr ""
+"Sélectionnez haute priorité, priorité standard, basse priorité ou indéfinie."
 
-#: ../C/evolution.xml:5876(para)
+#: ../C/evolution.xml:5851(para)
 msgid ""
 "The small icon next to an item in the Mailbox is red when the priority is "
 "high."
@@ -12317,13 +12079,13 @@ msgstr ""
 "La petite icône à côté d'un élément dans la boîte de messagerie apparaît en "
 "rouge lorsque la priorité est haute."
 
-#: ../C/evolution.xml:5893(para)
+#: ../C/evolution.xml:5867(para)
 msgid "Click Reply Requested, then specify when you want to receive the reply."
 msgstr ""
 "Cochez « Réponse requise », puis indiquez quand vous voulez recevoir la "
 "réponse."
 
-#: ../C/evolution.xml:5894(para)
+#: ../C/evolution.xml:5868(para)
 msgid ""
 "If you select When Convenient, then Reply Requested: When Convenient appears "
 "at the top of the message. If you select Within x Days, then Reply "
@@ -12336,62 +12098,49 @@ msgstr ""
 "<varname>jour mois jour numérique heure année</varname> » apparaît au sommet "
 "du message."
 
-#: ../C/evolution.xml:5897(para)
-msgid ""
-"Click Set expiration date, and specify the number of date for the message to "
-"get expired."
-msgstr ""
-"Cochez Définir la date d'expiration et définissez le nombre de jours après "
-"lequel le message va expirer."
-
-#: ../C/evolution.xml:5898(para)
+#: ../C/evolution.xml:5871(para)
 msgid ""
-"Until the specified count of days have passed, your message remains in the "
-"recipient's Inbox."
+"Click Set Expiration Date, then specify the number of days for this message "
+"to remain in the recipient's Inbox."
 msgstr ""
-"Tant que le nombre de jours défini n'a pas passé, votre message reste dans "
-"la boîte de réception du destinataire."
+"Cochez Définir la date d'expiration et définissez le nombre de jours que ce "
+"message doit rester dans la boîte de réception du destinataire."
 
-#: ../C/evolution.xml:5907(title)
+#: ../C/evolution.xml:5879(title)
 msgid "Setting Message Delivery Options"
 msgstr "Définition des options de livraison des messages"
 
-#: ../C/evolution.xml:5908(para)
+#: ../C/evolution.xml:5880(para)
 msgid ""
-"You can delay the delivery of an individual message by having them held in "
-"the Outbox for a specified time after clicking Send."
+"You can delay the delivery of an individual message by having it held in the "
+"Outbox for a specified time."
 msgstr ""
 "Vous pouvez reporter la livraison d'un message spécifique en le conservant "
-"durant un certain temps dans la Boîte d'envoi après avoir cliqué sur Envoyer."
+"durant un certain temps dans la Boîte d'envoi."
 
-#: ../C/evolution.xml:5911(para)
+#: ../C/evolution.xml:5883(para)
 msgid "Click Delay message delivery."
 msgstr "Cochez Retarder la livraison du message."
 
-#: ../C/evolution.xml:5914(para)
-msgid "Set the Date and Time until you want the message to be held in the Outbox."
-msgstr ""
-"Définissez la date et l'heure à laquelle le message doit être envoyé au plus "
-"tôt."
-
-#: ../C/evolution.xml:5924(para)
+#: ../C/evolution.xml:5886(para)
 msgid ""
-"You might want to display items you previously sent. For example, you can "
-"read a sent e-mail."
+"Use the Date and Time options to specify how long the message should remain "
+"in the Outbox before it is sent to the recipient."
 msgstr ""
-"Vous voulez peut-être afficher des éléments déjà envoyés. Par exemple, vous "
-"pouvez lire un courriel envoyé."
+"Utilisez les options de Date et heure pour définir la durée pendant laquelle "
+"le message doit rester dans la Boîte d'envoi avant d'être envoyé à son "
+"destinataire."
 
-#: ../C/evolution.xml:5927(para)
+#: ../C/evolution.xml:5897(para)
 msgid "Click the Sent Items folder in the Folder List."
 msgstr "Cliquez sur le dossier Envoyé dans la liste des dossiers."
 
-#: ../C/evolution.xml:5930(para)
+#: ../C/evolution.xml:5900(para)
 msgid ""
 "All sent items reside in this folder unless you select a different folder "
-"for sent e-mail in the account editor default settings. For more information "
-"refer <link linkend=\"b17s9qmz\">Changing Default Folder for Sent and Draft "
-"Items</link> under <link linkend=\"b13uhy6r\">Default Settings</link>."
+"for sent email in the account editor default settings. For more information, "
+"refer to <link linkend=\"b17s9qmz\">Changing Default Folder for Sent and "
+"Draft Items</link> under <link linkend=\"b13uhy6r\">Default Settings</link>."
 msgstr ""
 "Tous les éléments envoyés se trouvent dans ce dossier, sauf si vous avez "
 "choisi un autre dossier pour les courriels envoyés dans les valeurs par "
@@ -12400,17 +12149,18 @@ msgstr ""
 "les brouillons</link> dans <link linkend=\"b13uhy6r\">Paramètres par défaut</"
 "link>."
 
-#: ../C/evolution.xml:5934(title)
+#: ../C/evolution.xml:5903(title)
 msgid "Delegating an Item"
 msgstr "Délégation d'un élément"
 
-#: ../C/evolution.xml:5937(para)
-msgid "In the Calendar, right-click the meeting or appointment you want to delegate."
+#: ../C/evolution.xml:5906(para)
+msgid ""
+"In the Calendar, right-click the meeting or appointment you want to delegate."
 msgstr ""
 "Dans le calendrier, faites un clic droit sur le rendez-vous ou la réunion à "
 "déléguer."
 
-#: ../C/evolution.xml:5940(para)
+#: ../C/evolution.xml:5909(para)
 msgid ""
 "Select Delegate Meeting, then select the contacts you want to delegate the "
 "meeting/appointment for."
@@ -12418,15 +12168,11 @@ msgstr ""
 "Choisissez Déléguer une réunion, puis sélectionnez les contacts auxquels "
 "vous souhaitez déléguer la réunion ou le rendez-vous."
 
-#: ../C/evolution.xml:5946(para)
+#: ../C/evolution.xml:5915(para)
 msgid "Each contact gets a copy of the appointment or meeting."
 msgstr "Chaque contact reçoit une copie du rendez-vous ou de la réunion."
 
-#: ../C/evolution.xml:5950(para)
-msgid "To track the status of the message you have sent,"
-msgstr "Pour suivre l'état d'un message que vous avez envoyé,"
-
-#: ../C/evolution.xml:5953(para)
+#: ../C/evolution.xml:5921(para)
 msgid ""
 "In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
 "Tracking"
@@ -12434,7 +12180,7 @@ msgstr ""
 "Dans la fenêtre d'édition d'une réunion, choisissez Insertion &gt; Options "
 "d'envoi &gt; Suivi d'état."
 
-#: ../C/evolution.xml:5983(para)
+#: ../C/evolution.xml:5947(para)
 msgid ""
 "Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you "
 "perform various actions, such as reading, accepting, and declining items on "
@@ -12446,7 +12192,7 @@ msgstr ""
 "autre personne, dans la limite des restrictions définies par cette autre "
 "personne."
 
-#: ../C/evolution.xml:5985(para)
+#: ../C/evolution.xml:5949(para)
 msgid ""
 "You can proxy for a user in a different post office or domain, as long as "
 "that person is in the same GroupWise system. You cannot proxy for a user in "
@@ -12457,27 +12203,29 @@ msgstr ""
 "GroupWise. Vous ne pouvez pas être le proxy d'un utilisateur d'un système "
 "GroupWise différent."
 
-#: ../C/evolution.xml:5990(link) ../C/evolution.xml:6007(title)
+#: ../C/evolution.xml:5954(link) ../C/evolution.xml:5971(title)
 msgid "Receiving Proxy Rights"
 msgstr "Réception de droits de proxy"
 
-#: ../C/evolution.xml:5993(link) ../C/evolution.xml:6012(title)
+#: ../C/evolution.xml:5957(link) ../C/evolution.xml:5976(title)
 msgid "Assigning Proxy Rights to Another User"
 msgstr "Attribution de droits de proxy à un autre utilisateur"
 
-#: ../C/evolution.xml:5996(link) ../C/evolution.xml:6083(title)
+#: ../C/evolution.xml:5960(link) ../C/evolution.xml:6047(title)
 msgid "Adding and Removing Proxy Names and Rights in Your Proxy List"
-msgstr "Ajout et suppression de noms et de droits de proxy dans votre liste « Proxy »"
+msgstr ""
+"Ajout et suppression de noms et de droits de proxy dans votre liste « Proxy »"
 
-#: ../C/evolution.xml:5999(link) ../C/evolution.xml:6113(title)
+#: ../C/evolution.xml:5963(link) ../C/evolution.xml:6078(title)
 msgid "Managing Someone Else's Mailbox or Calendar"
-msgstr "Gestion de la boîte de messagerie ou du calendrier d'une autre personne"
+msgstr ""
+"Gestion de la boîte de messagerie ou du calendrier d'une autre personne"
 
-#: ../C/evolution.xml:6002(link) ../C/evolution.xml:6137(title)
+#: ../C/evolution.xml:5966(link) ../C/evolution.xml:6102(title)
 msgid "Marking an Item Private"
 msgstr "Marquage d'un élément privé"
 
-#: ../C/evolution.xml:6008(para)
+#: ../C/evolution.xml:5972(para)
 msgid ""
 "Two steps must be completed before you can act as someone's proxy. First, "
 "the person for whom you plan to act as proxy must grant you rights in the "
@@ -12490,7 +12238,7 @@ msgstr ""
 "Proxy. Deuxièmement, vous devez devenir le proxy de cette personne afin de "
 "pouvoir accéder à sa boîte de messagerie ou à son calendrier."
 
-#: ../C/evolution.xml:6013(para)
+#: ../C/evolution.xml:5977(para)
 msgid ""
 "Use the Proxy List in the Preferences Account Editor to give other users "
 "rights to proxy for you. You can assign each user different rights to your "
@@ -12508,19 +12256,19 @@ msgstr ""
 "l'accès en lecture à vos rendez-vous. Le tableau suivant décrit les "
 "permissions que vous pouvez accorder aux utilisateurs :"
 
-#: ../C/evolution.xml:6021(para)
+#: ../C/evolution.xml:5985(para)
 msgid "This Right"
 msgstr "Cette permission"
 
-#: ../C/evolution.xml:6024(para)
+#: ../C/evolution.xml:5988(para)
 msgid "Lets your proxy do this"
 msgstr "permet ceci à votre proxy"
 
-#: ../C/evolution.xml:6031(para)
+#: ../C/evolution.xml:5995(para)
 msgid "Read"
 msgstr "Lire"
 
-#: ../C/evolution.xml:6034(para)
+#: ../C/evolution.xml:5998(para)
 msgid ""
 "Read items you receive. Proxies cannot see your Contacts folder with this or "
 "any other proxy right."
@@ -12528,11 +12276,11 @@ msgstr ""
 "Lire les éléments que vous recevez. Les personnes proxy ne peuvent afficher "
 "votre dossier Contacts avec aucune des permissions proxy."
 
-#: ../C/evolution.xml:6039(para)
+#: ../C/evolution.xml:6003(para)
 msgid "Write"
 msgstr "Écrire"
 
-#: ../C/evolution.xml:6042(para)
+#: ../C/evolution.xml:6006(para)
 msgid ""
 "Create and send items in your name, including applying your signature if you "
 "have one defined. Assign categories to items, and change the subject of "
@@ -12542,11 +12290,11 @@ msgstr ""
 "signature si vous en possédez une. Attribuer des catégories aux éléments et "
 "modifier le sujet des éléments."
 
-#: ../C/evolution.xml:6047(para)
+#: ../C/evolution.xml:6011(para)
 msgid "Subscribe to my alarms"
 msgstr "S'abonner à mes alarmes"
 
-#: ../C/evolution.xml:6050(para)
+#: ../C/evolution.xml:6014(para)
 msgid ""
 "Receive the same alarms you receive. Receiving alarms is supported only if "
 "the proxy is on the same post office you are."
@@ -12554,11 +12302,11 @@ msgstr ""
 "Recevoir les mêmes alarmes que vous. La réception d'alarmes n'est gérée que "
 "si le proxy se trouve dans le même office de poste que vous."
 
-#: ../C/evolution.xml:6055(para)
+#: ../C/evolution.xml:6019(para)
 msgid "Subscribe to my notifications"
 msgstr "S'abonner à mes notifications"
 
-#: ../C/evolution.xml:6058(para)
+#: ../C/evolution.xml:6022(para)
 msgid ""
 "Receive notification when you receive items. Receiving notifications is "
 "supported only if the proxy is on the same post office you are."
@@ -12567,11 +12315,11 @@ msgstr ""
 "de notifications n'est gérée que si le proxy se trouve dans le même office "
 "de poste que vous."
 
-#: ../C/evolution.xml:6063(para)
+#: ../C/evolution.xml:6027(para)
 msgid "Modify options/rules/folders"
 msgstr "Modifier options/règles/dossiers"
 
-#: ../C/evolution.xml:6066(para)
+#: ../C/evolution.xml:6030(para)
 msgid ""
 "Change the options in your Mailbox. The proxy can edit any of your Options "
 "settings, including the access given to other users. If the proxy also has "
@@ -12585,11 +12333,11 @@ msgstr ""
 "permet à un utilisateur proxy d'ajouter, de supprimer et de modifier des "
 "catégories."
 
-#: ../C/evolution.xml:6071(para)
+#: ../C/evolution.xml:6035(para)
 msgid "Read items marked Private"
 msgstr "Lire des éléments marqués privés"
 
-#: ../C/evolution.xml:6074(para)
+#: ../C/evolution.xml:6038(para)
 msgid ""
 "Read the items you marked Private. If you don't give a proxy Private rights, "
 "all items marked Private in your Mailbox are hidden from that proxy."
@@ -12598,15 +12346,15 @@ msgstr ""
 "permission à un utilisateur proxy, tous les éléments marqués privés dans "
 "votre boîte de messagerie lui seront invisibles."
 
-#: ../C/evolution.xml:6089(para)
+#: ../C/evolution.xml:6053(para)
 msgid "Select the GroupWise account to edit, then click Edit."
 msgstr "Sélectionnez le compte GroupWise à éditer, puis cliquez sur Édition."
 
-#: ../C/evolution.xml:6092(para)
+#: ../C/evolution.xml:6056(para)
 msgid "Click the Proxy tab, then click Add."
 msgstr "Cliquez sur l'onglet Proxy, puis sur Ajouter."
 
-#: ../C/evolution.xml:6095(para)
+#: ../C/evolution.xml:6059(para)
 msgid ""
 "To add a user to the list, type the name in the Name box or import the "
 "contact from Contact list."
@@ -12614,11 +12362,12 @@ msgstr ""
 "Pour ajouter un utilisateur dans la liste, saisissez son nom dans le champ "
 "Nom ou importez le contact à partir de la liste des contacts."
 
-#: ../C/evolution.xml:6098(para)
+#: ../C/evolution.xml:6062(para)
 msgid "Select the rights you want to give to the user."
-msgstr "Sélectionnez les permissions que vous souhaitez attribuer à l'utilisateur."
+msgstr ""
+"Sélectionnez les permissions que vous souhaitez attribuer à l'utilisateur."
 
-#: ../C/evolution.xml:6103(para)
+#: ../C/evolution.xml:6067(para)
 msgid ""
 "Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll"
 "\">Step 5</link> to assign rights to each user in the Proxy List."
@@ -12627,7 +12376,7 @@ msgstr ""
 "\"Aai4sll\">étape 5</link> pour attribuer des permissions à chaque "
 "utilisateur de la liste Proxy."
 
-#: ../C/evolution.xml:6109(para)
+#: ../C/evolution.xml:6074(para)
 msgid ""
 "To delete a user from the Proxy List, select the user, then click Remove "
 "User."
@@ -12635,7 +12384,7 @@ msgstr ""
 "Pour supprimer un utilisateur de la liste Proxy, sélectionnez-le, puis "
 "cliquez sur Supprimer l'utilisateur."
 
-#: ../C/evolution.xml:6114(para)
+#: ../C/evolution.xml:6079(para)
 msgid ""
 "Before you can act as a proxy for someone, that person must give you proxy "
 "rights in his or her Proxy List in Preferences. The amount of access you "
@@ -12646,15 +12395,16 @@ msgstr ""
 "préférences. L'étendue de vos droits dépend des permissions qui vous ont été "
 "attribuées."
 
-#: ../C/evolution.xml:6117(para)
+#: ../C/evolution.xml:6082(para)
 msgid "Right-click on the GroupWise account in the folder list."
-msgstr "Faites un clic droit sur le compte GroupWise dans la liste des dossiers."
+msgstr ""
+"Faites un clic droit sur le compte GroupWise dans la liste des dossiers."
 
-#: ../C/evolution.xml:6120(para)
+#: ../C/evolution.xml:6085(para)
 msgid "Click Proxy Login."
 msgstr "Choisissez Identification sur le proxy."
 
-#: ../C/evolution.xml:6125(para)
+#: ../C/evolution.xml:6090(para)
 msgid ""
 "Type the user name of the person who has given you Proxy access, or select "
 "from the list."
@@ -12662,11 +12412,12 @@ msgstr ""
 "Saisissez le nom d'utilisateur de la personne qui vous a donné l'accès proxy "
 "ou sélectionnez-la dans la liste."
 
-#: ../C/evolution.xml:6129(para)
+#: ../C/evolution.xml:6094(para)
 msgid "The user's data appears in the respective components."
-msgstr "Les données de la personne apparaissent dans les composants respectifs."
+msgstr ""
+"Les données de la personne apparaissent dans les composants respectifs."
 
-#: ../C/evolution.xml:6131(para)
+#: ../C/evolution.xml:6096(para)
 msgid ""
 "You can set different colors to each user to distinguish between each users' "
 "appointments. You can also select whether to display the appointments of a "
@@ -12676,7 +12427,7 @@ msgstr ""
 "distinguer les rendez-vous de chacun. Vous pouvez aussi choisir d'afficher "
 "ou non les rendez-vous d'un utilisateur particulier."
 
-#: ../C/evolution.xml:6138(para)
+#: ../C/evolution.xml:6103(para)
 msgid ""
 "You can limit a proxy's access to individual items in your Mailbox or "
 "Calendar by marking items Private."
@@ -12684,7 +12435,7 @@ msgstr ""
 "Vous pouvez empêcher l'accès proxy à des éléments individuels de votre boîte "
 "de messagerie ou de votre calendrier en les marquant privés."
 
-#: ../C/evolution.xml:6139(para)
+#: ../C/evolution.xml:6104(para)
 msgid ""
 "When you mark an item Private, you prevent unauthorized proxies from opening "
 "it. Proxies cannot access items marked Private unless you give them those "
@@ -12695,7 +12446,7 @@ msgstr ""
 "éléments privés tant que vous ne leur attribuez pas la permission "
 "correspondante dans la liste d'accès."
 
-#: ../C/evolution.xml:6140(para)
+#: ../C/evolution.xml:6105(para)
 msgid ""
 "If you mark an item Private when you send it, neither your proxies nor the "
 "recipient's proxies can open the item without rights. If you mark an item "
@@ -12713,11 +12464,12 @@ msgstr ""
 "disponibilité selon l'état que vous avez sélectionné lorsque vous avez "
 "accepté le rendez-vous."
 
-#: ../C/evolution.xml:6143(para)
+#: ../C/evolution.xml:6108(para)
 msgid "In an open item, click Actions, then click Mark Private."
-msgstr "Avec un élément ouvert, choisissez Actions, puis cliquez sur Marquer privé."
+msgstr ""
+"Avec un élément ouvert, choisissez Actions, puis cliquez sur Marquer privé."
 
-#: ../C/evolution.xml:6145(para)
+#: ../C/evolution.xml:6110(para)
 msgid ""
 "In your Calendar, click an item in the Appointments, Reminder Notes, or "
 "Tasks List, click Actions, then click Mark Private."
@@ -12725,9 +12477,9 @@ msgstr ""
 "Dans votre calendrier, cliquez sur un élément rendez-vous, note de rappel ou "
 "liste de tâches, choisissez Actions, puis cliquez sur Marquer privé."
 
-#: ../C/evolution.xml:6153(para)
+#: ../C/evolution.xml:6118(para)
 msgid ""
-"Junk mail handling for GroupWise accounts is a little different then other "
+"Junk mail handling for GroupWise accounts is a little different than other "
 "junk mail handling. When you mark an item as junk mail in GroupWise, the "
 "item is added to your junk list in the GroupWise system. Because these "
 "settings are on the GroupWise system, your junk list follows you from "
@@ -12740,33 +12492,34 @@ msgstr ""
 "trouvent dans le système GroupWise, votre liste de pourriels vous suit quel "
 "que soit l'ordinateur utilisé."
 
-#: ../C/evolution.xml:6156(link) ../C/evolution.xml:6173(title)
+#: ../C/evolution.xml:6121(link) ../C/evolution.xml:6138(title)
 msgid "Marking a Message As Junk Mail"
 msgstr "Marquage d'un message comme pourriel"
 
-#: ../C/evolution.xml:6159(link) ../C/evolution.xml:6183(title)
+#: ../C/evolution.xml:6124(link) ../C/evolution.xml:6148(title)
 msgid "Marking a Message As Not Junk Mail"
 msgstr "Marquage d'un message comme non pourriel"
 
-#: ../C/evolution.xml:6162(link) ../C/evolution.xml:6197(title)
+#: ../C/evolution.xml:6127(link) ../C/evolution.xml:6162(title)
 msgid "Enabling or Disabling Your Junk Mail List"
 msgstr "Activation ou désactivation de votre liste de pourriels"
 
-#: ../C/evolution.xml:6165(link) ../C/evolution.xml:6212(title)
-msgid "Adding an E-Mail Address to Your Junk List"
+#: ../C/evolution.xml:6130(link) ../C/evolution.xml:6177(title)
+msgid "Adding an Email Address to Your Junk List"
 msgstr "Ajout d'une adresse électronique à votre liste de pourriels"
 
-#: ../C/evolution.xml:6168(link) ../C/evolution.xml:6227(title)
-msgid "Removing an E-Mail Address from Your Junk List"
+#: ../C/evolution.xml:6133(link) ../C/evolution.xml:6192(title)
+msgid "Removing an Email Address from Your Junk List"
 msgstr "Suppression d'une adresse électronique à votre liste de pourriels"
 
-#: ../C/evolution.xml:6176(para)
-msgid "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
+#: ../C/evolution.xml:6141(para)
+msgid ""
+"Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
 msgstr ""
 "Sélectionnez le message à marquer comme pourriel, puis cliquez sur l'icône "
 "Pourriel ou appuyez sur Ctrl+J."
 
-#: ../C/evolution.xml:6177(para)
+#: ../C/evolution.xml:6142(para)
 msgid ""
 "The message is moved to your Junk Mail folder and the user is added to your "
 "junk list."
@@ -12774,23 +12527,23 @@ msgstr ""
 "Le message est déplacé dans le dossier des pourriels et l'expéditeur est "
 "ajouté à votre liste de pourriels."
 
-#: ../C/evolution.xml:6186(para)
+#: ../C/evolution.xml:6151(para)
 msgid "Select the message to mark as not junk in your Junk Mail folder."
 msgstr ""
 "Sélectionnez le message à marquer comme non pourriel dans votre dossier des "
 "pourriels."
 
-#: ../C/evolution.xml:6189(para)
+#: ../C/evolution.xml:6154(para)
 msgid "Right-click the message, then click Mark as Not Junk."
 msgstr ""
 "Faites un clic droit sur le message et choisissez « Marquer comme non "
 "pourriel »."
 
-#: ../C/evolution.xml:6190(para)
+#: ../C/evolution.xml:6155(para)
 msgid "Or select the message and press Shift+Ctrl+J"
 msgstr "Ou sélectionnez le message et appuyez sur Ctrl+Maj+J."
 
-#: ../C/evolution.xml:6191(para)
+#: ../C/evolution.xml:6156(para)
 msgid ""
 "The message is moved to your Mailbox folder and the name is removed from "
 "your junk list."
@@ -12798,40 +12551,44 @@ msgstr ""
 "Le message est déplacé dans votre dossier de boîte de messagerie et le nom "
 "est supprimé de la liste des pourriels."
 
-#: ../C/evolution.xml:6200(para) ../C/evolution.xml:6215(para)
-#: ../C/evolution.xml:6230(para)
+#: ../C/evolution.xml:6165(para) ../C/evolution.xml:6180(para)
+#: ../C/evolution.xml:6195(para)
 msgid "Right-click a message, then click Junk Mail Settings."
 msgstr ""
 "Faites un clic droit sur un message, puis choisissez « Paramètres de "
 "détection du pourriel »."
 
-#: ../C/evolution.xml:6203(para)
+#: ../C/evolution.xml:6168(para)
 msgid "Select if you want to enable or disable junk mail handling."
-msgstr "Choisissez si vous voulez activer ou désactiver la gestion des pourriels."
+msgstr ""
+"Choisissez si vous voulez activer ou désactiver la gestion des pourriels."
 
-#: ../C/evolution.xml:6218(para)
-msgid "Type the e-mail address to block in the Email field."
+#: ../C/evolution.xml:6183(para)
+msgid "Type the email address to block in the Email field."
 msgstr ""
 "Saisissez l'adresse électronique à bloquer dans le champ Adresse "
 "électronique."
 
-#: ../C/evolution.xml:6221(para)
+#: ../C/evolution.xml:6186(para)
 msgid "Click Add, then click OK."
 msgstr "Cliquez sur Ajouter, puis sur Valider."
 
-#: ../C/evolution.xml:6233(para)
-msgid "Select the e-mail address to remove, then click Remove."
-msgstr "Sélectionnez l'adresse électronique à enlever, puis cliquez sur Enlever."
+#: ../C/evolution.xml:6198(para)
+msgid "Select the email address to remove, then click Remove."
+msgstr ""
+"Sélectionnez l'adresse électronique à enlever, puis cliquez sur Enlever."
 
-#: ../C/evolution.xml:6245(para)
+#: ../C/evolution.xml:6210(para)
 msgid ""
-"Evolution™ supports mail connectivity to Hula® servers through IMAP and "
-"calendaring support through CalDAV."
+"<trademark>Evolution</trademark> supports mail connectivity to <trademark "
+"class=\"registered\">Hula</trademark> servers through IMAP and calendaring "
+"support through CalDAV."
 msgstr ""
-"Evolution gère la connectivité de messagerie aux serveurs Hula&reg; "
-"au moyen d'IMAP et la connectivité du calendrier au moyen de CalDAV."
+"<trademark>Evolution</trademark> gère la connectivité de messagerie aux "
+"serveurs <trademark class=\"registered\">Hula</trademark> au moyen d'IMAP et "
+"la connectivité du calendrier au moyen de CalDAV."
 
-#: ../C/evolution.xml:6246(para)
+#: ../C/evolution.xml:6211(para)
 msgid ""
 "To add your Hula account to Evolution, you must create a new Hula account by "
 "performing the following steps:"
@@ -12839,15 +12596,16 @@ msgstr ""
 "Pour ajouter votre compte Hula à Evolution, vous devez créer un nouveau "
 "compte Hula en effectuant les opérations suivantes :"
 
-#: ../C/evolution.xml:6249(para)
+#: ../C/evolution.xml:6214(para)
 msgid "Click Edit, click Preferences, then click Mail Accounts."
-msgstr "Choisissez Édition &gt; Préférences, puis cliquez sur Comptes de messagerie."
+msgstr ""
+"Choisissez Édition &gt; Préférences, puis cliquez sur Comptes de messagerie."
 
-#: ../C/evolution.xml:6252(para)
+#: ../C/evolution.xml:6217(para)
 msgid "In the Preferences window, click Add."
 msgstr "Dans la fenêtre des préférences, cliquez sur Ajouter."
 
-#: ../C/evolution.xml:6255(para)
+#: ../C/evolution.xml:6220(para)
 msgid ""
 "Follow the procedure explained in <link linkend=\"usage-mainwindow-starting"
 "\">Starting Evolution for the First Time</link>."
@@ -12855,50 +12613,50 @@ msgstr ""
 "Suivez la procédure décrite dans <link linkend=\"usage-mainwindow-starting"
 "\">Démarrage d'Evolution pour la première fois</link>."
 
-#: ../C/evolution.xml:6262(para)
+#: ../C/evolution.xml:6227(para)
 msgid ""
 "Perhaps your mail server has changed names. Or you have grown tired of a "
 "certain layout for your appointments. Whatever the reason, you can change "
-"your Evolution™ settings."
+"your <trademark>Evolution</trademark> settings."
 msgstr ""
 "Votre serveur de messagerie peut avoir changé des noms. Vous êtes peut-être "
 "insatisfait de l'apparence de vos rendez-vous et vous voulez la changer. "
 "Quelle que soit la raison, vous pouvez changer les paramètres "
-"d'Evolution. Cette section explique comment procéder."
+"d'<trademark>Evolution</trademark>."
 
-#: ../C/evolution.xml:6265(link) ../C/evolution.xml:6319(title)
+#: ../C/evolution.xml:6230(link) ../C/evolution.xml:6284(title)
 msgid "Working with Mail Accounts"
 msgstr "Utilisation des comptes de messagerie"
 
-#: ../C/evolution.xml:6268(link) ../C/evolution.xml:6362(title)
+#: ../C/evolution.xml:6233(link) ../C/evolution.xml:6327(title)
 msgid "Autocompletion"
 msgstr "Complétion automatique"
 
-#: ../C/evolution.xml:6271(link) ../C/evolution.xml:6424(title)
+#: ../C/evolution.xml:6236(link) ../C/evolution.xml:6389(title)
 msgid "Mail Preferences"
 msgstr "Préférences du courriel"
 
-#: ../C/evolution.xml:6274(link) ../C/evolution.xml:6595(title)
+#: ../C/evolution.xml:6239(link) ../C/evolution.xml:6558(title)
 msgid "Composer Preferences"
 msgstr "Préférences de l'éditeur"
 
-#: ../C/evolution.xml:6277(link) ../C/evolution.xml:6653(title)
+#: ../C/evolution.xml:6242(link) ../C/evolution.xml:6617(title)
 msgid "Calendar and Tasks Settings"
 msgstr "Paramètres de calendrier et des tâches"
 
-#: ../C/evolution.xml:6280(link) ../C/evolution.xml:6772(title)
+#: ../C/evolution.xml:6245(link) ../C/evolution.xml:6736(title)
 msgid "Contact Management"
 msgstr "Gestion des contacts"
 
-#: ../C/evolution.xml:6283(link) ../C/evolution.xml:6755(title)
+#: ../C/evolution.xml:6248(link) ../C/evolution.xml:6719(title)
 msgid "Certificates"
 msgstr "Certificats"
 
-#: ../C/evolution.xml:6286(link) ../C/evolution.xml:6905(title)
+#: ../C/evolution.xml:6251(link) ../C/evolution.xml:6869(title)
 msgid "Debug Logs"
 msgstr "Journaux de débogage"
 
-#: ../C/evolution.xml:6289(para)
+#: ../C/evolution.xml:6254(para)
 msgid ""
 "You reach the Evolution settings window by clicking Edit &gt; Preferences. "
 "In the left part of the settings window is a column, similar to the "
@@ -12912,18 +12670,18 @@ msgstr ""
 "choisir la partie d'Evolution à personnaliser. La partie droite de la "
 "fenêtre permet d'effectuer les modifications."
 
-#: ../C/evolution.xml:6291(para)
+#: ../C/evolution.xml:6256(para)
 msgid "There are six items you can customize."
 msgstr "Vous pouvez personnaliser six éléments."
 
-#: ../C/evolution.xml:6293(title)
+#: ../C/evolution.xml:6258(title)
 msgid "Mail Accounts:"
 msgstr "Comptes de messagerie :"
 
-#: ../C/evolution.xml:6294(para)
+#: ../C/evolution.xml:6259(para)
 msgid ""
-"Add or change information about your e-mail accounts, such as the servers "
-"you connect to, the way you download mail, and your password authentication "
+"Add or change information about your email accounts, such as the servers you "
+"connect to, the way you download mail, and your password authentication "
 "mode. This is the most complex item in the list, and is covered in <link "
 "linkend=\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
 msgstr ""
@@ -12934,25 +12692,25 @@ msgstr ""
 "section <link linkend=\"config-prefs-mail-identity\">Utilisation des comptes "
 "de messagerie</link>."
 
-#: ../C/evolution.xml:6297(title)
+#: ../C/evolution.xml:6262(title)
 msgid "Autocompletion:"
 msgstr "Complétion automatique :"
 
-#: ../C/evolution.xml:6298(para)
+#: ../C/evolution.xml:6263(para)
 msgid ""
-"Set the contact groups to be used when completing e-mail addresses in the "
+"Set the address books to be used when completing email addresses in the "
 "message composer. For more information, see <link linkend=\"bshoq5l"
 "\">Autocompletion</link>."
 msgstr ""
-"Définissez les groupes de contacts à utiliser lorsque vous saisissez les "
+"Définissez les carnets d'adresses à utiliser lorsque vous saisissez les "
 "adresses électroniques dans l'éditeur de messages. Pour plus d'informations, "
 "consultez <link linkend=\"bshoq5l\">Complétion automatique</link>."
 
-#: ../C/evolution.xml:6301(title)
+#: ../C/evolution.xml:6266(title)
 msgid "Mail Preferences:"
 msgstr "Préférences du courriel :"
 
-#: ../C/evolution.xml:6302(para)
+#: ../C/evolution.xml:6267(para)
 msgid ""
 "These are overall mail reading preferences, such as display settings, "
 "notification options, and security. Settings that vary per account are in "
@@ -12968,30 +12726,30 @@ msgstr ""
 "paramètres de courriel sont décrits dans <link linkend=\"config-prefs-mail"
 "\">Préférences du courriel</link>."
 
-#: ../C/evolution.xml:6305(title)
+#: ../C/evolution.xml:6270(title)
 msgid "Composer Preferences:"
 msgstr "Préférences de l'éditeur :"
 
-#: ../C/evolution.xml:6306(para)
+#: ../C/evolution.xml:6271(para)
 msgid ""
 "These are settings for the way that you use the mail composer, such as "
-"shortcuts, signatures, and spelling. This includes the ability to substitute "
-"graphical emoticons for “emoticons” such as : ) that many people use in e-"
-"mail. This tool is covered in <link linkend=\"config-prefs-mail-composer"
+"signatures, and spelling. This includes the ability to substitute graphical "
+"emoticons for <quote>emoticons</quote> such as : ) that many people use in "
+"email. This tool is covered in <link linkend=\"config-prefs-mail-composer"
 "\">Composer Preferences</link>."
 msgstr ""
 "Ces paramètres définissent la manière dont vous utilisez l'éditeur de "
-"messages (raccourcis, signatures et orthographe, par exemple). Ces "
-"paramètres incluent la possibilité de remplacer les « émoticônes » par des "
-"frimousses, telles que : ) qu'insèrent de nombreuses personnes dans leurs "
-"messages. Cet outil est décrit dans la section <link linkend=\"config-prefs-"
-"mail-composer\">Préférences de l'éditeur</link>."
+"messages (signatures et orthographe, par exemple). Ces paramètres incluent "
+"la possibilité de remplacer les « émoticônes » par des frimousses, telles "
+"que : ) qu'insèrent de nombreuses personnes dans leurs messages. Cet outil "
+"est décrit dans la section <link linkend=\"config-prefs-mail-composer"
+"\">Préférences de l'éditeur</link>."
 
-#: ../C/evolution.xml:6309(title)
+#: ../C/evolution.xml:6274(title)
 msgid "Calendar and Tasks:"
 msgstr "Calendrier et tâches :"
 
-#: ../C/evolution.xml:6310(para)
+#: ../C/evolution.xml:6275(para)
 msgid ""
 "Use these settings to control how the calendar behaves, including your time "
 "zone and the length of your work week. For more information, see <link "
@@ -13002,11 +12760,11 @@ msgstr ""
 "travail. Pour plus d'informations, consultez <link linkend=\"config-prefs-cal"
 "\">Paramètres de calendrier et des tâches</link>."
 
-#: ../C/evolution.xml:6313(title)
+#: ../C/evolution.xml:6278(title)
 msgid "Certificates:"
 msgstr "Certificats :"
 
-#: ../C/evolution.xml:6314(para)
+#: ../C/evolution.xml:6279(para)
 msgid ""
 "Use these settings for certificate handling for S/MIME security systems. For "
 "more information, see <link linkend=\"bshoty0\">Certificates</link>."
@@ -13015,7 +12773,7 @@ msgstr ""
 "sécurité S/MIME. Pour plus d'informations, consultez <link linkend=\"bshoty0"
 "\">Certificats</link>."
 
-#: ../C/evolution.xml:6316(para)
+#: ../C/evolution.xml:6281(para)
 msgid ""
 "Previous versions of Evolution included directory servers, folder settings, "
 "and Exchange delegation in the settings tool. Directory servers can now be "
@@ -13031,10 +12789,10 @@ msgstr ""
 "bouton droit de la souris et la délégation Exchange est disponible dans le "
 "menu Message dans l'outil Exchange."
 
-#: ../C/evolution.xml:6320(para)
+#: ../C/evolution.xml:6285(para)
 msgid ""
 "Evolution allows you to maintain multiple accounts, or identities. When you "
-"are writing an e-mail message, you can choose which account to use by "
+"are writing an email message, you can choose which account to use by "
 "selecting from the drop-down list next to the From field in the message "
 "composer."
 msgstr ""
@@ -13043,18 +12801,18 @@ msgstr ""
 "sélectionnant dans la liste déroulante en regard de la zone De dans "
 "l'éditeur de messages."
 
-#: ../C/evolution.xml:6321(para)
+#: ../C/evolution.xml:6286(para)
 msgid ""
-"Click Send/Receive to select all mail sources that are not disabled. If you "
-"don't want to check mail for a given account, select the account in the Mail "
-"Accounts tab and click the Disable button.."
+"Click Send/Receive to update all mail sources that are not disabled. If you "
+"don't want to check mail for a given account, select the account in Edit "
+"&gt; Preferences &gt; Mail Accounts page and click the Disable button."
 msgstr ""
-"Cliquez sur Envoyer/Recevoir pour sélectionner toutes les sources de "
+"Cliquez sur Envoyer/Recevoir pour mettre à jour toutes les sources de "
 "courriel qui ne sont pas désactivées. Si vous ne voulez pas relever le "
-"courriel d'un compte, sélectionnez ce compte dans l'onglet Comptes de "
-"messagerie et cliquez sur le bouton Désactiver."
+"courriel d'un compte, sélectionnez ce compte dans Édition &gt; Préférences "
+"&gt; Comptes de messagerie et cliquez sur le bouton Désactiver."
 
-#: ../C/evolution.xml:6322(para)
+#: ../C/evolution.xml:6287(para)
 msgid ""
 "To add a new account, click Add to open the Evolution configuration "
 "assistant. To alter an existing account, select it in the Preferences "
@@ -13065,47 +12823,46 @@ msgstr ""
 "le dans la fenêtre Préférences, puis cliquez sur Édition pour ouvrir la "
 "boîte de dialogue de l'éditeur de compte."
 
-#: ../C/evolution.xml:6323(para)
+#: ../C/evolution.xml:6288(para)
 msgid "The account editor dialog box has seven sections:"
 msgstr "Cette boîte de dialogue contient sept sections :"
 
-#: ../C/evolution.xml:6325(title)
+#: ../C/evolution.xml:6290(title)
 msgid "Identity:"
 msgstr "Identité :"
 
-#: ../C/evolution.xml:6326(para)
+#: ../C/evolution.xml:6291(para)
 msgid ""
-"Specify the name and e-mail address for this account. You can also choose a "
+"Specify the name and email address for this account. You can also choose a "
 "default signature to insert into messages sent from this account."
 msgstr ""
 "Définissez le nom et l'adresse électronique du compte. Vous pouvez également "
 "choisir une signature par défaut pour l'insérer dans les messages que vous "
 "envoyez depuis ce compte."
 
-#: ../C/evolution.xml:6329(title)
+#: ../C/evolution.xml:6294(title)
 msgid "Receiving Email:"
 msgstr "Réception des courriels :"
 
-#: ../C/evolution.xml:6330(para)
+#: ../C/evolution.xml:6295(para)
 msgid ""
-"Select the way you receive e-mail. You can download e-mail from a <link "
+"Select the way you receive email. You can download email from a <link "
 "linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
-"Exchange, Novell® GroupWise®, or IMAP<link linkend=\"imap\">IMAP</link>), or "
-"read it from files that already exist on your desktop computer. Your server "
-"requires you to use a Secure Socket Layer (SSL) connection. You can select "
-"from the given three options: No encryption, TLS encryption or SSL "
-"encryption."
+"Exchange, <trademark class=\"registered\">Novell</trademark><trademark class="
+"\"registered\">GroupWise</trademark>, or IMAP<link linkend=\"imap\">IMAP</"
+"link>), or read it from files that already exist on your desktop computer. "
+"If your server requires you to use a secure connection, you can select from "
+"the given three options: No encryption, TLS encryption or SSL encryption."
 msgstr ""
 "Sélectionnez la méthode de réception des courriels. Vous pouvez télécharger "
-"les courriels depuis un <link linkend=\"pop\">serveur POP</link>, le lire "
-"et le conserver sur le serveur (Microsoft Exchange, Novell&reg; "
-"GroupWise&reg; ou <link linkend=\"imap\">IMAP</link>) ou le lire dans les "
-"fichiers qui existent déjà sur votre ordinateur. Votre serveur peut vous "
-"imposer d'utiliser une connexion SSL (Secure Socket Layer). Vous avez le "
-"choix entre trois options : Aucun chiffrement, Chiffrement TLS ou "
-"Chiffrement SSL."
+"les courriels depuis un <link linkend=\"pop\">serveur POP</link>, le lire et "
+"le conserver sur le serveur (Microsoft Exchange, Novell&reg; GroupWise&reg; "
+"ou <link linkend=\"imap\">IMAP</link>) ou le lire dans les fichiers qui "
+"existent déjà sur votre ordinateur. Si votre serveur vous impose "
+"l'utilisation d'une connexion sécurisée, vous avez le choix entre trois "
+"options : Aucun chiffrement, Chiffrement TLS ou Chiffrement SSL."
 
-#: ../C/evolution.xml:6332(para)
+#: ../C/evolution.xml:6297(para)
 msgid ""
 "Your system administrator might ask you to connect to a specific port on a "
 "mail server. To specify which port you use, just type a colon and the port "
@@ -13118,7 +12875,7 @@ msgstr ""
 "serveur. Par exemple, pour vous connecter au port 143 sur le serveur smtp."
 "exemple.com, définissez smtp.exemple.com:143 comme nom de serveur."
 
-#: ../C/evolution.xml:6333(para)
+#: ../C/evolution.xml:6298(para)
 msgid ""
 "For additional information, see <link linkend=\"second-step\">Receiving "
 "Mail</link>."
@@ -13126,11 +12883,11 @@ msgstr ""
 "Pour plus d'informations, consultez <link linkend=\"second-step\">Réception "
 "des courriels</link>."
 
-#: ../C/evolution.xml:6335(title)
+#: ../C/evolution.xml:6300(title)
 msgid "Receiving Options:"
 msgstr "Options de réception :"
 
-#: ../C/evolution.xml:6336(para)
+#: ../C/evolution.xml:6301(para)
 msgid ""
 "Decide if you want to check for mail automatically and how often, as well as "
 "setting other message retrieval options."
@@ -13139,7 +12896,7 @@ msgstr ""
 "messages et définissez la fréquence de l'opération et d'autres options de "
 "réception des messages."
 
-#: ../C/evolution.xml:6338(para)
+#: ../C/evolution.xml:6303(para)
 msgid ""
 "For additional information, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -13147,23 +12904,24 @@ msgstr ""
 "Pour plus d'informations, consultez <link linkend=\"more-mail-options"
 "\">Options de réception du courriel</link>."
 
-#: ../C/evolution.xml:6340(title)
+#: ../C/evolution.xml:6305(title)
 msgid "Sending Mail:"
 msgstr "Envoi de courriels :"
 
-#: ../C/evolution.xml:6341(para)
+#: ../C/evolution.xml:6306(para)
 msgid ""
 "Use this section to choose and configure a method for sending mail. You can "
 "choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have "
-"installed the Evolution Connector for Microsoft Exchange), or <link linkend="
-"\"sendmail\">Sendmail</link>."
+"installed the Evolution Connector for Microsoft Exchange), <link linkend="
+"\"sendmail\">Sendmail</link> or many other options."
 msgstr ""
 "Utilisez cette section pour choisir et configurer la méthode d'envoi des "
 "courriels. Vous pouvez choisir <link linkend=\"smtp\">SMTP</link>, Microsoft "
 "Exchange (si vous avez installé le connecteur Evolution pour Microsoft "
-"Exchange) ou <link linkend=\"sendmail\">Sendmail</link>."
+"Exchange) ou <link linkend=\"sendmail\">Sendmail</link>, ou bien d'autres "
+"options."
 
-#: ../C/evolution.xml:6343(para)
+#: ../C/evolution.xml:6308(para)
 msgid ""
 "For additional information, see <link linkend=\"third-step\">Sending Mail</"
 "link>."
@@ -13171,22 +12929,22 @@ msgstr ""
 "Pour plus d'informations, consultez <link linkend=\"third-step\">Envoi de "
 "courriel</link>."
 
-#: ../C/evolution.xml:6345(title)
+#: ../C/evolution.xml:6310(title)
 msgid "Defaults:"
 msgstr "Valeurs par défaut :"
 
-#: ../C/evolution.xml:6346(para)
+#: ../C/evolution.xml:6311(para)
 msgid ""
 "Use this section to set where this account stores the messages that it has "
 "sent, and the messages that you save as drafts. If you want to revert to the "
-"default settings, click Restore Defaults."
+"default settings, click Restore."
 msgstr ""
 "Utilisez cette section pour indiquer l'emplacement dans lequel le compte "
 "stocke les messages envoyés et les messages que vous enregistrez sous forme "
 "de brouillons. Si vous voulez restaurer les paramètres par défaut, cliquez "
 "sur Rétablir."
 
-#: ../C/evolution.xml:6348(para)
+#: ../C/evolution.xml:6313(para)
 msgid ""
 "If you want to send someone a copy of every message from this account, "
 "select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) "
@@ -13196,7 +12954,7 @@ msgstr ""
 "« Toujours envoyer une copie (Cc) à » ou « Toujours envoyer une copie cachée "
 "(Cci) à » et indiquez une ou plusieurs adresses."
 
-#: ../C/evolution.xml:6349(para)
+#: ../C/evolution.xml:6314(para)
 msgid ""
 "You can specify the way you want to receive message receipts. You can set "
 "Send message receipts to Never, Always or Ask for each message. For more "
@@ -13208,7 +12966,7 @@ msgstr ""
 "d'informations, consultez <link linkend=\"b13uhy6r\">Paramètres par défaut</"
 "link>."
 
-#: ../C/evolution.xml:6350(para)
+#: ../C/evolution.xml:6315(para)
 msgid ""
 "You can change the default settings of your sent items. Click Advanced Send "
 "Options to prioritize, classify your send messages. You can also set the "
@@ -13223,11 +12981,11 @@ msgstr ""
 "votre message en conséquence. Activez le suivi d'état et définissez les "
 "notifications de retour pour la messagerie, le calendrier et les tâches."
 
-#: ../C/evolution.xml:6352(title)
+#: ../C/evolution.xml:6317(title)
 msgid "Security:"
 msgstr "Sécurité :"
 
-#: ../C/evolution.xml:6353(para)
+#: ../C/evolution.xml:6318(para)
 msgid ""
 "Use this section to set the security options for this account. If you use "
 "encryption, enter your PGP key ID (see <link linkend=\"encryption"
@@ -13240,11 +12998,11 @@ msgstr ""
 "sélectionnez les quatre options de manière appropriée pour définir la "
 "gestion des clés et des signatures."
 
-#: ../C/evolution.xml:6356(title)
+#: ../C/evolution.xml:6321(title)
 msgid "Proxy:"
 msgstr "Proxy :"
 
-#: ../C/evolution.xml:6357(para)
+#: ../C/evolution.xml:6322(para)
 msgid ""
 "This only displays if you have a GroupWise account. Use this section to set "
 "proxy access for other users to access your mailbox or calendar."
@@ -13253,55 +13011,54 @@ msgstr ""
 "cette section pour définir l'accès proxy par d'autres utilisateurs à vos "
 "messages et à votre calendrier."
 
-#: ../C/evolution.xml:6363(para)
+#: ../C/evolution.xml:6328(para)
 msgid ""
 "The Autocompletion tool lets you choose address books to auto-complete names "
-"for you. This functionality requires accessibility to each of the address "
-"books you want to use. To enable autocompletion, select each of the address "
-"books that you want to use auto completion in the Autocompletion page."
+"for you in the mail composer. This functionality requires accessibility to "
+"each of the address books you want to use. To enable autocompletion, select "
+"each of the address books that you want to use auto completion in the "
+"Autocompletion page."
 msgstr ""
 "Cet outil permet de choisir les carnets d'adresses qui complètent "
-"automatiquement les noms. Cette fonction nécessite d'accéder à chacun des "
-"carnets d'adresses. Pour activer la fonction, dans la page Complétion "
-"automatique, sélectionnez les carnets d'adresses avec lesquels vous voulez "
-"l'utiliser."
+"automatiquement les noms dans l'éditeur de message. Cette fonction nécessite "
+"d'accéder à chacun des carnets d'adresses. Pour activer la fonction, dans la "
+"page Complétion automatique, sélectionnez les carnets d'adresses avec "
+"lesquels vous voulez l'utiliser."
 
-#: ../C/evolution.xml:6367(title)
+#: ../C/evolution.xml:6332(title)
 msgid "IMAP Mail Headers"
 msgstr "En-têtes de messages IMAP"
 
-#: ../C/evolution.xml:6368(para)
+#: ../C/evolution.xml:6333(para)
 msgid ""
-"Evolution allow you to choose the headers that you want to download so that "
-"you can reduce the download time and at the same time having control as to "
-"filter or move your mails around the way you like it. Evolution help you "
-"customize your IMAP Mail header preferences and thus save the download time. "
-"The IMAP Mail headers are as follows:"
+"Evolution allows you to choose the headers that you want to download so that "
+"you can reduce the download time and filter or move your mail around the way "
+"you like it. Evolution help you customize your IMAP Mail header preferences "
+"and thus save the download time. The IMAP Mail header options are as follows:"
 msgstr ""
 "Evolution permet de choisir les en-têtes que vous souhaitez télécharger, "
-"afin de réduire la durée de téléchargement tout en conservant le contrôle "
-"sur le filtrage et le déplacement de vos messages à votre convenance. "
-"Evolution vous aide à personnaliser les préférences des en-têtes de messages "
-"IMAP et à économiser ainsi du temps de téléchargement. Les groupes d'en-"
-"têtes de messages IMAP sont les suivants :"
+"afin de réduire la durée de téléchargement et de filtrer ou déplacer vos "
+"messages à votre convenance. Evolution vous aide à personnaliser les "
+"préférences des en-têtes de messages IMAP et à économiser ainsi du temps de "
+"téléchargement. Les options d'en-têtes de messages IMAP sont les suivantes :"
 
-#: ../C/evolution.xml:6370(title)
+#: ../C/evolution.xml:6335(title)
 msgid "All Headers:"
 msgstr "Tous les en-têtes :"
 
-#: ../C/evolution.xml:6371(para)
+#: ../C/evolution.xml:6336(para)
 msgid ""
-"This include all the available IMAP Mail headers. By choosing this option, "
-"Evolution will download all the Headers for all the messages."
+"This includes all the available IMAP Mail headers. By choosing this option, "
+"Evolution will download all the headers for all the messages."
 msgstr ""
 "Cela comprend tous les en-têtes de messages IMAP disponibles. En choisissant "
 "cette option, Evolution télécharge tous les en-têtes de tous les messages."
 
-#: ../C/evolution.xml:6374(title)
+#: ../C/evolution.xml:6339(title)
 msgid "Basic Headers:"
 msgstr "En-têtes de base :"
 
-#: ../C/evolution.xml:6375(para)
+#: ../C/evolution.xml:6340(para)
 msgid ""
 "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
 "Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
@@ -13316,32 +13073,33 @@ msgstr ""
 "Cela permet d'accélérer Evolution. C'est l'option généralement recommandée "
 "pour la plupart des utilisateurs."
 
-#: ../C/evolution.xml:6378(title)
+#: ../C/evolution.xml:6343(title)
 msgid "Mailing List Headers:"
 msgstr "En-têtes de listes de diffusion :"
 
-#: ../C/evolution.xml:6379(para)
+#: ../C/evolution.xml:6344(para)
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
 "mailing-lists are also fetched. Mailing list headers will have the "
-"informations such as the mailing list ID, owner of the mailing list, and so "
+"informations such as the mailinglist-ID, owner of the mailing list, and so "
 "on with which you can create mailing list filters."
 msgstr ""
 "Activez cette option pour profiter des filtres basés sur les en-têtes de "
 "listes de diffusion (comme par ex. list-Id) afin qu'en plus des en-têtes de "
 "base, les en-têtes correspondants aux listes de diffusion soient aussi "
 "récupérés. Ces en-têtes contiennent des informations telles que "
-"l'identifiant de la liste de diffusion, le propriétaire de la liste, etc. ce "
-"qui vous permet de créer des filtres en rapport avec les listes de diffusion."
+"l'identifiant de la liste de diffusion(mailinglist-ID), le propriétaire de "
+"la liste, etc. ce qui vous permet de créer des filtres en rapport avec les "
+"listes de diffusion."
 
-#: ../C/evolution.xml:6381(para)
+#: ../C/evolution.xml:6346(para)
 msgid ""
-"This is the default Header preferences that comes with Evolution. When this "
+"This is the default Header preference that comes with Evolution. When this "
 "option is chosen, Evolution will download a basic set of headers (as "
 "described above) along with a set of headers that are needed for client-side "
 "filters based on mailing lists. If you do not have any filters on Evolution, "
-"it is recommended to switch to the \"Basic Headers Only\"option."
+"it is recommended to switch to the \"Basic Headers Only\" option."
 msgstr ""
 "C'est la valeur par défaut d'en-têtes choisis par Evolution. Avec cette "
 "option, Evolution télécharge un ensemble d'en-têtes de base (comme décrit ci-"
@@ -13350,11 +13108,11 @@ msgstr ""
 "Evolution, il est recommandé de choisir l'option « En-têtes de base "
 "uniquement »."
 
-#: ../C/evolution.xml:6383(title)
+#: ../C/evolution.xml:6348(title)
 msgid "Custom Headers:"
 msgstr "En-têtes personnalisés :"
 
-#: ../C/evolution.xml:6384(para)
+#: ../C/evolution.xml:6349(para)
 msgid ""
 "These are the extra headers in addition to the above standard headers. You "
 "can add custom headers in addition to the standard headers. If you want to "
@@ -13372,39 +13130,38 @@ msgstr ""
 "personnalisés. À cet endroit, vous pouvez ajouter ou enlever des en-têtes "
 "individuels en fonction de vos besoins."
 
-#: ../C/evolution.xml:6387(para)
-msgid "This option may not be needed if you have chosen to download ALL Headers."
+#: ../C/evolution.xml:6352(para)
+msgid ""
+"This option may not be needed if you have chosen to download ALL Headers."
 msgstr ""
 "Cette option n'est pas utile si vous avez choisi de télécharger TOUS les en-"
 "têtes."
 
-#: ../C/evolution.xml:6389(para)
+#: ../C/evolution.xml:6354(para)
 msgid "To set the IMAP Mail headers:"
 msgstr "Pour définir les en-têtes de messages IMAP :"
 
-#: ../C/evolution.xml:6392(para)
-msgid "Select Edit &gt; Preferences."
-msgstr "Choisissez Édition &gt; Préférences."
-
-#: ../C/evolution.xml:6395(para)
+#: ../C/evolution.xml:6360(para)
 msgid "Select the IMAP account and click Edit to open the Account Editor."
 msgstr ""
 "Sélectionnez le compte IMAP et cliquez sur Édition pour ouvrir l'éditeur de "
 "compte."
 
-#: ../C/evolution.xml:6398(para)
+#: ../C/evolution.xml:6363(para)
 msgid ""
 "On the Account Editor, click IMAP Headers tab to open IMAP Headers to the "
 "Account Editor."
-msgstr "Dans l'éditeur de compte, cliquez sur l'onglet En-têtes IMAP pour l'ouvrir."
+msgstr ""
+"Dans l'éditeur de compte, cliquez sur l'onglet En-têtes IMAP pour l'ouvrir."
 
-#: ../C/evolution.xml:6403(para)
-msgid "Click Fetch All Headers to download all the available header information."
+#: ../C/evolution.xml:6368(para)
+msgid ""
+"Click Fetch All Headers to download all the available header information."
 msgstr ""
 "Cliquez sur « Télécharger tous les en-têtes » afin de télécharger toutes les "
 "informations d'en-têtes disponibles."
 
-#: ../C/evolution.xml:6405(para)
+#: ../C/evolution.xml:6370(para)
 msgid ""
 "The more headers you have, the more time it will consume to download. This "
 "option is not recommended."
@@ -13412,27 +13169,28 @@ msgstr ""
 "Plus vous avez d'en-têtes, plus le temps de téléchargement sera élevé. Cette "
 "option n'est pas recommandée."
 
-#: ../C/evolution.xml:6409(para)
+#: ../C/evolution.xml:6374(para)
 msgid "Click Basic Headers to download basic headers."
 msgstr ""
 "Cliquez sur « En-têtes de base » pour télécharger uniquement les en-têtes de "
 "base."
 
-#: ../C/evolution.xml:6412(para)
+#: ../C/evolution.xml:6377(para)
 msgid "Click Basic and Mailing Headers to download both."
 msgstr ""
 "Cliquez sur En-têtes de base et de listes de diffusion pour télécharger ces "
 "deux sortes d'en-têtes."
 
-#: ../C/evolution.xml:6415(para)
+#: ../C/evolution.xml:6380(para)
 msgid "Click Add to add any predefined custom headers."
-msgstr "Cliquez sur Ajouter pour ajouter des en-têtes personnalisés prédéfinis."
+msgstr ""
+"Cliquez sur Ajouter pour ajouter des en-têtes personnalisés prédéfinis."
 
-#: ../C/evolution.xml:6418(para)
+#: ../C/evolution.xml:6383(para)
 msgid "Click Remove to remove the custom headers."
 msgstr "Cliquez sur Enlever pour enlever des en-têtes personnalisés."
 
-#: ../C/evolution.xml:6425(para)
+#: ../C/evolution.xml:6390(para)
 msgid ""
 "The Mail Preferences tool lets you choose how to display citations, how long "
 "to wait before marking a message as read, and other mail display settings."
@@ -13441,110 +13199,110 @@ msgstr ""
 "citations, le délai après lequel un message est marqué comme ayant été lu, "
 "ainsi que d'autres paramètres d'affichage des messages."
 
-#: ../C/evolution.xml:6428(link) ../C/evolution.xml:6452(title)
+#: ../C/evolution.xml:6393(link) ../C/evolution.xml:6417(title)
 msgid "General Mail Settings"
 msgstr "Paramètres généraux du courriel"
 
-#: ../C/evolution.xml:6431(link) ../C/evolution.xml:6474(title)
+#: ../C/evolution.xml:6396(link) ../C/evolution.xml:6439(title)
 msgid "HTML Mail Preferences"
 msgstr "Préférences du courriel HTML"
 
-#: ../C/evolution.xml:6434(link)
-msgid "Color Preferences"
-msgstr "Préférences de couleurs"
+#: ../C/evolution.xml:6399(link) ../C/evolution.xml:6457(title)
+msgid "Label Preferences"
+msgstr "Préférences des étiquettes"
 
-#: ../C/evolution.xml:6437(link) ../C/evolution.xml:6528(title)
+#: ../C/evolution.xml:6402(link) ../C/evolution.xml:6491(title)
 msgid "Mail Header Preferences"
 msgstr "Préférences des en-têtes de messages"
 
-#: ../C/evolution.xml:6440(link) ../C/evolution.xml:6540(title)
+#: ../C/evolution.xml:6405(link) ../C/evolution.xml:6503(title)
 msgid "Junk Mail Preferences"
 msgstr "Préférences du pourriel"
 
-#: ../C/evolution.xml:6443(link) ../C/evolution.xml:6583(title)
+#: ../C/evolution.xml:6408(link) ../C/evolution.xml:6546(title)
 msgid "Automatic Contacts Preferences"
 msgstr "Préférences des contacts automatiques"
 
-#: ../C/evolution.xml:6446(link) ../C/evolution.xml:6589(title)
+#: ../C/evolution.xml:6411(link) ../C/evolution.xml:6552(title)
 msgid "Calendar and Tasks Preferences"
 msgstr "Préférences du calendrier et des tâches"
 
-#: ../C/evolution.xml:6449(para)
+#: ../C/evolution.xml:6414(para)
 msgid ""
-"For information on individual e-mail account settings, see <link linkend="
+"For information on individual email account settings, see <link linkend="
 "\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
 msgstr ""
 "Pour plus d'informations sur la création de comptes de messagerie, consultez "
 "<link linkend=\"config-prefs-mail-identity\">Utilisation des comptes de "
 "messagerie</link>."
 
-#: ../C/evolution.xml:6453(para)
+#: ../C/evolution.xml:6418(para) ../C/evolution.xml:6574(para)
 msgid "The General page has the following options:"
 msgstr "La page Général présente les options suivantes :"
 
-#: ../C/evolution.xml:6455(title)
+#: ../C/evolution.xml:6420(title)
 msgid "Message Fonts:"
 msgstr "Police des messages :"
 
-#: ../C/evolution.xml:6456(para)
+#: ../C/evolution.xml:6421(para)
 msgid ""
 "Normally, Evolution uses the same fonts as other GNOME applications. To "
 "choose different fonts, deselect Use the same fonts as other applications "
-"and select one font for standard typefaces and a second for monospace, "
-"terminal, or display."
+"and select one font for standard typefaces and a second for monospace."
 msgstr ""
 "Normalement, Evolution utilise les mêmes polices que les autres applications "
 "GNOME. Pour choisir des polices différentes, désélectionnez « Utiliser les "
-"mêmes polices que dans les autres applications » et sélectionnez la police "
-"des caractères standard et la police des caractères à espacement fixe, de "
-"terminal ou d'affichage."
+"mêmes polices que dans les autres applications » et sélectionnez une police "
+"pour les caractères standard et une police pour les caractères à espacement "
+"fixe."
 
-#: ../C/evolution.xml:6459(title)
+#: ../C/evolution.xml:6424(title)
 msgid "Message Display:"
 msgstr "Affichage des messages :"
 
-#: ../C/evolution.xml:6460(para)
+#: ../C/evolution.xml:6425(para)
 msgid ""
 "Choose how long you want to wait before marking a message read, how to "
-"highlight quotations, and the default encoding. Enable ‘Fall back to "
-"threading message by subject’ to group the messages as message threads. You "
-"can also set the limit to the number of addresses displayed in the message "
-"header by enabling ‘Shrink To/CC/BCC header to’ option.You can also set the "
-"limit for rendering text content in the message you recive.By default, when "
-"you receive a message with text content more than 4096 Kilo Bytes, Evolution "
-"will not render the message in the preview pane. You can view unformatted "
-"text either inline or using an external application. You can also enable "
-"Magic spacebar and search folders."
+"highlight quotations, and the default encoding. Enable <guilabel>Fall back "
+"to threading message by subject</guilabel> to group the messages as message "
+"threads. You can also set the limit to the number of addresses displayed in "
+"the message header by enabling <guilabel>Shrink To/CC/BCC header to</"
+"guilabel> option.You can also set the limit for rendering text content in "
+"the message you receive. By default, when you receive a message with text "
+"content more than 4096 Kilo Bytes, Evolution will not render the message in "
+"the preview pane. You can view unformatted text either inline or using an "
+"external application. You can also enable Magic spacebar and search folders."
 msgstr ""
 "Définissez le délai après lequel un message est marqué comme ayant été lu, "
 "la manière de mettre en évidence les citations et le codage par défaut. "
-"Cochez « Revenir au tri des messages par sujet » afin de grouper les "
-"messages par fil de discussion. Vous pouvez aussi définir la limite des "
-"adresses à afficher dans les en-têtes de message en cochant l'option "
-"« Réduire les en-têtes À / Cc / Cci à ». Vous pouvez aussi définir la "
-"longueur maximale du formatage du contenu texte des messages reçus. Par "
-"défaut, lorsque vous recevez un message avec un contenu de texte plus grand "
-"que 4096 Kio, Evolution n'affiche pas le message dans le panneau d'aperçu. "
-"Vous pouvez alors afficher le texte non formaté soit de manière intégrée, "
-"soit en utilisant une application externe. Il est aussi possible d'activer la barre d'espace magique et les dossiers de recherche."
-
-#: ../C/evolution.xml:6462(para)
+"Cochez « Revenir au tri des messages par sujet » afin de grouper les messages "
+"par fil de discussion. Vous pouvez aussi définir la limite des adresses à "
+"afficher dans les en-têtes de message en cochant l'option « Réduire les en-"
+"têtes À / Cc / Cci à ». Vous pouvez aussi définir la longueur maximale du "
+"formatage du contenu texte des messages reçus. Par défaut, lorsque vous "
+"recevez un message avec un contenu de texte plus grand que 4096 Kio, "
+"Evolution n'affiche pas le message dans le panneau d'aperçu. Vous pouvez "
+"alors afficher le texte non formaté soit de manière intégrée, soit en "
+"utilisant une application externe. Il est aussi possible d'activer la barre "
+"d'espace magique et les dossiers de recherche."
+
+#: ../C/evolution.xml:6427(para)
 msgid ""
 "To group the messages as threads select View &gt; Group By threads or press "
-"Ctrl +T."
+"Ctrl+T."
 msgstr ""
 "Pour grouper les messages sous forme de fils de discussion, choisissez "
 "Affichage &gt; Grouper par fils de discussion ou appuyez sur Ctrl+T."
 
-#: ../C/evolution.xml:6464(title)
+#: ../C/evolution.xml:6429(title)
 msgid "Deleting Mail:"
 msgstr "Supprimer le courriel :"
 
-#: ../C/evolution.xml:6465(para)
+#: ../C/evolution.xml:6430(para)
 msgid ""
 "Choose whether to delete messages automatically when quitting Evolution and "
 "how frequently, and whether you want to explicitly confirm the final "
-"deletion of messages.Select Confirm when expunging a folder to confirm the "
+"deletion of messages. Select Confirm when expunging a folder to confirm the "
 "final deletion. You can have four different options to set the frequency for "
 "deletion: Everytime, Once per day, Once per week, and Once per month."
 msgstr ""
@@ -13556,11 +13314,11 @@ msgstr ""
 "disposez de quatre options pour définir la fréquence de suppression : À "
 "chaque fois, Une fois par jour, Une fois par semaine et Une fois par mois."
 
-#: ../C/evolution.xml:6468(title)
+#: ../C/evolution.xml:6433(title)
 msgid "New Mail Notifications:"
 msgstr "Notification des nouveaux courriels :"
 
-#: ../C/evolution.xml:6469(para)
+#: ../C/evolution.xml:6434(para)
 msgid ""
 "Evolution can alert you to the arrival of new mail with a beep or by playing "
 "a sound file. Choose your alert noise, or select none, as you prefer. You "
@@ -13571,25 +13329,27 @@ msgstr ""
 "sélectionnez pas. Vous pouvez choisir de ne pas recevoir de notification "
 "lors de l'arrivée d'un nouveau message."
 
-#: ../C/evolution.xml:6475(para)
+#: ../C/evolution.xml:6440(para)
 msgid "The HTML Mail page has the following options:"
 msgstr "La page Courriel HTML contient les options suivantes :"
 
-#: ../C/evolution.xml:6477(title)
+#: ../C/evolution.xml:6442(title)
 msgid "Show Image Animations:"
 msgstr "Afficher les animations :"
 
-#: ../C/evolution.xml:6478(para)
-msgid "Turns animation on or off."
-msgstr "Permet d'activer ou de désactiver les animations."
+#: ../C/evolution.xml:6443(para)
+msgid "Turns image animation (e.g. GIF files) on or off."
+msgstr ""
+"Permet d'activer ou de désactiver les animations d'images (par ex. fichiers "
+"GIF)."
 
-#: ../C/evolution.xml:6481(title)
+#: ../C/evolution.xml:6446(title)
 msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:"
 msgstr ""
 "Demander l'autorisation lors de l'envoi de messages HTML à des contacts qui "
 "n'en veulent pas :"
 
-#: ../C/evolution.xml:6482(para)
+#: ../C/evolution.xml:6447(para)
 msgid ""
 "Some people do not like HTML mail, and you can set Evolution to warn you of "
 "this preference. This warning appears only when you send HTML mail to people "
@@ -13600,17 +13360,17 @@ msgstr ""
 "avertissement apparaît uniquement lorsque vous envoyez un message HTML à une "
 "personne de vos contacts définie comme n'utilisant pas HTML."
 
-#: ../C/evolution.xml:6485(title)
+#: ../C/evolution.xml:6450(title)
 msgid "Loading Images:"
 msgstr "Chargement des images :"
 
-#: ../C/evolution.xml:6486(para)
+#: ../C/evolution.xml:6451(para)
 msgid ""
-"You can embed a image in an e-mail and have it load only when the message "
-"arrives. However, spammers can use image loading patterns to confirm “live” "
-"addresses and invade your privacy. You can elect to never load images "
-"automatically, to load images only if the sender is in your contacts, or "
-"always load images."
+"You can embed a image in an email and have it load only when the message "
+"arrives. However, spammers can use image loading patterns to confirm "
+"<quote>valid</quote> addresses and invade your privacy. You can elect to "
+"never load images automatically, to load images only if the sender is in "
+"your contacts, or always load images."
 msgstr ""
 "Vous pouvez insérer une image dans un message et la charger uniquement "
 "lorsque le message arrive. Toutefois, les expéditeurs de pourriels peuvent "
@@ -13620,66 +13380,69 @@ msgstr ""
 "images que si les expéditeurs font partie de vos contacts ou de toujours "
 "charger les images."
 
-#: ../C/evolution.xml:6488(para)
+#: ../C/evolution.xml:6453(para)
 msgid ""
 "If you have chosen not to load images automatically, you can choose to see "
 "the images in one message at a time by selecting View &gt; Load Images or "
-"press Ctrl +I."
+"press Ctrl+I."
 msgstr ""
 "Si vous décidez de ne pas charger automatiquement les images, vous pouvez "
 "choisir de voir les images de chaque message en choisissant Affichage &gt; "
 "Charger les images ou en appuyant sur Ctrl+I."
 
-#: ../C/evolution.xml:6492(title)
-msgid "Label Preferences"
-msgstr "Préférences des libellés"
-
-#: ../C/evolution.xml:6493(para)
+#: ../C/evolution.xml:6458(para)
 msgid ""
 "The Label preferences option lets you add color labels for different kinds "
-"of messages. You can add, edit or remove the labels. You can also assign "
-"colors to each label you have created."
+"of messages. You can add, edit, or remove the labels. You can also assign "
+"colors to each label you create. You cannot remove the default labels."
 msgstr ""
-"L'outil des préférences de libellés permet d'affecter des "
-"étiquettes de couleur à différents types de messages. Vous pouvez ajouter, modifier ou enlever des libellés. Vous pouvez aussi attribuer des couleurs à chaque libellé que vous créez."
+"L'outil des préférences des étiquettes permet d'affecter des étiquettes de "
+"couleur à différents types de messages. Vous pouvez ajouter, modifier ou "
+"enlever des étiquettes. Vous pouvez aussi attribuer des couleurs à chaque "
+"étiquette que vous créez. Vous ne pouvez pas supprimer les étiquettes par "
+"défaut."
 
-#: ../C/evolution.xml:6496(para)
-msgid "You cannot remove the default labels."
-msgstr "Vous ne pouvez pas supprimer les libellés par défaut."
+#: ../C/evolution.xml:6460(para)
+msgid "To create a label:"
+msgstr "Pour créer une étiquette :"
 
-#: ../C/evolution.xml:6500(para)
-msgid "Click Add and specify the name in the Label Name dialog."
-msgstr "Cliquez sur Ajouter et saisissez un nom dans la boîte de dialogue du nom de libellé."
+#: ../C/evolution.xml:6463(para)
+msgid "Click Add and specify the name in the Label Name dialog box."
+msgstr ""
+"Cliquez sur Ajouter et saisissez un nom dans la boîte de dialogue du nom de "
+"l'étiquette."
 
-#: ../C/evolution.xml:6503(para)
+#: ../C/evolution.xml:6466(para)
 msgid "Click the color tab and select a color, then click OK."
-msgstr "Cliquez sur l'onglet Couleur, choisissez une couleur et cliquez sur Valider."
+msgstr ""
+"Cliquez sur l'onglet Couleur, choisissez une couleur et cliquez sur Valider."
 
-#: ../C/evolution.xml:6506(para)
+#: ../C/evolution.xml:6469(para)
 msgid "To edit label properties:"
-msgstr "Pour modifier les propriétés d'un libellé :"
+msgstr "Pour modifier les propriétés d'une étiquette :"
 
-#: ../C/evolution.xml:6509(para)
+#: ../C/evolution.xml:6472(para)
 msgid "Select the label and click Edit."
-msgstr "Sélectionnez le libellé et cliquez sur Modifier."
+msgstr "Sélectionnez l'étiquette et cliquez sur Modifier."
 
-#: ../C/evolution.xml:6512(para)
+#: ../C/evolution.xml:6475(para)
 msgid "Edit name and color, then click OK."
 msgstr "Modifiez le nom et la couleur, puis cliquez sur Valider."
 
-#: ../C/evolution.xml:6515(para)
-msgid "To assign a label for mail:"
-msgstr "Pour attribuer un libellé à un courriel :"
+#: ../C/evolution.xml:6478(para)
+msgid "To assign a label to a specific email message:"
+msgstr "Pour attribuer une étiquette à un message particulier :"
 
-#: ../C/evolution.xml:6518(para)
+#: ../C/evolution.xml:6481(para)
 msgid "Right-click the message from the message preview."
 msgstr "Faites un clic droit sur le message dans la liste des courriels."
 
-#: ../C/evolution.xml:6521(para)
+#: ../C/evolution.xml:6484(para)
 msgid "Click Label and select the desired label for the message."
-msgstr "Choisissez Libellé et sélectionnez le libellé souhaité pour le message."
+msgstr ""
+"Choisissez Étiquette et sélectionnez l'étiquette souhaitée pour le message."
 
-#: ../C/evolution.xml:6529(para)
+#: ../C/evolution.xml:6492(para)
 msgid ""
 "The headers on an incoming message are the information about the message "
 "that isn't the content of the message itself, such as the sender and the "
@@ -13694,11 +13457,11 @@ msgstr ""
 "vous lisez. Vous pouvez aussi ajouter de nouveaux en-têtes de messages dans "
 "la liste ou en enlever. Les en-têtes par défaut ne peuvent pas être enlevés."
 
-#: ../C/evolution.xml:6531(title)
+#: ../C/evolution.xml:6494(title)
 msgid "Sender Photograph:"
 msgstr "Photo de l'expéditeur :"
 
-#: ../C/evolution.xml:6532(para)
+#: ../C/evolution.xml:6495(para)
 msgid ""
 "This feature adds support for viewing the photograph of the sender at the "
 "right side of the preview pane."
@@ -13706,7 +13469,7 @@ msgstr ""
 "Cette fonctionnalité ajoute la possibilité de voir la photo de l'expéditeur "
 "du côté droit du panneau d'aperçu."
 
-#: ../C/evolution.xml:6534(para)
+#: ../C/evolution.xml:6497(para)
 msgid ""
 "To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences "
 "&gt; Headers &gt; Show the photograph of sender in the email preview. "
@@ -13717,27 +13480,28 @@ msgstr ""
 "de l'expéditeur dans l'aperçu du courriel ». Décochez cette option pour "
 "désactiver la fonctionnalité."
 
-#: ../C/evolution.xml:6535(para)
+#: ../C/evolution.xml:6498(para)
 msgid ""
 "By default it searches only in the local addressbooks enabled for "
-"autocompletion. If you deselect the option ‘Search for sender photograph "
-"only in the local addressbook’, it searches in all the addressbooks enabled "
-"for autocompletion. If there are multiple matches for the same contact, it "
-"always takes the first one. Consider a contact that has multiple matches - "
-"the first one with a photograph and the second without a photo. Here, "
-"Evolution takes the first contact regardless of it not having a photograph."
+"autocompletion. If you deselect the option <guilabel>Search for sender "
+"photograph only in the local addressbook</guilabel>, it searches in all the "
+"addressbooks enabled for autocompletion. If there are multiple matches for "
+"the same contact, it always takes the first one. Consider a contact that has "
+"multiple matches - the first one with a photograph and the second without a "
+"photo. Here, Evolution takes the first contact regardless of it not having a "
+"photograph."
 msgstr ""
 "Par défaut, Evolution ne cherche que dans les carnets d'adresses locaux "
-"activés pour l'auto-complétion. Si vous décochez l'option « Rechercher la "
-"photo de l'expéditeur uniquement dans les carnets d'adresses locaux », la "
-"recherche s'effectue dans tous les carnets d'adresses activés pour l'auto-"
-"complétion. S'il y a plusieurs résultats pour un seul contact, c'est "
-"toujours le premier qui est retenu. Si un contact se trouve dans plusieurs "
-"carnets d'adresses, Evolution choisit toujours le premier contact trouvé, "
-"sans prendre en compte la présence d'une photo ou non dans les contacts "
-"trouvés."
+"activés pour l'auto-complétion. Si vous décochez l'option "
+"<guilabel>Rechercher la photo de l'expéditeur uniquement dans les carnets "
+"d'adresses locaux</guilabel>, la recherche s'effectue dans tous les carnets "
+"d'adresses activés pour l'auto-complétion. S'il y a plusieurs résultats pour "
+"un seul contact, c'est toujours le premier qui est retenu. Si un contact se "
+"trouve dans plusieurs carnets d'adresses, Evolution choisit toujours le "
+"premier contact trouvé, sans prendre en compte la présence d'une photo ou "
+"non dans les contacts trouvés."
 
-#: ../C/evolution.xml:6536(para)
+#: ../C/evolution.xml:6499(para)
 msgid ""
 "This feature is disabled by default as it causes delay in fetching the "
 "messages."
@@ -13745,106 +13509,107 @@ msgstr ""
 "Cette fonctionnalité est désactivée par défaut, car elle ralentit la "
 "récupération des messages."
 
-#: ../C/evolution.xml:6541(para)
+#: ../C/evolution.xml:6504(para)
 msgid ""
-"You can check your incoming messages for junk content using Bogofilter or/"
-"and SpamAssassin tool with trainable Bayesian filters.Note that you need to "
-"enable the respective junk plugins to enable junk filtering."
+"You can check your incoming messages for junk content by using Bogofilter "
+"and SpamAssassin* tools, which have trainable Bayesian filters. You need to "
+"enable the Junk plugins to start filtering junk mail."
 msgstr ""
 "Vous pouvez vérifier si les messages reçus contiennent du pourriel en "
-"utilisant les outils Bogofilter et SpamAssassin avec des filtres bayésiens "
+"utilisant les outils Bogofilter et SpamAssassin* avec des filtres bayésiens "
 "intelligents. Vous devez cependant activer les greffons de pourriel "
 "correspondants pour activer le filtrage des pourriels."
 
-#: ../C/evolution.xml:6542(para)
-msgid "To enable junk filtering using SpamAssassin and/or Bogofilter,"
-msgstr "Pour activer le filtrage des pourriels avec SpamAssassin et/ou Bogofilter,"
+#: ../C/evolution.xml:6505(para)
+msgid "To enable Junk plugins:"
+msgstr "Pour activer les greffons de pourriel :"
 
-#: ../C/evolution.xml:6545(para)
+#: ../C/evolution.xml:6508(para)
 msgid "Select Edit &gt; Plugins"
 msgstr "Choisissez Édition &gt; Greffons."
 
-#: ../C/evolution.xml:6548(para)
-msgid "Select Bogofilter junk plugin and SpamAssassin junk plugin."
-msgstr "Activez les greffons de pourriel Bogofilter et SpamAssassin."
+#: ../C/evolution.xml:6511(para)
+msgid ""
+"Select the junk plugins you want. You can select either Bogofilter or "
+"SpamAssassin, or you can select both."
+msgstr ""
+"Sélectionnez les greffons de pourriel que vous souhaitez activer. Vous "
+"pouvez activer Bogofilter ou SpamAssassin, ou les deux."
 
-#: ../C/evolution.xml:6552(title)
+#: ../C/evolution.xml:6515(title)
 msgid "General:"
 msgstr "Général :"
 
-#: ../C/evolution.xml:6553(para)
+#: ../C/evolution.xml:6516(para)
 msgid ""
-"You can enable checking incoming mails for junk contents and also decide how "
-"often you want to delete junk mails on exit. You also have the option to "
-"choose either SpamAssassin or Bogofilter or both. Click Check incoming mail "
-"for junk."
+"You can check incoming email for junk contents and also decide how often you "
+"want to delete junk mail. You also have the option to choose either "
+"SpamAssassin or Bogofilter, or you can select both."
 msgstr ""
-"Vous pouvez activer la vérification de pourriel des messages entrants et "
-"vous pouvez aussi décider la fréquence de suppression des pourriels en "
-"quittant Evolution. Vous avez aussi la possibilité de choisir SpamAssassin, "
-"Bogofilter ou les deux. Cochez « Vérifier si les messages entrants sont du "
-"pourriel »."
+"Vous pouvez vérifier les pourriels dans les messages entrants et vous pouvez "
+"aussi décider la fréquence de suppression des pourriels. Vous avez aussi la "
+"possibilité de choisir SpamAssassin, Bogofilter ou les deux."
 
-#: ../C/evolution.xml:6556(title)
+#: ../C/evolution.xml:6519(title)
 msgid "Checking Incoming Mail for Junk:"
 msgstr "Vérifier la présence de pourriels dans les messages entrants :"
 
-#: ../C/evolution.xml:6557(para)
+#: ../C/evolution.xml:6520(para)
 msgid "This option turns automatic junk mail filtering on or off."
 msgstr "Cette option active ou désactive le filtrage automatique de pourriels."
 
-#: ../C/evolution.xml:6560(title)
-msgid "Delete junk mails on exit:"
+#: ../C/evolution.xml:6523(title)
+msgid "Delete junk mail on exit:"
 msgstr "Supprimer le pourriel en quittant :"
 
-#: ../C/evolution.xml:6561(para)
+#: ../C/evolution.xml:6524(para)
 msgid ""
-"Select Delete junk messages on exit and also specify when to delete the junk "
-"messages from the options (Every time, Once per day, Once per week, Once per "
-"month)."
+"This option deletes junk messages when you exit. You can also specify when "
+"to delete the junk messages (every time, once per day, once per week, once "
+"per month)."
 msgstr ""
-"Cochez « Supprimer les pourriels en quittant » et indiquez également dans "
-"les options quand les pourriels doivent être détruits (À chaque fois, Une "
-"fois par jour, Une fois par semaine, Une fois par mois)."
+"Cette option permet de supprimer les pourriels à la fermeture d'Evolution. "
+"Vous pouvez également indiquer quand les pourriels doivent être détruits (À "
+"chaque fois, Une fois par jour, Une fois par semaine, Une fois par mois)."
 
-#: ../C/evolution.xml:6564(title)
+#: ../C/evolution.xml:6527(title)
 msgid "Default junk plugin:"
 msgstr "Greffon pourriel par défaut :"
 
-#: ../C/evolution.xml:6565(para)
+#: ../C/evolution.xml:6528(para)
 msgid ""
-"Select SpamAssassin or/and Bogofilter as your junk filter. You can view them "
-"only if you have enabled the respective plugins. When you select any option, "
-"it also reports if the underlying binary is available or not."
+"Select either SpamAssassin or Bogofilter, or both, as your junk filter. You "
+"can view them only if you have enabled the respective plugins. When you "
+"select any option, it also reports if the underlying binary is available or "
+"not."
 msgstr ""
-"Sélectionnez SpamAssassin et/ou Bogofilter comme filtre de pourriels. Ils "
-"n'apparaissent que si leur greffon respectif a été activé. Lorsque vous "
-"sélectionnez une option, vous êtes aussi informé de la présence ou non du "
-"programme binaire correspondant."
+"Sélectionnez SpamAssassin ou Bogofilter ou les deux comme filtre de "
+"pourriels. Ils n'apparaissent que si leur greffon respectif a été activé. "
+"Lorsque vous sélectionnez une option, vous êtes aussi informé de la présence "
+"ou non du programme binaire correspondant."
 
-#: ../C/evolution.xml:6569(title)
+#: ../C/evolution.xml:6532(title)
 msgid "SpamAssassin Options:"
 msgstr "Options de SpamAssassin :"
 
-#: ../C/evolution.xml:6570(para)
+#: ../C/evolution.xml:6533(para)
 msgid ""
-"Remote test performs filtering junk mails on remote servers. It also "
-"includes online tests, like checking for blacklisted message senders and "
-"ISPs."
+"Remote Test performs junk mail filtering on remote servers. It also includes "
+"online tests, like checking for blacklisted message senders and ISPs."
 msgstr ""
 "Les tests distants effectuent le filtrage des pourriels sur des serveurs "
 "distants. Cela comprend également des tests en ligne, tels que la "
 "vérification des expéditeurs de messages et les fournisseurs de service "
 "Internet fichés."
 
-#: ../C/evolution.xml:6572(para)
+#: ../C/evolution.xml:6535(para)
 msgid ""
 "This option uses tests that require a network connection, such as checking "
 "to see if a message is in a list of known junk messages, or if the sender or "
-"gateway are blacklisted by anti-spam organizations.Online tests can make "
+"gateway are blacklisted by anti-spam organizations. Online tests can make "
 "filtering slower, because remote tests add to the amount of time it takes to "
-"check for junk mail, but increase accuracy. When you select this option, you "
-"do not need to do any additional setup to make this work."
+"check for junk mail, but they increase accuracy. When you select this "
+"option, you do not need to do any additional setup."
 msgstr ""
 "Cette option utilise des tests qui exigent une connexion réseau, par exemple "
 "pour contrôler si un message se trouve dans une liste de pourriels connus ou "
@@ -13852,38 +13617,37 @@ msgstr ""
 "organisation anti-pourriel. Les tests distants augmentent le temps de "
 "vérification des pourriels, mais permettent également une meilleure "
 "détection. Si vous sélectionnez cette option, vous n'avez pas besoin "
-"d'effectuer d'autres réglages pour que cela fonctionne."
+"d'effectuer d'autres réglages."
 
-#: ../C/evolution.xml:6574(title)
+#: ../C/evolution.xml:6537(title)
 msgid "Bogofilter Options:"
 msgstr "Options de Bogofilter :"
 
-#: ../C/evolution.xml:6575(para)
+#: ../C/evolution.xml:6538(para)
 msgid ""
-"Select Convert mail text to unicode to enable unicode based filtering. For "
-"more information on Bogofilter, see <ulink url=\"http://bogofilter."
+"Select Convert mail text to Unicode to enable Unicode* filtering. For more "
+"information on Bogofilter, see the <ulink url=\"http://bogofilter."
 "sourceforge.net/\">Bogofilter site</ulink>."
 msgstr ""
-"Cochez « Convertir le texte du courriel en Unicode » pour activer le "
-"filtrage basé sur Unicode. Pour plus d'informations sur Bogofilter, "
-"consultez le <ulink url=\"http://bogofilter.sourceforge.net/\">site de "
-"Bogofilter</ulink>."
+"Cochez « Convertir le texte du courriel en Unicode » pour activer le filtrage "
+"Unicode*. Pour plus d'informations sur Bogofilter, consultez le <ulink url="
+"\"http://bogofilter.sourceforge.net/\">site de Bogofilter</ulink>."
 
-#: ../C/evolution.xml:6578(para)
+#: ../C/evolution.xml:6541(para)
 msgid ""
 "Check new messages for junk contents option under Edit &gt; Preferences &gt; "
-"Mail Accounts &gt; Edit &gt; Receiving option is enabled only for IMAP. "
-"Check incoming mail for junk option under Edit &gt; Prefernces &gt; Mail "
+"Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. "
+"Check incoming mail for junk option under Edit &gt; Preferences &gt; Mail "
 "Preferences &gt; Junk &gt; General refers only to POP and Local Delivery."
 msgstr ""
-"L'option « Vérifier si les nouveaux messages contiennent des pourriels » "
-"dans Édition &gt; Préférences &gt; Comptes de messagerie &gt; Édition &gt; "
+"L'option « Vérifier si les nouveaux messages contiennent des pourriels » dans "
+"Édition &gt; Préférences &gt; Comptes de messagerie &gt; Édition &gt; "
 "Options de réception n'est disponible que pour les comptes IMAP. L'option "
-"« Vérifier la présence de pourriels dans les messages entrants » dans "
-"Édition &gt; Préférences &gt; Préférences du courriel &gt; Pourriel ne "
-"s'applique qu'aux comptes POP et Distribution locale."
+"« Vérifier la présence de pourriels dans les messages entrants » dans Édition "
+"&gt; Préférences &gt; Préférences du courriel &gt; Pourriel ne s'applique "
+"qu'aux comptes POP et Distribution locale."
 
-#: ../C/evolution.xml:6584(para)
+#: ../C/evolution.xml:6547(para)
 msgid ""
 "There are two items in this section: Automatic Contacts automatically adds "
 "people that you respond to into your address book. You can select the "
@@ -13894,7 +13658,7 @@ msgstr ""
 "d'adresses. Vous pouvez sélectionner le carnet d'adresses par défaut dans la "
 "liste pour l'ajout automatique de contacts."
 
-#: ../C/evolution.xml:6585(para)
+#: ../C/evolution.xml:6548(para)
 msgid ""
 "Instant Messaging Contacts periodically synchronizes contact information and "
 "images with your instant messaging program. Currently this only works with "
@@ -13907,7 +13671,7 @@ msgstr ""
 "d'adresses ne doit pas être en lecture seule pour que ces deux fonctions "
 "soient opérationnelles."
 
-#: ../C/evolution.xml:6590(para)
+#: ../C/evolution.xml:6553(para)
 msgid ""
 "Allows you to delete messages after you have acted on an appointment. It "
 "also allows you to select calendars to search for meeting conflicts."
@@ -13916,35 +13680,31 @@ msgstr ""
 "vous. Il vous permet aussi de sélectionner des calendriers pour la recherche "
 "de conflits de réunions."
 
-#: ../C/evolution.xml:6596(para)
+#: ../C/evolution.xml:6559(para)
 msgid ""
 "There are three tabs for message composer settings where you can set the "
-"composer preferences. The General tab covers shortcuts and assorted "
-"behavior, the Signature tab sets your signature, and the Spell Checking tab "
-"controls spell checking."
+"composer preferences. The General tab covers assorted behavior, the "
+"Signature tab sets your signature, and the Spell Checking tab controls spell "
+"checking."
 msgstr ""
 "Vous disposez de trois pages de paramètres pour définir les préférences de "
-"l'éditeur de messages. L'onglet Général couvre les raccourcis et leur "
-"fonctionnement, l'onglet Signatures contrôle votre signature et l'onglet "
-"Correction orthographique contrôle la correction orthographique."
+"l'éditeur de messages. L'onglet Général couvre le comportement général, "
+"l'onglet Signatures permet de gérer votre signature et l'onglet Correction "
+"orthographique contrôle la correction orthographique."
 
-#: ../C/evolution.xml:6602(link) ../C/evolution.xml:6642(title)
+#: ../C/evolution.xml:6565(link) ../C/evolution.xml:6605(title)
 msgid "Signature"
 msgstr "Signatures"
 
-#: ../C/evolution.xml:6605(link) ../C/evolution.xml:6647(title)
+#: ../C/evolution.xml:6568(link) ../C/evolution.xml:6610(title)
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../C/evolution.xml:6611(para)
-msgid "In the General tab, you can set the following options:"
-msgstr "Dans l'onglet Général, vous pouvez définir les options suivantes :"
-
-#: ../C/evolution.xml:6613(title)
+#: ../C/evolution.xml:6576(title)
 msgid "Default Behavior:"
 msgstr "Comportement par défaut :"
 
-#: ../C/evolution.xml:6614(para)
+#: ../C/evolution.xml:6577(para)
 msgid ""
 "Choose how to normally forward and reply to messages, what character set "
 "they will use, whether they are in HTML, and whether that HTML can contain "
@@ -13955,7 +13715,7 @@ msgstr ""
 "voulez utiliser le format HTML et si les messages HTML peuvent contenir des "
 "émoticônes."
 
-#: ../C/evolution.xml:6616(para)
+#: ../C/evolution.xml:6579(para)
 msgid ""
 "You can forward messages either as an attachment or inline, or else as "
 "quoted. Choose reply style from the drop-down list: Quote original message, "
@@ -13966,11 +13726,11 @@ msgstr ""
 "liste déroulante : Citer le message d'origine, Ne pas citer le message "
 "d'origine ou Joindre le message d'origine."
 
-#: ../C/evolution.xml:6618(title)
+#: ../C/evolution.xml:6581(title)
 msgid "Top Posting Options:"
 msgstr "Option de réponse en tête de message :"
 
-#: ../C/evolution.xml:6619(para)
+#: ../C/evolution.xml:6582(para)
 msgid ""
 "When replying, you can choose where to place your signature in the message. "
 "You can place the signature either above the original message or at the end "
@@ -13984,31 +13744,31 @@ msgstr ""
 "recommandée, car le placement de la signature au fond des messages fait "
 "partie des standards de la messagerie."
 
-#: ../C/evolution.xml:6622(title) ../C/evolution.xml:6694(title)
+#: ../C/evolution.xml:6585(title) ../C/evolution.xml:6658(title)
 msgid "Alerts:"
 msgstr "Alertes :"
 
-#: ../C/evolution.xml:6623(para)
+#: ../C/evolution.xml:6586(para)
 msgid "There are two optional alerts you can select:"
 msgstr "Vous pouvez sélectionner deux types d'alertes :"
 
-#: ../C/evolution.xml:6628(title)
+#: ../C/evolution.xml:6591(title)
 msgid "Prompt When Sending Messages With an Empty Subject Line:"
 msgstr "Demander lors de l'envoi de messages dépourvus de sujet :"
 
-#: ../C/evolution.xml:6629(para)
+#: ../C/evolution.xml:6592(para)
 msgid "The composer warns you if you try to send a message without a subject."
 msgstr ""
 "L'éditeur vous avertit si vous essayez d'envoyer un message sans indiquer de "
 "sujet."
 
-#: ../C/evolution.xml:6634(title)
+#: ../C/evolution.xml:6597(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
 msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires Cci sont "
 "définis :"
 
-#: ../C/evolution.xml:6635(para)
+#: ../C/evolution.xml:6598(para)
 msgid ""
 "The composer warns you if you try to send a message that has only Bcc "
 "recipients. This is important because some mail servers fail to transmit "
@@ -14020,10 +13780,10 @@ msgstr ""
 "messagerie n'envoient pas de copies cachées si les messages ne contiennent "
 "pas au moins un destinataire visible de tous les destinataires."
 
-#: ../C/evolution.xml:6643(para)
+#: ../C/evolution.xml:6606(para)
 msgid ""
 "The signature editor allows you to create several different signatures in "
-"plain text or in HTML, and to specify which of them will be added to e-mail "
+"plain text or in HTML, and to specify which of them will be added to email "
 "you create in the message composer. If you prefer to use an alternate "
 "signature or none at all, you can select it from the mail composer itself."
 msgstr ""
@@ -14033,93 +13793,92 @@ msgstr ""
 "utiliser une signature alternative ou n'en utiliser aucune, vous pouvez "
 "l'indiquer dans l'éditeur de messages."
 
-#: ../C/evolution.xml:6648(para)
+#: ../C/evolution.xml:6611(para)
 msgid ""
-"To choose a spell-checking language, select it here. You must install the "
-"gnome-spell package, available through ZENworks® Linux Management, for spell-"
-"checking to be available in Evolution. Additional dictionaries are also "
-"available through Red Carpet® and are detected automatically if you have "
-"installed them. You must also install the aspell package. If this is the "
-"case, please contact your packager. To have the composer automatically check "
-"your spelling while you type, select Check Spelling While I Type. You can "
-"set the color for misspelled words."
+"To choose a spell-checking language, select it here. You must install gnome-"
+"spell, aspell, and an aspell language package (like for example aspell-en "
+"for english language) for spell-checking to be available in Evolution. "
+"Additional dictionaries are available through your package manager and are "
+"detected automatically if you have installed them. To have the composer "
+"automatically check your spelling while you type, select Check Spelling "
+"While I Type. You can set the color for misspelled words."
 msgstr ""
 "Sélectionnez ici la langue du correcteur orthographique. Vous devez "
-"installer le paquet gnome-spell disponible via ZENworks&reg; Linux "
-"Management pour que la correction orthographique soit disponible dans "
-"Evolution. Des dictionnaires supplémentaires sont également disponibles via "
-"Red Carpet&reg; ; ils sont détectés automatiquement si vous les avez "
-"installés. Vous devez aussi installer le paquet aspell. Pour que l'éditeur "
-"de messages vérifie automatiquement l'orthographe des messages en cours de "
-"rédaction, cochez « Vérifier l'orthographe pendant la frappe »."
-
-#: ../C/evolution.xml:6654(para)
-msgid "The calendar configuration tool has four pages:"
-msgstr "L'outil de configuration du calendrier contient quatre onglets :"
-
-#: ../C/evolution.xml:6660(link) ../C/evolution.xml:6700(title)
+"installer gnome-spell, aspell et un paquet de langue aspell (comme par "
+"exemple aspell-fr pour le français) pour que la correction orthographique "
+"soit disponible dans Evolution. Des dictionnaires supplémentaires sont "
+"disponibles via votre gestionnaire de paquets ; ils sont détectés "
+"automatiquement si vous les avez installés. Pour que l'éditeur de messages "
+"vérifie automatiquement l'orthographe des messages en cours de rédaction, "
+"cochez « Vérifier l'orthographe pendant la frappe ». Vous pouvez définir la "
+"couleur des mots mal orthographiés."
+
+#: ../C/evolution.xml:6618(para)
+msgid "The calendar configuration tool has several pages:"
+msgstr "L'outil de configuration du calendrier contient plusieurs onglets :"
+
+#: ../C/evolution.xml:6624(link) ../C/evolution.xml:6664(title)
 msgid "Display"
 msgstr "Affichage"
 
-#: ../C/evolution.xml:6663(link) ../C/evolution.xml:6733(title)
+#: ../C/evolution.xml:6627(link) ../C/evolution.xml:6697(title)
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../C/evolution.xml:6666(link) ../C/evolution.xml:6746(title)
+#: ../C/evolution.xml:6630(link) ../C/evolution.xml:6710(title)
 msgid "Calendar Publishing"
 msgstr "Publication de calendrier"
 
-#: ../C/evolution.xml:6672(para)
+#: ../C/evolution.xml:6636(para)
 msgid "The General page lets you set the following options:"
 msgstr "L'onglet Général vous permet de définir les options suivantes :"
 
-#: ../C/evolution.xml:6674(title)
+#: ../C/evolution.xml:6638(title)
 msgid "Time Zone:"
 msgstr "Fuseau horaire :"
 
-#: ../C/evolution.xml:6675(para)
+#: ../C/evolution.xml:6639(para)
 msgid "The city you're located in, to specify your time zone."
-msgstr "La ville près de laquelle vous habitez, pour indiquer le fuseau horaire."
+msgstr ""
+"La ville près de laquelle vous habitez, pour indiquer le fuseau horaire."
 
-#: ../C/evolution.xml:6678(title)
+#: ../C/evolution.xml:6642(title)
 msgid "Time Format:"
 msgstr "Format de date :"
 
-#: ../C/evolution.xml:6679(para)
+#: ../C/evolution.xml:6643(para)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Choisissez le format 12 heures (AM/PM) ou 24 heures."
 
-#: ../C/evolution.xml:6682(title)
+#: ../C/evolution.xml:6646(title)
 msgid "Week Starts:"
 msgstr "La semaine débute un :"
 
-#: ../C/evolution.xml:6683(para)
+#: ../C/evolution.xml:6647(para)
 msgid "Select the day to display as the first in each week."
 msgstr "Sélectionnez le premier jour de chaque semaine à afficher."
 
-#: ../C/evolution.xml:6686(title)
+#: ../C/evolution.xml:6650(title)
 msgid "Day Begins:"
 msgstr "La journée débute à :"
 
-#: ../C/evolution.xml:6687(para)
+#: ../C/evolution.xml:6651(para)
 msgid ""
 "For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can "
-"select your preferred hours to make sure that all your events are displayed "
-"properly."
+"select your preferred hours."
 msgstr ""
 "Dans Evolution, une journée de travail normale commence à 9h00 et se termine "
-"à 17h00. Vous pouvez sélectionner vos propres heures pour que tous vos "
-"événements s'affichent correctement."
+"à 17h00. Vous pouvez sélectionner les heures de travail qui vous conviennent."
 
-#: ../C/evolution.xml:6690(title)
+#: ../C/evolution.xml:6654(title)
 msgid "Day Ends:"
 msgstr "La journée se termine à :"
 
-#: ../C/evolution.xml:6691(para)
+#: ../C/evolution.xml:6655(para)
 msgid "Sets the end of a normal workday."
 msgstr "Définit la fin d'une journée de travail normale."
 
-#: ../C/evolution.xml:6695(para)
+#: ../C/evolution.xml:6659(para)
 msgid ""
 "If you want to be warned before you delete any appointment, or to have a "
 "reminder automatically appear for each event, select the options here."
@@ -14128,7 +13887,7 @@ msgstr ""
 "rendez-vous ou un rappel automatique pour chaque événement, sélectionnez les "
 "options correspondantes ici."
 
-#: ../C/evolution.xml:6701(para)
+#: ../C/evolution.xml:6665(para)
 msgid ""
 "The Display page lets you choose how your appointments and tasks appear in "
 "your calendar."
@@ -14136,11 +13895,11 @@ msgstr ""
 "L'onglet Affichage permet de définir la manière dont les rendez-vous et les "
 "tâches apparaissent dans le calendrier."
 
-#: ../C/evolution.xml:6703(title)
+#: ../C/evolution.xml:6667(title)
 msgid "Time Divisions:"
 msgstr "Divisions horaires :"
 
-#: ../C/evolution.xml:6704(para)
+#: ../C/evolution.xml:6668(para)
 msgid ""
 "Sets the time increments shown as fine lines on the daily view in the "
 "calendar."
@@ -14148,13 +13907,13 @@ msgstr ""
 "Définit les incréments horaires signalés par de fines lignes dans la vue "
 "journalière du calendrier."
 
-#: ../C/evolution.xml:6707(title)
+#: ../C/evolution.xml:6671(title)
 msgid "Show appointment end times in week and month views:"
 msgstr ""
 "Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
 "hebdomadaires :"
 
-#: ../C/evolution.xml:6708(para)
+#: ../C/evolution.xml:6672(para)
 msgid ""
 "If there is space, Evolution shows the end times in the week and month views "
 "for each appointment."
@@ -14162,11 +13921,11 @@ msgstr ""
 "Si l'espace le permet, Evolution affiche l'heure de fin de chaque rendez-"
 "vous dans les vues hebdomadaires et mensuelles."
 
-#: ../C/evolution.xml:6711(title)
+#: ../C/evolution.xml:6675(title)
 msgid "Compress weekends in month view:"
 msgstr "Compresser les week-ends dans la vue mensuelle :"
 
-#: ../C/evolution.xml:6712(para)
+#: ../C/evolution.xml:6676(para)
 msgid ""
 "Select this option to display weekends in one box instead of two in the "
 "month view."
@@ -14174,35 +13933,35 @@ msgstr ""
 "Sélectionnez cette option pour afficher les week-ends dans une seule zone au "
 "lieu de deux dans la vue mensuelle."
 
-#: ../C/evolution.xml:6715(title)
+#: ../C/evolution.xml:6679(title)
 msgid "Show week numbers in date navigator:"
 msgstr "Afficher les numéros de semaine dans le navigateur de dates :"
 
-#: ../C/evolution.xml:6716(para)
+#: ../C/evolution.xml:6680(para)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr "Affiche le numéro de chaque semaine dans le calendrier."
 
-#: ../C/evolution.xml:6719(title)
+#: ../C/evolution.xml:6683(title)
 msgid "Tasks due today:"
 msgstr "Tâches d'aujourd'hui :"
 
-#: ../C/evolution.xml:6720(para)
+#: ../C/evolution.xml:6684(para)
 msgid "Select the color for tasks due today."
 msgstr "Sélectionnez la couleur des tâches du jour."
 
-#: ../C/evolution.xml:6723(title)
+#: ../C/evolution.xml:6687(title)
 msgid "Overdue tasks:"
 msgstr "Tâches en retard :"
 
-#: ../C/evolution.xml:6724(para)
+#: ../C/evolution.xml:6688(para)
 msgid "Select the color for overdue tasks."
 msgstr "Sélectionnez la couleur des tâches échues."
 
-#: ../C/evolution.xml:6727(title)
+#: ../C/evolution.xml:6691(title)
 msgid "Hide completed tasks after:"
 msgstr "Masquer les tâches effectuées après :"
 
-#: ../C/evolution.xml:6728(para)
+#: ../C/evolution.xml:6692(para)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you don't select this option, "
@@ -14213,11 +13972,11 @@ msgstr ""
 "terminées restent dans la liste des tâches et sont signalées comme étant "
 "terminées."
 
-#: ../C/evolution.xml:6735(title)
+#: ../C/evolution.xml:6699(title)
 msgid "Select the Calendars for Alarm Notification:"
 msgstr "Sélectionnez les calendriers pour les notifications d'alarme :"
 
-#: ../C/evolution.xml:6736(para)
+#: ../C/evolution.xml:6700(para)
 msgid ""
 "Select the calendars for which you want an alarm notification. If you don't "
 "select the calendar, you will not have an alarm notification for any event "
@@ -14227,23 +13986,15 @@ msgstr ""
 "d'alarme. Si un calendrier n'est pas sélectionné, vous ne recevrez aucune "
 "notification d'alarme pour les événements de ce calendrier."
 
-#: ../C/evolution.xml:6741(title)
+#: ../C/evolution.xml:6705(title)
 msgid "Free/Busy"
 msgstr "Libre/Occupé"
 
-#: ../C/evolution.xml:6742(para)
-msgid ""
-"Allows you to specify a template to use while posting your Free/Buy "
-"information to a server."
-msgstr ""
-"Permet d'indiquer un modèle à utiliser lors de l'envoi des informations de "
-"disponibilité à un serveur."
-
-#: ../C/evolution.xml:6748(title)
+#: ../C/evolution.xml:6712(title)
 msgid "Publishing:"
 msgstr "Publication :"
 
-#: ../C/evolution.xml:6749(para)
+#: ../C/evolution.xml:6713(para)
 msgid ""
 "Allows you to select a URL to post your calendar information to. When you "
 "add a URL, you can specify the publishing location, the frequency of "
@@ -14254,7 +14005,7 @@ msgstr ""
 "publication, la fréquence de publication, quel calendrier publier et sous "
 "quel utilisateur s'authentifier."
 
-#: ../C/evolution.xml:6756(para)
+#: ../C/evolution.xml:6720(para)
 msgid ""
 "Evolution allows you to add certificates for yourself as well as for "
 "contacts. This allows you to communicate with others securely over an "
@@ -14267,25 +14018,24 @@ msgstr ""
 "votre identité auprès d'un contact. Ces paramètres s'appliquent uniquement "
 "au chiffrement S/MIME."
 
-#: ../C/evolution.xml:6758(title)
+#: ../C/evolution.xml:6722(title)
 msgid "Your Certificates:"
 msgstr "Vos certificats :"
 
-#: ../C/evolution.xml:6759(para)
+#: ../C/evolution.xml:6723(para)
 msgid ""
 "Click the Your Certificates tab to display a list of certificates that you "
-"own. You can import, view, back up and delete your certificates from this "
-"page."
+"own. You can import, view and delete your certificates from this page."
 msgstr ""
 "Cliquez sur l'onglet Vos certificats pour afficher votre liste de "
-"certificats. Vous pouvez importer, afficher, sauvegarder et supprimer vos "
-"certificats dans cet onglet."
+"certificats. Vous pouvez importer, afficher et supprimer vos certificats "
+"dans cet onglet."
 
-#: ../C/evolution.xml:6762(title)
+#: ../C/evolution.xml:6726(title)
 msgid "Contact Certificates:"
 msgstr "Certificats des contacts :"
 
-#: ../C/evolution.xml:6763(para)
+#: ../C/evolution.xml:6727(para)
 msgid ""
 "Click the Contact Certificates tab to display a list of certificates that "
 "you have for contacts. These certificates allow you to decrypt messages as "
@@ -14298,11 +14048,11 @@ msgstr ""
 "Vous pouvez importer, afficher, modifier et supprimer les certificats des "
 "contacts dans cet onglet."
 
-#: ../C/evolution.xml:6766(title)
+#: ../C/evolution.xml:6730(title)
 msgid "Authorities:"
 msgstr "Autorités :"
 
-#: ../C/evolution.xml:6767(para)
+#: ../C/evolution.xml:6731(para)
 msgid ""
 "Click the Authorities tab to display a list of trusted certificate "
 "authorities who verify that the certificate you have is valid. You can "
@@ -14313,71 +14063,71 @@ msgstr ""
 "pouvez importer, afficher, modifier et supprimer les autorités de "
 "certification dans cet onglet."
 
-#: ../C/evolution.xml:6773(para)
+#: ../C/evolution.xml:6737(para)
 msgid "There are two main tasks for configuring contact information:"
 msgstr ""
 "Il existe deux tâches principales pour configurer les informations de "
 "contacts :"
 
-#: ../C/evolution.xml:6776(link) ../C/evolution.xml:6784(title)
+#: ../C/evolution.xml:6740(link) ../C/evolution.xml:6748(title)
 msgid "Creating a Contact"
 msgstr "Création d'un contact"
 
-#: ../C/evolution.xml:6779(link) ../C/evolution.xml:6806(title)
+#: ../C/evolution.xml:6743(link) ../C/evolution.xml:6770(title)
 msgid "Creating an Address Book"
 msgstr "Création d'un carnet d'adresses"
 
-#: ../C/evolution.xml:6785(para)
+#: ../C/evolution.xml:6749(para)
 msgid "To add a new contact list, either local or remote:"
 msgstr ""
 "Pour ajouter une nouvelle liste de contacts, qu'elle soit locale ou "
 "distante :"
 
-#: ../C/evolution.xml:6788(para)
+#: ../C/evolution.xml:6752(para)
 msgid "Click Contacts in the Switcher."
 msgstr "Cliquez sur Contacts dans le sélecteur."
 
-#: ../C/evolution.xml:6791(para)
+#: ../C/evolution.xml:6755(para)
 msgid "Click the down-arrow next to New."
 msgstr "Cliquez sur la flèche à droite du bouton Nouveau."
 
-#: ../C/evolution.xml:6794(para)
+#: ../C/evolution.xml:6758(para)
 msgid "Select Contact List."
 msgstr "Choisissez Liste de contacts."
 
-#: ../C/evolution.xml:6797(para)
+#: ../C/evolution.xml:6761(para)
 msgid "Type a name and location for the Address Book."
 msgstr "Saisissez un nom et un emplacement pour le carnet d'adresses."
 
-#: ../C/evolution.xml:6809(para)
+#: ../C/evolution.xml:6773(para)
 msgid "Click File &gt; New &gt; Address Book."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Carnet d'adresses."
 
-#: ../C/evolution.xml:6812(para)
+#: ../C/evolution.xml:6776(para)
 msgid "Select the type of Address Book."
 msgstr "Sélectionnez le type de carnet d'adresses."
 
-#: ../C/evolution.xml:6814(title)
+#: ../C/evolution.xml:6778(title)
 msgid "On This Computer:"
 msgstr "Sur cet ordinateur :"
 
-#: ../C/evolution.xml:6815(para)
+#: ../C/evolution.xml:6779(para)
 msgid "Creates a local address book on the computer."
 msgstr "Crée un carnet d'adresses local sur votre ordinateur."
 
-#: ../C/evolution.xml:6818(title)
+#: ../C/evolution.xml:6782(title)
 msgid "On LDAP Server:"
 msgstr "Sur un serveur LDAP :"
 
-#: ../C/evolution.xml:6819(para)
+#: ../C/evolution.xml:6783(para)
 msgid "Creates an address book on the LDAP server."
 msgstr "Crée un carnet d'adresses sur un serveur LDAP."
 
-#: ../C/evolution.xml:6822(title)
+#: ../C/evolution.xml:6786(title)
 msgid "Specific Account:"
 msgstr "Compte spécifique :"
 
-#: ../C/evolution.xml:6823(para)
+#: ../C/evolution.xml:6787(para)
 msgid ""
 "If you have an account that allows you to create an address book on that "
 "server, you can select that account."
@@ -14385,52 +14135,52 @@ msgstr ""
 "Si vous disposez d'un compte permettant la création d'un carnet d'adresses "
 "sur ce serveur, vous pouvez sélectionner ce compte."
 
-#: ../C/evolution.xml:6827(para)
+#: ../C/evolution.xml:6791(para)
 msgid ""
-"If you selected On This Computer, specify the name of the computer, and "
+"If you selected On This Computer, specify the name of the address book, and "
 "choose whether you want to the new address book as your default folder."
 msgstr ""
-"Si vous avez choisi « Sur cet ordinateur », indiquez le nom de l'ordinateur "
-"et indiquez si vous souhaitez que le nouveau carnet d'adresses soit votre "
-"dossier par défaut."
+"Si vous avez choisi « Sur cet ordinateur », indiquez le nom du carnet "
+"d'adresses et indiquez si vous souhaitez que le nouveau carnet d'adresses "
+"soit votre dossier par défaut."
 
-#: ../C/evolution.xml:6829(para)
+#: ../C/evolution.xml:6793(para)
 msgid ""
-"If you are creating an <link linkend=\"ldap\">LDAP</link> server, enter the "
-"server information as requested by the assistant:"
+"If you are creating an address book on an <link linkend=\"ldap\">LDAP</link> "
+"server, enter the server information as requested by the assistant:"
 msgstr ""
-"Si vous le créez sur un serveur <link linkend=\"ldap\">LDAP</link>, "
-"saisissez les informations du serveur selon ce qui est demandé par "
-"l'assistant :"
+"Si vous créez un carnet d'adresses sur un serveur <link linkend=\"ldap"
+"\">LDAP</link>, saisissez les informations du serveur selon ce qui est "
+"demandé par l'assistant :"
 
-#: ../C/evolution.xml:6831(title)
+#: ../C/evolution.xml:6795(title)
 msgid "Server Name:"
 msgstr "Nom du serveur :"
 
-#: ../C/evolution.xml:6832(para)
+#: ../C/evolution.xml:6796(para)
 msgid "The Internet address of the contact server you are using."
 msgstr "L'adresse Internet du serveur de contacts que vous utilisez."
 
-#: ../C/evolution.xml:6835(title)
+#: ../C/evolution.xml:6799(title)
 msgid "Login Method:"
 msgstr "Méthode d'identification :"
 
-#: ../C/evolution.xml:6836(para)
+#: ../C/evolution.xml:6800(para)
 msgid ""
-"Specify whether your login is anonymous, uses an e-mail address, or uses a "
-"distinguished name. If the login is not anonymous, specify the e-mail "
-"address or distinguished name (DN) required by the server."
+"Specify whether your login is anonymous, uses an email address, or uses a "
+"distinguished name. If the login is not anonymous, specify the email address "
+"or distinguished name (DN) required by the server."
 msgstr ""
 "Indiquez si votre connexion est anonyme, si elle utilise une adresse "
 "électronique ou un nom distinctif. Si la connexion n'est pas anonyme, "
 "indiquez l'adresse électronique ou le nom distinctif (DN) requis par le "
 "serveur."
 
-#: ../C/evolution.xml:6839(title)
+#: ../C/evolution.xml:6803(title)
 msgid "Port:"
 msgstr "Port :"
 
-#: ../C/evolution.xml:6840(para)
+#: ../C/evolution.xml:6804(para)
 msgid ""
 "The Internet port Evolution connects to in order to access the LDAP "
 "database. This is normally 389."
@@ -14438,28 +14188,26 @@ msgstr ""
 "Le port Internet auquel Evolution doit se connecter pour pouvoir accéder à "
 "la base de données LDAP. Normalement, c'est le port 389."
 
-#: ../C/evolution.xml:6843(title)
+#: ../C/evolution.xml:6807(title)
 msgid "Use SSL/TLS:"
 msgstr "Utiliser une connexion sécurisée :"
 
-#: ../C/evolution.xml:6844(para)
+#: ../C/evolution.xml:6808(para)
 msgid ""
-"SSL and TLS are security mechanisms. If you select Always, Evolution does "
-"not connect unless secure connections are available. The default value is "
-"Whenever Possible, which uses secure connections if they are available, but "
-"does not cause failure if they are not."
+"SSL and TLS are security mechanisms. If you select No Encryption, Evolution "
+"will send your password unencrypted. By using SSL or TLS, a secure "
+"connection will be used and your password will be sent encrypted."
 msgstr ""
-"SSL et TLS sont des mécanismes de sécurité. Si vous sélectionnez Toujours, "
-"Evolution ne se connecte pas si la connexion n'est pas sécurisée. La valeur "
-"par défaut est « Lorsque c'est possible ». Elle utilise des connexions "
-"sécurisées s'il en existe, mais ne provoque pas un échec de connexion s'il "
-"n'en existe pas."
+"SSL et TLS sont des mécanismes de sécurité. Si vous choisissez « Pas de "
+"chiffrement », Evolution envoie votre mot de passe sans le chiffrer. En "
+"utilisant SSL ou TLS, une connexion sécurisée est établie et votre mot de "
+"passe sera envoyé de façon chiffrée."
 
-#: ../C/evolution.xml:6847(title)
+#: ../C/evolution.xml:6811(title)
 msgid "Details: Search Base:"
 msgstr "Détails : Base de recherche :"
 
-#: ../C/evolution.xml:6848(para)
+#: ../C/evolution.xml:6812(para)
 msgid ""
 "The <link linkend=\"search-base\">search base</link> is the starting point "
 "for a directory search. Contact your network administrator for information "
@@ -14469,11 +14217,11 @@ msgstr ""
 "point de départ d'une recherche d'annuaire. Pour plus d'informations sur les "
 "paramètres appropriés, contactez l'administrateur système."
 
-#: ../C/evolution.xml:6851(title)
+#: ../C/evolution.xml:6815(title)
 msgid "Search Scope:"
 msgstr "Domaine de recherche :"
 
-#: ../C/evolution.xml:6852(para)
+#: ../C/evolution.xml:6816(para)
 msgid ""
 "The <link linkend=\"search-scope\">search scope</link> is the breadth of a "
 "given search. The following options are available:"
@@ -14481,31 +14229,31 @@ msgstr ""
 "Le <link linkend=\"search-scope\">domaine de recherche</link> correspond à "
 "l'étendue d'une recherche. Vous disposez des options suivantes :"
 
-#: ../C/evolution.xml:6857(title)
+#: ../C/evolution.xml:6821(title)
 msgid "One:"
 msgstr "Un :"
 
-#: ../C/evolution.xml:6858(para)
+#: ../C/evolution.xml:6822(para)
 msgid "Searches the Search Base and one entry below it."
 msgstr ""
 "Effectue une recherche dans la base de recherche et dans un niveau "
 "hiérarchique au-dessous."
 
-#: ../C/evolution.xml:6863(title)
+#: ../C/evolution.xml:6827(title)
 msgid "Sub:"
 msgstr "Sous :"
 
-#: ../C/evolution.xml:6864(para)
+#: ../C/evolution.xml:6828(para)
 msgid "Searches the Search Base and all entries below it."
 msgstr ""
 "Effectue une recherche dans la base de recherche et dans tous les niveaux "
 "hiérarchiques."
 
-#: ../C/evolution.xml:6869(title)
+#: ../C/evolution.xml:6833(title)
 msgid "Timeout (minutes):"
 msgstr "Délai (minutes) :"
 
-#: ../C/evolution.xml:6870(para)
+#: ../C/evolution.xml:6834(para)
 msgid ""
 "The maximum time Evolution attempts to download data from the server before "
 "giving up."
@@ -14513,11 +14261,11 @@ msgstr ""
 "Délai maximum au cours duquel Evolution tente de télécharger les données du "
 "serveur avant d'abandonner le téléchargement."
 
-#: ../C/evolution.xml:6875(title)
+#: ../C/evolution.xml:6839(title)
 msgid "Download Limit:"
 msgstr "Limite de téléchargement :"
 
-#: ../C/evolution.xml:6876(para)
+#: ../C/evolution.xml:6840(para)
 msgid ""
 "The maximum number of results for a given search. Most servers refuse to "
 "send more than 500, but you can set the number lower if you want to shorten "
@@ -14528,43 +14276,42 @@ msgstr ""
 "une valeur inférieure pour raccourcir les téléchargements dans le cas de "
 "recherches très larges."
 
-#: ../C/evolution.xml:6881(title)
+#: ../C/evolution.xml:6845(title)
 msgid "Display Name:"
 msgstr "Nom d'affichage :"
 
-#: ../C/evolution.xml:6882(para)
+#: ../C/evolution.xml:6846(para)
 msgid ""
 "The name you want to use as a label for this folder. It can be any name you "
 "choose."
 msgstr "Nom à attribuer à ce dossier. Vous pouvez définir n'importe quel nom."
 
-#: ../C/evolution.xml:6887(title)
+#: ../C/evolution.xml:6851(title)
 msgid "Search Filter:"
 msgstr "Filtre de recherche :"
 
-#: ../C/evolution.xml:6888(para)
-msgid "The search filter can be set here for all the LDAP queries. For example:"
+#: ../C/evolution.xml:6852(para)
+msgid ""
+"The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 "Le filtre de recherche peut être défini ici pour toutes les requêtes LDAP. "
 "Par exemple :"
 
-#: ../C/evolution.xml:6890(para)
+#: ../C/evolution.xml:6854(para)
 msgid ""
 "ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists "
-"only the user objects.Filter (|(ObjectClass=User)"
-"(ObjectClass=groupOfNames)): Retrieves the User and Contact List objects."
-"(&amp;(mail=*)(ObjectClass=*)): Lists the objects associated with the e-mail "
-"addresses."
+"only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): "
+"Retrieves the User and Contact List objects.(&amp;(mail=*)(ObjectClass=*)): "
+"Lists the objects associated with the email addresses."
 msgstr ""
 "ObjectClass=* : liste tous les objets du serveur.\n"
-"ObjectClass=User : liste uniquement les objets représentant des "
-"utilisateurs.\n"
-"Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)) : récupère les "
-"objets représentant des utilisateurs et des listes de contacts.\n"
+"ObjectClass=User : liste uniquement les utilisateurs.\n"
+"Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)) : récupère les objets "
+"représentant des utilisateurs et des listes de contacts.\n"
 "(&amp;(mail=*)(ObjectClass=*)): liste les objets associés avec ces adresses "
 "électroniques."
 
-#: ../C/evolution.xml:6892(para)
+#: ../C/evolution.xml:6856(para)
 msgid ""
 "If you change any LDAP address book configurations, Evolution and the "
 "Evolution Data Server need to be restarted in order to see the changes."
@@ -14573,7 +14320,7 @@ msgstr ""
 "Evolution Data Server doivent être redémarrés pour que les modifications "
 "s'appliquent."
 
-#: ../C/evolution.xml:6895(para)
+#: ../C/evolution.xml:6859(para)
 msgid ""
 "If you are creating the address book for a specific account, type the name "
 "of the address book if you want the address book stored locally when "
@@ -14583,67 +14330,77 @@ msgstr ""
 "nom du carnet d'adresses si vous voulez que celui-ci soit stocké localement "
 "en mode hors ligne et qu'il devienne votre carnet d'adresses par défaut."
 
-#: ../C/evolution.xml:6906(para)
+#: ../C/evolution.xml:6870(para)
 msgid ""
 "Evolution allows you to view the error logs and set the display duration for "
-"the error message in the statusbar. When an error occurs, statusbar display "
-"the error message for the specified duration and then it is moved to the "
-"debug file."
-msgstr "Evolution vous permet de visualiser les journaux d'erreurs et de définir la durée d'affichage du message d'erreur dans la barre d'état. Lorsqu'une erreur se produit, le message de l'erreur apparaît dans la barre d'état pendant un certain temps, puis il est placé dans le journal de débogage."
+"the error messages that appear in the statusbar. When an error occurs, "
+"statusbar displays the error message for the specified time, then it is "
+"moved to the debug file."
+msgstr ""
+"Evolution vous permet de visualiser les journaux d'erreurs et de définir la "
+"durée d'affichage du message d'erreur dans la barre d'état. Lorsqu'une "
+"erreur se produit, le message de l'erreur apparaît dans la barre d'état "
+"pendant le temps défini, puis il est placé dans le journal de débogage."
 
-#: ../C/evolution.xml:6909(para)
-msgid "From Help menu, select Debug Logs."
+#: ../C/evolution.xml:6873(para)
+msgid "From the Help menu, select Debug Logs."
 msgstr "Dans le menu Aide, choisissez Journaux de débogage."
 
-#: ../C/evolution.xml:6913(para)
+#: ../C/evolution.xml:6877(para)
 msgid "Specify the display duration for the error messages."
 msgstr "Indiquez la durée d'affichage des messages d'erreur."
 
-#: ../C/evolution.xml:6914(para)
+#: ../C/evolution.xml:6878(para)
 msgid "The messages remain in the statusbar for this specified time."
-msgstr "Les messages restent affichés dans la barre d'état durant l'intervalle de temps indiqué."
+msgstr ""
+"Les messages restent affichés dans la barre d'état durant l'intervalle de "
+"temps indiqué."
 
-#: ../C/evolution.xml:6918(para)
+#: ../C/evolution.xml:6882(para)
 msgid ""
 "The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
-"> icon indicates that the error message displayed is a warning. The "
-"<inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> icon "
-"is displayed with a &ldquo;for-your-information&rdquo; message."
-msgstr "L'icône <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/> indique que le message d'erreur affiché est un avertissement. L'icône <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> est utilisée lorsque le message apparaît à titre informatif."
+"> icon indicates that the error message is a warning. The <inlinegraphic "
+"format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> icon indicates an "
+"informational message."
+msgstr ""
+"L'icône <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning."
+"png\"/> indique que le message d'erreur affiché est un avertissement. "
+"L'icône <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png"
+"\"/> indique que le message apparaît à titre informatif."
 
-#: ../C/evolution.xml:6925(para)
+#: ../C/evolution.xml:6889(para)
 msgid ""
 "Synchronization presents you with three issues you need to address. First, "
 "you need to enable synchronization. Second, your computer needs to recognize "
-"and access your handheld. At this time, Evolution™ only supports Palm OS "
-"devices like the PalmPilot* and the Handspring Visor. Third, you should "
-"decide what sort of synchronization behavior you want."
+"and access your handheld. At this time, <trademark>Evolution</trademark> "
+"only supports Palm OS devices like the PalmPilot* and the Handspring Visor. "
+"Third, you should decide what sort of synchronization behavior you want."
 msgstr ""
 "La synchronisation pose trois problèmes que vous devez résoudre. Tout "
 "d'abord, vous devez activer la synchronisation. Deuxièmement, votre "
 "ordinateur doit reconnaître le périphérique et pouvoir y accéder. "
-"Actuellement, Evolution ne prend en charge que les périphériques Palm "
-"OS tels que PalmPilot* et Handspring Visor. Ensuite, vous devez définir le "
-"type de synchronisation à utiliser."
+"Actuellement, <trademark>Evolution</trademark> ne prend en charge que les "
+"périphériques Palm OS tels que PalmPilot* et Handspring Visor. Ensuite, vous "
+"devez définir le type de synchronisation à utiliser."
 
-#: ../C/evolution.xml:6928(link) ../C/evolution.xml:6939(title)
+#: ../C/evolution.xml:6892(link) ../C/evolution.xml:6903(title)
 msgid "Enabling Synchronization"
 msgstr "Activation de la synchronisation"
 
-#: ../C/evolution.xml:6931(link) ../C/evolution.xml:6944(title)
+#: ../C/evolution.xml:6895(link) ../C/evolution.xml:6908(title)
 msgid "Selecting Conduits"
 msgstr "Sélection des canaux"
 
-#: ../C/evolution.xml:6934(link) ../C/evolution.xml:6967(title)
+#: ../C/evolution.xml:6898(link) ../C/evolution.xml:6931(title)
 msgid "Synchronizing Information"
 msgstr "Informations de synchronisation"
 
-#: ../C/evolution.xml:6940(para)
+#: ../C/evolution.xml:6904(para)
 msgid ""
 "If you haven't used a handheld device with your computer before, you need to "
 "run the GNOME Control Center by clicking System &gt; Settings, and make sure "
 "that Pilot Link is properly configured. Make sure that you have read and "
-"write permissions on the device, which is normally n /dev/pilot. If that "
+"write permissions on the device, which is normally in /dev/pilot. If that "
 "does not work, check in /dev/ttyS0 if you have a serial connection, or in /"
 "dev/ttyUSB1 for a USB connection. You can do this by becoming root and "
 "adding your username to the group that owns this device node. For a USB "
@@ -14662,7 +14419,7 @@ msgstr ""
 "synchronisation par USB, deux noeuds sont créés, ttyUSB0 et ttyUSB1. Le "
 "second noeud est celui qui sera utilisé pour configurer le périphérique."
 
-#: ../C/evolution.xml:6945(para)
+#: ../C/evolution.xml:6909(para)
 msgid ""
 "After your computer and your Palm OS device are communicating, select the "
 "<link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits "
@@ -14679,7 +14436,7 @@ msgstr ""
 "de votre carnet d'adresses, ECalendar pour votre calendrier et ETodo pour "
 "votre liste de tâches."
 
-#: ../C/evolution.xml:6946(para)
+#: ../C/evolution.xml:6910(para)
 msgid ""
 "Click Enable, then click Settings to change what the conduit does when "
 "activated. Your options can vary depending on the conduit, but typically "
@@ -14689,19 +14446,19 @@ msgstr ""
 "canal lorsqu'il est activé. Les options varient en fonction du canal, mais "
 "en règle générale, vous disposez des options suivantes :"
 
-#: ../C/evolution.xml:6948(title)
+#: ../C/evolution.xml:6912(title)
 msgid "Disabled:"
 msgstr "Désactivé :"
 
-#: ../C/evolution.xml:6949(para)
+#: ../C/evolution.xml:6913(para)
 msgid "Do nothing."
 msgstr "Aucune action."
 
-#: ../C/evolution.xml:6952(title)
+#: ../C/evolution.xml:6916(title)
 msgid "Synchronize:"
 msgstr "Synchroniser :"
 
-#: ../C/evolution.xml:6953(para)
+#: ../C/evolution.xml:6917(para)
 msgid ""
 "Copy new data from the computer to the handheld, and from the handheld to "
 "the computer. Remove items that were on both systems but have been deleted "
@@ -14711,25 +14468,27 @@ msgstr ""
 "versa. Supprime les éléments qui figuraient sur les deux systèmes et qui ont "
 "été supprimés de l'un des deux."
 
-#: ../C/evolution.xml:6956(title)
+#: ../C/evolution.xml:6920(title)
 msgid "Copy From Pilot:"
 msgstr "Copier depuis Pilot :"
 
-#: ../C/evolution.xml:6957(para)
-msgid "If there is any new data on the handheld device, copy it to the computer."
+#: ../C/evolution.xml:6921(para)
+msgid ""
+"If there is any new data on the handheld device, copy it to the computer."
 msgstr ""
 "Si le périphérique portable contient de nouvelles données, cette option les "
 "copie vers l'ordinateur."
 
-#: ../C/evolution.xml:6960(title)
+#: ../C/evolution.xml:6924(title)
 msgid "Copy To Pilot:"
 msgstr "Copier vers Pilot :"
 
-#: ../C/evolution.xml:6961(para)
+#: ../C/evolution.xml:6925(para)
 msgid "Copy new data from the computer to the handheld."
-msgstr "Copie les nouvelles données de l'ordinateur vers le périphérique portable."
+msgstr ""
+"Copie les nouvelles données de l'ordinateur vers le périphérique portable."
 
-#: ../C/evolution.xml:6963(para)
+#: ../C/evolution.xml:6927(para)
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
 "not sure, use Synchronize."
@@ -14737,7 +14496,7 @@ msgstr ""
 "Sélectionnez le comportement de chacun des canaux à utiliser. Si vous ne "
 "savez pas, utilisez Synchroniser."
 
-#: ../C/evolution.xml:6968(para)
+#: ../C/evolution.xml:6932(para)
 msgid ""
 "Use the following procedure to synchronize the data on your Palm OS device "
 "with the data you store in Evolution."
@@ -14745,22 +14504,22 @@ msgstr ""
 "Procédez comme suit pour synchroniser les données sur le périphérique Palm "
 "OS et les données que vous stockez dans Evolution."
 
-#: ../C/evolution.xml:6969(para)
+#: ../C/evolution.xml:6933(para)
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
-"the <command>evolution</command> directory inside your home directory."
+"the <command>.evolution</command> directory inside your home directory."
 msgstr ""
 "Si vous voulez sauvegarder les informations avant la synchronisation, faites "
-"une copie du répertoire <command>evolution</command> dans votre dossier "
+"une copie du répertoire <command>.evolution</command> dans votre dossier "
 "personnel."
 
-#: ../C/evolution.xml:6972(para)
+#: ../C/evolution.xml:6936(para)
 msgid "Put your handheld device in its cradle and press the HotSync button."
 msgstr ""
 "Placez le périphérique sur sa station d'accueil et appuyez sur le bouton "
 "HotSync."
 
-#: ../C/evolution.xml:6973(para)
+#: ../C/evolution.xml:6937(para)
 msgid ""
 "If you use Palm OS v. 4.0 and have password protection turned on for your "
 "handheld device, you might encounter trouble synchronizing. If this happens, "
@@ -14773,7 +14532,7 @@ msgstr ""
 "peuvent se produire. Dans ce cas, désactivez-la, synchronisez le "
 "périphérique et votre ordinateur, puis réactivez-la."
 
-#: ../C/evolution.xml:6976(para)
+#: ../C/evolution.xml:6940(para)
 msgid ""
 "If you have followed the setup instructions properly, your Palm OS device "
 "will synchronize data with Evolution."
@@ -14781,19 +14540,19 @@ msgstr ""
 "Si vous avez suivi les instructions de configuration, votre périphérique "
 "Palm OS et Evolution se synchronisent."
 
-#: ../C/evolution.xml:6982(para)
+#: ../C/evolution.xml:6946(para)
 msgid ""
 "If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
-"helps you switch to Evolution™."
+"helps you switch to <trademark>Evolution</trademark>."
 msgstr ""
 "Si vous utilisez Microsoft Outlook, mais pas Microsoft Exchange, cette "
-"section vous explique comment migrer vers Evolution."
+"section vous explique comment migrer vers <trademark>Evolution</trademark>."
 
-#: ../C/evolution.xml:6985(title)
+#: ../C/evolution.xml:6949(title)
 msgid "Migrating Local Outlook Mail Folders"
 msgstr "Migration des dossiers locaux de la messagerie Outlook"
 
-#: ../C/evolution.xml:6986(para)
+#: ../C/evolution.xml:6950(para)
 msgid ""
 "Exchange and IMAP mail is stored on the server, so you do not need to "
 "migrate it to your Linux* partition. However, if you have stored mail on "
@@ -14804,11 +14563,11 @@ msgstr ""
 "messages sont stockés sur votre ordinateur, vous pouvez permettre à "
 "Evolution d'y accéder."
 
-#: ../C/evolution.xml:6987(para)
+#: ../C/evolution.xml:6951(para)
 msgid "First, while using Windows, prepare your messages for import:"
 msgstr "Tout d'abord, dans Windows, préparez l'importation des messages :"
 
-#: ../C/evolution.xml:6990(para)
+#: ../C/evolution.xml:6954(para)
 msgid ""
 "Clean up your mail. Delete messages and folders you do not need, and click "
 "File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, "
@@ -14818,7 +14577,7 @@ msgstr ""
 "choisissez Fichier &gt; Dossiers &gt; Propriétés &gt; Avancée &gt; "
 "Compresser pour effacer les anciens messages supprimés de votre fichier PST."
 
-#: ../C/evolution.xml:6993(para)
+#: ../C/evolution.xml:6957(para)
 msgid ""
 "If you nest your folders one inside another, you might want to rename "
 "subfolders so that you can tell which folder they belong to. You must re-"
@@ -14828,7 +14587,7 @@ msgstr ""
 "quel dossier ils appartiennent. Vous devez les imbriquer de nouveau après "
 "les avoir chargés sur Evolution."
 
-#: ../C/evolution.xml:6996(para)
+#: ../C/evolution.xml:6960(para)
 msgid ""
 "Import the files into Mozilla Mail (or another mailer, such as Netscape or "
 "Eudora, that uses the standard mbox format)."
@@ -14836,7 +14595,7 @@ msgstr ""
 "Importez les fichiers vers la messagerie Mozilla (ou un autre programme de "
 "messagerie tel que Netscape ou Eudora qui utilise le format mbox standard)."
 
-#: ../C/evolution.xml:6997(para)
+#: ../C/evolution.xml:6961(para)
 msgid ""
 "Linux mailers cannot do this task, because it requires a library available "
 "only under Windows. In Mozilla, import by selecting Window Mail &amp; "
@@ -14846,7 +14605,7 @@ msgstr ""
 "dernière nécessite une bibliothèque disponible uniquement dans Windows. Dans "
 "Mozilla, importez les données en choisissant le menu Outils &gt; Importer."
 
-#: ../C/evolution.xml:7000(para)
+#: ../C/evolution.xml:6964(para)
 msgid ""
 "Mozilla creates a set of files in the directory<command> Windows"
 "\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail"
@@ -14858,19 +14617,19 @@ msgstr ""
 "\\Mail\\Local Folders\\OutlookMail\\</command>. Les fichiers de données sont "
 "ceux qui ne portent pas d'extension."
 
-#: ../C/evolution.xml:7001(para)
+#: ../C/evolution.xml:6965(para)
 msgid ""
-"If you are using Windows XP or Windows 2000, your Windows hard drive is "
-"probably in the NTFS format, which some Linux systems cannot read without "
-"additional software. You might find it simpler to copy the mail folders to a "
-"different drive or to burn a CD."
+"If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows "
+"hard drive is probably in the NTFS format, which some Linux systems cannot "
+"read without additional software. You might find it simpler to copy the mail "
+"folders to a different drive or to burn a CD."
 msgstr ""
-"Si vous utilisez Windows XP ou Windows 2000, votre disque dur Windows a "
-"probablement le format NTFS que certains systèmes Linux ne peuvent pas lire "
-"sans un logiciel supplémentaire. Il peut être plus aisé de copier les "
-"dossiers de courrier vers un lecteur différent ou de graver un CD."
+"Si vous utilisez Windows Vista*, Windows XP* ou Windows 2000*, votre disque "
+"dur Windows a probablement le format NTFS que certains systèmes Linux ne "
+"peuvent pas lire sans un logiciel supplémentaire. Il peut être plus aisé de "
+"copier les dossiers de courrier vers un lecteur différent ou de graver un CD."
 
-#: ../C/evolution.xml:7002(para)
+#: ../C/evolution.xml:6966(para)
 msgid ""
 "When you have your mail in a format Evolution can understand, reboot to "
 "Linux. Then continue with the following procedure. To create new folders for "
@@ -14880,94 +14639,96 @@ msgstr ""
 "redémarrez Linux, puis utilisez la procédure suivante. Pour créer des "
 "dossiers pour les fichiers :"
 
-#: ../C/evolution.xml:7005(para)
+#: ../C/evolution.xml:6969(para)
 msgid "Mount your Windows drive or the disk where you saved the mail files."
 msgstr ""
 "Montez le lecteur ou le disque Windows sur lequel vous avez sauvegardé les "
 "fichiers de messages."
 
-#: ../C/evolution.xml:7008(para)
-msgid "Copy all the mail files into your home directory or another convenient place."
+#: ../C/evolution.xml:6972(para)
+msgid ""
+"Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 "Copiez tous les fichiers de messages vers votre dossier personnel ou dans un "
 "autre emplacement de votre choix."
 
-#: ../C/evolution.xml:7011(para)
+#: ../C/evolution.xml:6975(para)
 msgid "Start Evolution."
 msgstr "Démarrez Evolution."
 
-#: ../C/evolution.xml:7014(para)
-msgid "Select File &gt; New Folder to create the folders you want."
+#: ../C/evolution.xml:6978(para)
+msgid "Select File &gt; New &gt; Mail Folder to create the folders you want."
 msgstr ""
-"Choisissez Fichier &gt; Nouveau dossier pour créer les dossiers de votre "
-"choix."
+"Choisissez Fichier &gt; Nouveau &gt; Dossier de courriel pour créer les "
+"dossiers de votre choix."
 
-#: ../C/evolution.xml:7017(para)
+#: ../C/evolution.xml:6981(para)
 msgid "To import the data files:"
 msgstr "Pour importer les fichiers de données :"
 
-#: ../C/evolution.xml:7020(para)
-msgid "In Evolution, open the File Import assistant by clicking File &gt; Import."
+#: ../C/evolution.xml:6984(para)
+msgid ""
+"In Evolution, open the File Import assistant by clicking File &gt; Import."
 msgstr ""
 "Dans Evolution, ouvrez l'assistant d'importation de fichiers en cliquant sur "
 "Fichier &gt; Importer."
 
-#: ../C/evolution.xml:7023(para)
-msgid "Click Next, then select Import A Single File."
+#: ../C/evolution.xml:6987(para)
+msgid "Click Next, then select Import a single file."
 msgstr "Cliquez sur Suivant, puis sélectionnez « Importer un seul fichier »."
 
-#: ../C/evolution.xml:7026(para)
-msgid "Leave the file type as Automatic, then click Browse to select the data file."
+#: ../C/evolution.xml:6990(para)
+msgid "Click on the filechooser to select the data file."
 msgstr ""
-"Conservez le type de fichier Automatique, puis cliquez sur Parcourir pour "
-"sélectionner le fichier de données."
+"Cliquez sur le sélecteur de fichier pour sélectionner le fichier de données."
 
-#: ../C/evolution.xml:7027(para)
+#: ../C/evolution.xml:6991(para)
 msgid "Remember, the data files are the files that have no file extension."
 msgstr ""
 "Souvenez-vous que les fichiers de données sont ceux qui ne portent pas "
 "d'extension."
 
-#: ../C/evolution.xml:7030(para)
+#: ../C/evolution.xml:6994(para)
 msgid "Select the folder where you want to put the imported data file."
 msgstr ""
 "Sélectionnez le dossier dans lequel vous voulez placer le fichier de données "
 "importé."
 
-#: ../C/evolution.xml:7036(para)
+#: ../C/evolution.xml:7000(para)
 msgid "Repeat the import steps until you have imported all your mail."
 msgstr ""
 "Effectuez de nouveau les étapes d'importation jusqu'à ce que vous ayez "
 "importé tout les messages."
 
-#: ../C/evolution.xml:7044(para)
+#: ../C/evolution.xml:7008(para)
 msgid ""
 "You can print this section to use it as a quick reference for most of the "
-"things you want to do with Evolution™. You can also find this information by "
-"selecting Help &gt; Quick Reference in the Menubar."
+"things you want to do with <trademark>Evolution</trademark>. You can also "
+"find this information by selecting Help &gt; Quick Reference in the Menubar."
 msgstr ""
 "Vous pouvez imprimer cette section pour vous en servir comme aide-mémoire "
-"pour la plupart des tâches que vous voulez exécuter avec Evolution. "
-"Ces informations se trouvent également dans l'application en choisissant "
-"Aide &gt; Référence rapide dans la barre de menus."
+"pour la plupart des tâches que vous voulez exécuter avec "
+"<trademark>Evolution</trademark>. Ces informations se trouvent également "
+"dans l'application en choisissant Aide &gt; Référence rapide dans la barre "
+"de menus."
 
-#: ../C/evolution.xml:7047(link) ../C/evolution.xml:7061(title)
+#: ../C/evolution.xml:7011(link) ../C/evolution.xml:7025(title)
 msgid "Opening or Creating Items"
 msgstr "Ouverture ou création d'éléments"
 
-#: ../C/evolution.xml:7050(link) ../C/evolution.xml:7086(title)
+#: ../C/evolution.xml:7014(link) ../C/evolution.xml:7050(title)
 msgid "Mail Tasks"
 msgstr "Tâches de messagerie"
 
-#: ../C/evolution.xml:7056(link) ../C/evolution.xml:7136(title)
+#: ../C/evolution.xml:7020(link) ../C/evolution.xml:7100(title)
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../C/evolution.xml:7064(title)
+#: ../C/evolution.xml:7028(title)
 msgid "New Item:"
 msgstr "Nouvel élément :"
 
-#: ../C/evolution.xml:7065(para)
+#: ../C/evolution.xml:7029(para)
 msgid ""
 "Press Ctrl+N to open a new item for whatever part of Evolution you're "
 "working in. In mail, this means you create a new message. If you're looking "
@@ -14980,52 +14741,52 @@ msgstr ""
 "d'adresses, les touches Ctrl+N créent une carte de contact, et si vous vous "
 "trouvez dans le calendrier, cela crée un rendez-vous."
 
-#: ../C/evolution.xml:7068(title)
-msgid "Creating a New E-mail Message:"
+#: ../C/evolution.xml:7032(title)
+msgid "Creating a New Email Message:"
 msgstr "Création d'un message :"
 
-#: ../C/evolution.xml:7069(para)
-msgid "Use File &gt; New &gt; Mail Message or Shift+Ctrl+M."
+#: ../C/evolution.xml:7033(para)
+msgid "Click File &gt; New &gt; Mail Message or Shift+Ctrl+M."
 msgstr ""
-"Utilisez Fichier &gt; Nouveau &gt; Message ou appuyez sur les touches Ctrl"
+"Choisissez Fichier &gt; Nouveau &gt; Message ou appuyez sur les touches Ctrl"
 "+Maj+M."
 
-#: ../C/evolution.xml:7072(title) ../C/evolution.xml:7125(title)
+#: ../C/evolution.xml:7036(title) ../C/evolution.xml:7089(title)
 msgid "Creating a New Appointment:"
 msgstr "Création d'un rendez-vous :"
 
-#: ../C/evolution.xml:7073(para) ../C/evolution.xml:7126(para)
-msgid "Use File &gt; New Appointment or Shift+Ctrl+A."
+#: ../C/evolution.xml:7037(para) ../C/evolution.xml:7090(para)
+msgid "Click File &gt; New &gt; Appointment or Shift+Ctrl+A."
 msgstr ""
-"Choisissez Fichier &gt; Nouveau rendez-vous ou appuyez sur les touches Ctrl"
-"+Maj+A."
+"Choisissez Fichier &gt; Nouveau &gt; Rendez-vous ou appuyez sur les touches "
+"Ctrl+Maj+A."
 
-#: ../C/evolution.xml:7076(title)
+#: ../C/evolution.xml:7040(title)
 msgid "Entering a New Contact:"
 msgstr "Création d'un contact :"
 
-#: ../C/evolution.xml:7077(para)
+#: ../C/evolution.xml:7041(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
-"address card. You can also use File &gt; New Contact or Shift+Ctrl+C."
+"address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C."
 msgstr ""
 "Double-cliquez sur un espace vierge dans le gestionnaire de contacts pour "
-"créer une carte de visite. Vous pouvez également utiliser Fichier &gt; "
-"Nouveau contact ou appuyer sur les touches Ctrl+Maj+C."
+"créer une carte de visite. Vous pouvez également choisir Fichier &gt; "
+"Nouveau &gt; Contact ou appuyer sur les touches Ctrl+Maj+C."
 
-#: ../C/evolution.xml:7080(title) ../C/evolution.xml:7130(title)
+#: ../C/evolution.xml:7044(title) ../C/evolution.xml:7094(title)
 msgid "Creating a New Task:"
 msgstr "Création d'une nouvelle tâche :"
 
-#: ../C/evolution.xml:7081(para)
-msgid "File &gt; New Task or Shift+Ctrl+T."
-msgstr "Fichier &gt; Nouvelle tâche ou Ctrl+Maj+T."
+#: ../C/evolution.xml:7045(para) ../C/evolution.xml:7095(para)
+msgid "Click File &gt; New &gt; Task or Shift+Ctrl+T."
+msgstr "Choisissez Fichier &gt; Nouveau &gt; Tâche ou Ctrl+Maj+T."
 
-#: ../C/evolution.xml:7088(title)
+#: ../C/evolution.xml:7052(title)
 msgid "Send and Receive Mail:"
 msgstr "Envoi et réception de messages :"
 
-#: ../C/evolution.xml:7089(para)
+#: ../C/evolution.xml:7053(para)
 msgid ""
 "Press F9, click the Send/Receive button in the toolbar, or click File &gt; "
 "Send/Receive."
@@ -15033,11 +14794,11 @@ msgstr ""
 "Appuyez sur F9, cliquez sur le bouton Envoyer/Recevoir dans la barre "
 "d'outils ou choisissez Fichier &gt; Envoyer/Recevoir."
 
-#: ../C/evolution.xml:7092(title)
+#: ../C/evolution.xml:7056(title)
 msgid "Navigating the Message List with the Keyboard:"
 msgstr "Navigation dans la liste des messages avec le clavier :"
 
-#: ../C/evolution.xml:7093(para)
+#: ../C/evolution.xml:7057(para)
 msgid ""
 "Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the "
 "previous unread message. Use the arrow keys to move up and down in the list "
@@ -15047,23 +14808,24 @@ msgstr ""
 "permet d'accéder au message non lu précédent. Utilisez les touches fléchées "
 "pour remonter ou redescendre dans la liste de tous les messages."
 
-#: ../C/evolution.xml:7096(title)
+#: ../C/evolution.xml:7060(title)
 msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr ""
 "Affichage de la page suivante ou de la page précédente dans le panneau "
 "d'aperçu :"
 
-#: ../C/evolution.xml:7097(para)
-msgid "Press the Spacebar to move down a page. Press Backspace to move up a page."
+#: ../C/evolution.xml:7061(para)
+msgid ""
+"Press the Spacebar to move down a page. Press Backspace to move up a page."
 msgstr ""
 "Appuyez sur la barre d'espace pour accéder à la page suivante. Appuyez sur "
 "la touche Retour arrière pour accéder à la page précédente."
 
-#: ../C/evolution.xml:7100(title)
+#: ../C/evolution.xml:7064(title)
 msgid "Replying To a Message:"
 msgstr "Répondre à un message :"
 
-#: ../C/evolution.xml:7101(para)
+#: ../C/evolution.xml:7065(para)
 msgid ""
 "To reply only to the sender of the message, click Reply in the toolbar, or "
 "press Ctrl+R."
@@ -15071,7 +14833,7 @@ msgstr ""
 "Pour répondre uniquement à l'expéditeur du message, cliquez sur Répondre "
 "dans la barre d'outils ou appuyez sur les touches Ctrl+R."
 
-#: ../C/evolution.xml:7103(para)
+#: ../C/evolution.xml:7067(para)
 msgid ""
 "To reply to the sender and all the other visible recipients of the message, "
 "click Reply to All or select the message and press Shift+Ctrl+R."
@@ -15080,11 +14842,11 @@ msgstr ""
 "message, cliquez sur Répondre à tous ou sélectionnez le message et appuyez "
 "sur les touches Maj+Ctrl+R."
 
-#: ../C/evolution.xml:7105(title)
+#: ../C/evolution.xml:7069(title)
 msgid "Forwarding a Message:"
 msgstr "Faire suivre un message :"
 
-#: ../C/evolution.xml:7106(para)
+#: ../C/evolution.xml:7070(para)
 msgid ""
 "Select the message or messages you want to forward, then click Forward in "
 "the toolbar, or press Ctrl+F."
@@ -15092,11 +14854,11 @@ msgstr ""
 "Sélectionnez le ou les message(s) à faire suivre, puis cliquez sur Faire "
 "suivre dans la barre d'outils ou appuyez sur les touches Ctrl+F."
 
-#: ../C/evolution.xml:7109(title)
+#: ../C/evolution.xml:7073(title)
 msgid "Opening a Message In a New Window:"
 msgstr "Ouverture d'un message dans une nouvelle fenêtre :"
 
-#: ../C/evolution.xml:7110(para)
+#: ../C/evolution.xml:7074(para)
 msgid ""
 "Double-click the message you want to view, or select it and press Enter or "
 "Ctrl+O."
@@ -15104,34 +14866,30 @@ msgstr ""
 "Double-cliquez sur le message à afficher ou sélectionnez-le et appuyez sur "
 "Entrée ou sur les touches Ctrl+O."
 
-#: ../C/evolution.xml:7113(title)
+#: ../C/evolution.xml:7077(title)
 msgid "Creating Filters and Search Folders:"
 msgstr "Création de filtres et de dossiers de recherche :"
 
-#: ../C/evolution.xml:7114(para)
+#: ../C/evolution.xml:7078(para)
 msgid ""
 "Right-click a message and select Create Rule From Message. You can also "
 "create filters and Search folders in the Edit menu."
 msgstr ""
-"Cliquez avec le bouton droit sur un message et sélectionnez « Créer une "
-"règle à partir du message ». Vous pouvez également créer des filtres et des "
+"Cliquez avec le bouton droit sur un message et sélectionnez « Créer une règle "
+"à partir du message ». Vous pouvez également créer des filtres et des "
 "dossiers de recherche dans le menu Édition."
 
-#: ../C/evolution.xml:7117(title)
+#: ../C/evolution.xml:7081(title)
 msgid "Adding a Sender to the Address Book:"
 msgstr "Ajout d'un expéditeur au carnet d'adresses :"
 
-#: ../C/evolution.xml:7118(para)
-msgid ""
-"Right-click a message and select Add Sender to Address Book. You can also "
-"right-click on any e-mail address to add it to your address book."
+#: ../C/evolution.xml:7082(para)
+msgid "Right-click on any email address to add it to your address book."
 msgstr ""
-"Cliquez avec le bouton droit sur un message et sélectionnez « Ajouter "
-"l'expéditeur dans le carnet d'adresses ». Vous pouvez également cliquer avec "
-"le bouton droit sur une adresse  électronique pour l'ajouter au carnet "
-"d'adresses."
+"Cliquez avec le bouton droit sur n'importe quelle adresse électronique pour "
+"l'ajouter à votre carnet d'adresses."
 
-#: ../C/evolution.xml:7128(para)
+#: ../C/evolution.xml:7092(para)
 msgid ""
 "You can also click in any blank spot in the calendar and start typing to "
 "create a new appointment entry."
@@ -15139,25 +14897,21 @@ msgstr ""
 "Vous pouvez également cliquer sur un espace vierge dans le calendrier et "
 "saisir les informations pour créer un rendez-vous."
 
-#: ../C/evolution.xml:7131(para)
-msgid "Use File &gt; New Task or Shift+Ctrl+T."
-msgstr "Utilisez Fichier &gt; Nouvelle tâche ou appuyez sur les touches Ctrl+Maj+T."
-
-#: ../C/evolution.xml:7138(title)
+#: ../C/evolution.xml:7102(title)
 msgid "Editing a Contact:"
 msgstr "Modification d'un contact :"
 
-#: ../C/evolution.xml:7139(para)
+#: ../C/evolution.xml:7103(para)
 msgid "Double-click the contact's address card to change details."
 msgstr ""
 "Double-cliquez sur la carte de visite du contact pour modifier les "
 "informations."
 
-#: ../C/evolution.xml:7142(title)
+#: ../C/evolution.xml:7106(title)
 msgid "Deleting a Contact:"
 msgstr "Suppression d'un contact :"
 
-#: ../C/evolution.xml:7143(para)
+#: ../C/evolution.xml:7107(para)
 msgid ""
 "Right-click a contact, then click Delete; or select a contact, then click "
 "Delete on the toolbar."
@@ -15165,21 +14919,21 @@ msgstr ""
 "Cliquez avec le bouton droit sur un contact, puis choisissez Supprimer, ou "
 "sélectionnez un contact, puis cliquez sur Supprimer dans la barre d'outils."
 
-#: ../C/evolution.xml:7146(title)
-msgid "Sending E-mails to a Contact:"
+#: ../C/evolution.xml:7110(title)
+msgid "Sending Emails to a Contact:"
 msgstr "Envoi d'un message à un contact :"
 
-#: ../C/evolution.xml:7147(para)
+#: ../C/evolution.xml:7111(para)
 msgid "Right-click a contact, then click Send Message to Contact."
 msgstr ""
 "Cliquez avec le bouton droit sur un contact, puis cliquez sur « Envoyer un "
 "message au contact »."
 
-#: ../C/evolution.xml:7150(title)
+#: ../C/evolution.xml:7114(title)
 msgid "Creating a New Contact:"
 msgstr "Création d'un contact :"
 
-#: ../C/evolution.xml:7151(para)
+#: ../C/evolution.xml:7115(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card, or right-click anywhere in the address book and select New "
@@ -15191,20 +14945,21 @@ msgstr ""
 "cliquer sur Fichier &gt; Nouveau contact ou appuyer sur les touches Ctrl+Maj"
 "+C."
 
-#: ../C/evolution.xml:7158(para)
+#: ../C/evolution.xml:7122(para)
 msgid ""
-"Evolution™ bug tracking is done at the <ulink url=\"http://bugzilla.gnome.org"
-"\">GNOME bug tracking System</ulink>. You can use that, or the GNOME Bug "
-"Report Tool (known as bug-buddy at the command line) if you find bugs or "
-"want to request new features."
+"<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
+"\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
+"that, or the GNOME Bug Report Tool (known as bug-buddy at the command line) "
+"if you find bugs or want to request new features."
 msgstr ""
-"Le suivi des anomalies d'Evolution est géré par le <ulink url="
-"\"http://bugzilla.gnome.org\">système de suivi d'anomalies de GNOME</ulink>. "
-"Vous pouvez l'utiliser directement ou utiliser l'outil de rapport "
-"d'anomalies de GNOME (connu sous le nom de Bug Buddy) si vous trouver des "
-"erreurs ou si vous souhaitez proposer de nouvelles fonctionnalités."
+"Le suivi des anomalies d'<trademark>Evolution</trademark> est géré par le "
+"<ulink url=\"http://bugzilla.gnome.org\">système de suivi d'anomalies de "
+"GNOME</ulink>. Vous pouvez l'utiliser directement ou utiliser l'outil de "
+"rapport d'anomalies de GNOME (connu sous le nom de Bug Buddy) si vous "
+"trouver des erreurs ou si vous souhaitez proposer de nouvelles "
+"fonctionnalités."
 
-#: ../C/evolution.xml:7159(para)
+#: ../C/evolution.xml:7123(para)
 msgid ""
 "A complete list of feature requests and other issues with Evolution is "
 "available online in the GNOME bug tracking system. You can learn more about "
@@ -15217,25 +14972,17 @@ msgstr ""
 "développement d'Evolution sur le <ulink url=\"http://gnome.org/projects/"
 "evolution/developer.shtml\">site des développeurs d'Evolution</ulink>."
 
-#: ../C/evolution.xml:7160(para)
-msgid ""
-"If you need additional help with Evolution, visit the <ulink url=\"http://"
-"support.novell.com\">Novell® support site at</ulink>."
-msgstr ""
-"Si vous avez besoin de plus d'aide avec Evolution, visitez le <ulink url="
-"\"http://support.novell.com\">site de support de Novell&reg;</ulink>."
-
-#: ../C/evolution.xml:7165(para)
+#: ../C/evolution.xml:7128(para)
 msgid ""
-"Evolution was written by the Evolution™ team and numerous other dedicated "
-"GNOME programmers. You can see their names by clicking Help &gt; About from "
-"any Evolution window."
+"Evolution was written by the <trademark>Evolution</trademark> team and "
+"numerous other dedicated GNOME programmers. You can see their names by "
+"clicking Help &gt; About from the main Evolution window."
 msgstr ""
-"Evolution a été écrit par l'équipe d'Evolution et de nombreux autres "
-"programmeurs GNOME dévoués. Vous pouvez voir leur nom en choisissant Aide "
-"&gt; À propos dans toute fenêtre d'Evolution."
+"Evolution a été écrit par l'équipe d'<trademark>Evolution</trademark> et de "
+"nombreux autres programmeurs GNOME dévoués. Vous pouvez voir leur nom en "
+"choisissant Aide &gt; À propos dans la fenêtre principale d'Evolution."
 
-#: ../C/evolution.xml:7166(para)
+#: ../C/evolution.xml:7129(para)
 msgid ""
 "The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar "
 "applications, and to KHTMLW. The developers of Evolution acknowledge the "
@@ -15246,69 +14993,68 @@ msgstr ""
 "reconnaissent les efforts et les contributions de tous ceux qui ont "
 "travaillé sur ces projets."
 
-#: ../C/evolution.xml:7167(para)
+#: ../C/evolution.xml:7130(para)
 msgid ""
 "For more information please visit the Evolution <ulink url=\"http://www."
-"novell.com/products/desktop/features/evolution.html\">Web page</ulink>. "
-"Please send all comments, suggestions, and bug reports to the <ulink url="
-"\"http://bugzilla.gnome.com\">bug tracking database</ulink>. Instructions "
-"for submitting bug reports can be found on-line at the same location. You "
-"can also use the GNOME bug report tool, bug-buddy, to submit your defect "
-"reports."
-msgstr ""
-"Pour plus d'informations, consultez la <ulink url=\"http://www.novell.com/"
-"products/desktop/features/evolution.html\">page Web</ulink> d'Evolution. "
-"Faites part de tout commentaire, suggestion et rapport d'anomalie dans la "
-"<ulink url=\"http://bugzilla.gnome.com\">base de données de suivi des "
-"anomalies</ulink>. Vous y trouverez également des instructions sur la "
-"manière de soumettre des rapports d'anomalie. Vous pouvez aussi utiliser à "
-"cet effet l'outil de rapport d'anomalies de GNOME, Bug Buddy."
+"gnome.org/projects/evolution\">Web page</ulink>. Please send all comments, "
+"suggestions, and bug reports to the <ulink url=\"http://bugzilla.gnome.org"
+"\">bug tracking database</ulink>. Instructions for submitting bug reports "
+"can be found on-line at the same location. You can also use the GNOME bug "
+"report tool, bug-buddy, to submit your defect reports."
+msgstr ""
+"Pour plus d'informations, consultez la <ulink url=\"http://www.gnome.org/"
+"projects/evolution\">page Web</ulink> d'Evolution. Faites part de tout "
+"commentaire, suggestion et rapport d'anomalie dans la <ulink url=\"http://"
+"bugzilla.gnome.org\">base de données de suivi des anomalies</ulink>. Vous y "
+"trouverez également des instructions sur la manière de soumettre des "
+"rapports d'anomalie. Vous pouvez aussi utiliser à cet effet l'outil de "
+"rapport d'anomalies de GNOME, Bug Buddy."
 
-#: ../C/evolution.xml:7168(para)
+#: ../C/evolution.xml:7131(para)
 msgid "This manual was written by:"
 msgstr "Ce manuel a été écrit par :"
 
-#: ../C/evolution.xml:7171(para)
+#: ../C/evolution.xml:7134(para)
 msgid "Radhika PC (pradhika@novell.com)"
 msgstr "Radhika PC (pradhika@novell.com)"
 
-#: ../C/evolution.xml:7174(para)
+#: ../C/evolution.xml:7137(para)
 msgid "Srinivasa Ragavan (sragavan@novell.com)"
 msgstr "Srinivasa Ragavan (sragavan@novell.com)"
 
-#: ../C/evolution.xml:7177(para)
+#: ../C/evolution.xml:7140(para)
 msgid "Andre Klapper (ak-47@gmx.net)"
 msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: ../C/evolution.xml:7180(para)
+#: ../C/evolution.xml:7143(para)
 msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 
-#: ../C/evolution.xml:7183(para)
+#: ../C/evolution.xml:7146(para)
 msgid "Mark Moulder (mmoulder@novell.com)"
 msgstr "Mark Moulder (mmoulder@novell.com)"
 
-#: ../C/evolution.xml:7186(para)
+#: ../C/evolution.xml:7149(para)
 msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
 
-#: ../C/evolution.xml:7189(para)
+#: ../C/evolution.xml:7152(para)
 msgid "Aaron Weber (aaron@ximian.com)"
 msgstr "Aaron·Weber·(aaron@ximian.com)"
 
-#: ../C/evolution.xml:7192(para)
+#: ../C/evolution.xml:7155(para)
 msgid "Kevin Breit (mrproper@ximian.com)"
 msgstr "Kevin Breit (mrproper@ximian.com)"
 
-#: ../C/evolution.xml:7195(para)
+#: ../C/evolution.xml:7158(para)
 msgid "Duncan Mak (duncan@ximian.com)"
 msgstr "Duncan Mak (duncan@ximian.com)"
 
-#: ../C/evolution.xml:7198(para)
+#: ../C/evolution.xml:7161(para)
 msgid "Ettore Perazzoli (ettore@ximian.com)"
 msgstr "Ettore Perazzoli (ettore@ximian.com)"
 
-#: ../C/evolution.xml:7201(para)
+#: ../C/evolution.xml:7164(para)
 msgid ""
 "With the help of the application programmers and the GNOME Documentation "
 "Project."
@@ -15316,20 +15062,20 @@ msgstr ""
 "Avec l'aide des programmeurs de l'application et du projet de documentation "
 "de GNOME."
 
-#: ../C/evolution.xml:7204(para)
+#: ../C/evolution.xml:7167(para)
 msgid ""
 "Please file comments and suggestions for this manual as bugs in the GNOME "
 "bug tracking system. If you contributed to this project but do not see your "
-"name here, please contact Radhika PC (pradhika@novell.com) or Sreenivasa "
+"name here, please contact Radhika PC (pradhika@novell.com) or Srinivasa "
 "Ragavan (sragavan@novell.com) and either of them will list you."
 msgstr ""
 "Merci de bien vouloir faire part de vos commentaires et suggestions pour ce "
 "manuel sous forme de rapport d'anomalie dans le système de suivi des "
 "anomalies de GNOME. Si vous avez contribué à ce projet, mais que votre nom "
-"ne figure pas ici, contactez Radhika PC (pradhika@novell.com) ou Sreenivasa "
+"ne figure pas ici, contactez Radhika PC (pradhika@novell.com) ou Srinivasa "
 "Ragavan (sragavan@novell.com) et ils feront le nécessaire."
 
-#: ../C/evolution.xml:7205(para)
+#: ../C/evolution.xml:7168(para)
 msgid ""
 "Partial list of Documentation Translators (application translated to "
 "numerous additional languages):"
@@ -15337,35 +15083,37 @@ msgstr ""
 "Liste partielle des traducteurs de cette documentation (l'application est "
 "traduite dans de nombreuses autres langues) :"
 
-#: ../C/evolution.xml:7208(para)
+#: ../C/evolution.xml:7171(para)
 msgid "Daniel Persson for Swedish (.se)"
 msgstr "Daniel Persson pour le suédois (.se)"
 
-#: ../C/evolution.xml:7211(para)
-msgid "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
-msgstr "Hector Garcia Alvarez et Francisco Javier F. Serrador pour l'espagnol (.es)"
+#: ../C/evolution.xml:7174(para)
+msgid ""
+"Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
+msgstr ""
+"Hector Garcia Alvarez et Francisco Javier F. Serrador pour l'espagnol (.es)"
 
-#: ../C/evolution.xml:7214(para)
+#: ../C/evolution.xml:7177(para)
 msgid "Kjartan Maraas for Norwegian (.no)"
 msgstr "Kjartan Maraas pour le norvégien (.no)"
 
-#: ../C/evolution.xml:7217(para)
+#: ../C/evolution.xml:7180(para)
 msgid "Sergey V. Mironov for Russian (.ru)"
 msgstr "Sergey V. Mironov pour le russe (.ru)"
 
-#: ../C/evolution.xml:7224(para)
+#: ../C/evolution.xml:7187(para)
 msgid ""
 "This glossary contains terms that are frequently used in this guide as well "
-"as in Evolution™."
+"as in <trademark>Evolution</trademark>."
 msgstr ""
 "Ce glossaire contient des termes fréquemment utilisés dans ce guide comme "
-"dans Evolution."
+"dans <trademark>Evolution</trademark>."
 
-#: ../C/evolution.xml:7226(glossterm)
+#: ../C/evolution.xml:7189(glossterm)
 msgid "Assistant"
 msgstr "assistant"
 
-#: ../C/evolution.xml:7228(para)
+#: ../C/evolution.xml:7191(para)
 msgid ""
 "A tool that guides a user through a series of steps, usually to configure or "
 "set up a program. Equivalent to Wizard and Druid."
@@ -15373,38 +15121,33 @@ msgstr ""
 "Un outil qui guide un utilisateur étape par étape, normalement pour "
 "configurer un programme."
 
-#: ../C/evolution.xml:7232(glossterm)
+#: ../C/evolution.xml:7195(glossterm)
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: ../C/evolution.xml:7234(para)
+#: ../C/evolution.xml:7197(para)
 msgid ""
-"Any file sent with an e-mail. Attachments can be embedded in a message or "
+"Any file sent with an email. Attachments can be embedded in a message or "
 "appended to it."
 msgstr ""
 "Tout fichier envoyé avec un courriel. Les pièces jointes peuvent être "
 "intégrées dans un message ou placées en fin de message."
 
-#: ../C/evolution.xml:7238(glossterm)
+#: ../C/evolution.xml:7201(glossterm)
 msgid "automatic indexing"
 msgstr "indexation automatique"
 
-#: ../C/evolution.xml:7240(para)
-msgid ""
-"A pre-downloading procedure that allows Novell® Evolution™ to quickly refer "
-"to data. It enables faster searches and decreases memory usage for data "
-"displays."
+#: ../C/evolution.xml:7203(para)
+msgid "A feature which allows Evolution to quickly find and sort data."
 msgstr ""
-"Une procédure de pré-téléchargement qui permet à Novell&reg; "
-"Evolution&trade; d'accéder rapidement à des données. Cela permet d'effectuer "
-"des recherches plus rapidement et diminue la consommation de mémoire pour "
-"l'affichage des données."
+"Une fonctionnalité permettant à Evolution de chercher et de trier rapidement "
+"des données."
 
-#: ../C/evolution.xml:7244(glossterm)
+#: ../C/evolution.xml:7207(glossterm)
 msgid "Bcc (Blind Carbon Copy)"
 msgstr "Cci (copie carbone invisible)"
 
-#: ../C/evolution.xml:7246(para)
+#: ../C/evolution.xml:7209(para)
 msgid ""
 "Blind copy recipients (Bcc) receive a copy of an item. Other recipients "
 "receive no information about blind copies. Only the sender and the blind "
@@ -15418,11 +15161,11 @@ msgstr ""
 "répond en choisissant Répondre à tous, les destinataires en copie invisible "
 "ne reçoivent pas la réponse."
 
-#: ../C/evolution.xml:7250(glossterm)
+#: ../C/evolution.xml:7213(glossterm)
 msgid "Cc (Carbon Copy)"
 msgstr "Cc (copie carbone)"
 
-#: ../C/evolution.xml:7252(para)
+#: ../C/evolution.xml:7215(para)
 msgid ""
 "Carbon copy recipients (CC) receive a copy of an item. CC recipients are "
 "users who would benefit from the information in an item, but are not "
@@ -15436,11 +15179,11 @@ msgstr ""
 "envoyée. Ils peuvent voir également les noms des destinataires en copie "
 "carbone."
 
-#: ../C/evolution.xml:7256(glossterm)
+#: ../C/evolution.xml:7219(glossterm)
 msgid "conduit"
 msgstr "conduite"
 
-#: ../C/evolution.xml:7258(para)
+#: ../C/evolution.xml:7221(para)
 msgid ""
 "A small application that controls the transfer of data between a handheld "
 "device and a desktop computer."
@@ -15448,15 +15191,15 @@ msgstr ""
 "Une petite application qui contrôle le transfert de données entre un "
 "appareil mobile et un ordinateur de bureau."
 
-#: ../C/evolution.xml:7264(para)
+#: ../C/evolution.xml:7227(para)
 msgid "The GNOME groupware application."
 msgstr "L'application GNOME de travail collaboratif."
 
-#: ../C/evolution.xml:7268(glossterm)
+#: ../C/evolution.xml:7231(glossterm)
 msgid "execute"
 msgstr "exécuter"
 
-#: ../C/evolution.xml:7270(para)
+#: ../C/evolution.xml:7233(para)
 msgid ""
 "To run a program. Any file that can be run is called an executable. "
 "Evolution can download executable attachments, but before they can be run, "
@@ -15474,11 +15217,11 @@ msgstr ""
 "permissions de fichiers, consultez la documentation du gestionnaire de "
 "fichiers ou de l'interpréteur de commandes."
 
-#: ../C/evolution.xml:7274(glossterm)
+#: ../C/evolution.xml:7237(glossterm)
 msgid "expunge"
 msgstr "nettoyer"
 
-#: ../C/evolution.xml:7276(para)
+#: ../C/evolution.xml:7239(para)
 msgid ""
 "When messages are marked for deletion, they remain until they are expunged. "
 "When a message is expunged, it is permanently deleted, as long as it was "
@@ -15488,11 +15231,11 @@ msgstr ""
 "jusqu'à ce qu'ils soient nettoyés. Lorsqu'un message est nettoyé, il est "
 "définitivement effacé, pour autant qu'il ait été marqué pour la suppression."
 
-#: ../C/evolution.xml:7280(glossterm)
+#: ../C/evolution.xml:7243(glossterm)
 msgid "file tree"
 msgstr "arborescence de fichiers"
 
-#: ../C/evolution.xml:7282(para)
+#: ../C/evolution.xml:7245(para)
 msgid ""
 "A way of describing a group of files on a computer. The top of the tree is "
 "called the root directory, and is denoted by <command>/</command>. The rest "
@@ -15507,11 +15250,11 @@ msgstr ""
 "compte administrateur (root) et le dossier personnel de l'administrateur, "
 "généralement <command>/root</command>."
 
-#: ../C/evolution.xml:7286(glossterm)
+#: ../C/evolution.xml:7249(glossterm)
 msgid "filter"
 msgstr "filtre"
 
-#: ../C/evolution.xml:7288(para)
+#: ../C/evolution.xml:7251(para)
 msgid ""
 "Within Evolution, a filter is a method of sorting mail automatically when it "
 "is downloaded. You can create filters to perform one or more actions on a "
@@ -15522,27 +15265,27 @@ msgstr ""
 "une ou plusieurs actions sur un message qui correspond à un ou à toute une "
 "série de critères."
 
-#: ../C/evolution.xml:7292(glossterm)
+#: ../C/evolution.xml:7255(glossterm)
 msgid "forward"
 msgstr "faire suivre"
 
-#: ../C/evolution.xml:7294(para)
+#: ../C/evolution.xml:7257(para)
 msgid ""
-"Forwards a copy of the message and any additional comments to a different e-"
-"mail address."
+"Forwards a copy of the message and any additional comments to a different "
+"email address."
 msgstr ""
 "Fait suivre une copie d'un message avec d'éventuels commentaires "
 "supplémentaires à une adresse électronique différente."
 
-#: ../C/evolution.xml:7298(glossterm)
+#: ../C/evolution.xml:7261(glossterm)
 msgid "groupware"
 msgstr "travail collaboratif"
 
-#: ../C/evolution.xml:7300(para)
+#: ../C/evolution.xml:7263(para)
 msgid ""
 "A term describing an application that helps groups of people work together. "
 "Typically, a groupware application has several productivity features built "
-"into one program, including e-mail, calendar, and address book tools."
+"into one program, including email, calendar, and address book tools."
 msgstr ""
 "Un terme décrivant une application qui aide des groupes de personnes à "
 "travailler ensemble. Typiquement, une application de travail collaboratif "
@@ -15550,15 +15293,15 @@ msgstr ""
 "programme, comprenant la messagerie, le calendrier et des outils de carnet "
 "d'adresses."
 
-#: ../C/evolution.xml:7304(glossterm)
+#: ../C/evolution.xml:7267(glossterm)
 msgid "HTML"
 msgstr "HTML"
 
-#: ../C/evolution.xml:7306(para)
+#: ../C/evolution.xml:7269(para)
 msgid ""
 "Hypertext Markup Language (HTML) is a language for describing page layout in "
-"electronic documents such as Web pages, help files, and e-mail messages. "
-"HTML can be used in e-mail and news posts to insert images and apply text "
+"electronic documents such as Web pages, help files, and email messages. HTML "
+"can be used in email and news posts to insert images and apply text "
 "treatments."
 msgstr ""
 "Hypertext Markup Language (HTML) est un langage de description de page dans "
@@ -15567,23 +15310,23 @@ msgstr ""
 "appliquer du formatage de texte dans des courriels ou des messages de "
 "nouvelles. "
 
-#: ../C/evolution.xml:7310(glossterm)
+#: ../C/evolution.xml:7273(glossterm)
 msgid "iCal"
 msgstr "iCal"
 
-#: ../C/evolution.xml:7312(para)
+#: ../C/evolution.xml:7275(para)
 msgid "iCal is a protocol that Evolution uses to manage the calendar section."
 msgstr ""
 "iCal est un protocole utilisé par Evolution pour gérer la section "
 "Calendriers."
 
-#: ../C/evolution.xml:7316(glossterm)
+#: ../C/evolution.xml:7279(glossterm)
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../C/evolution.xml:7318(para)
+#: ../C/evolution.xml:7281(para)
 msgid ""
-"Internet Mail Access Protocol. It allows access to e-mail that is typically "
+"Internet Mail Access Protocol. It allows access to email that is typically "
 "stored remotely on a server rather than on a local hard disk. Often "
 "contrasted with POP."
 msgstr ""
@@ -15591,11 +15334,11 @@ msgstr ""
 "manière distante sur un serveur, et non pas sur le disque dur local. C'est "
 "un peu le contraire de POP."
 
-#: ../C/evolution.xml:7322(glossterm)
+#: ../C/evolution.xml:7285(glossterm)
 msgid "inline"
 msgstr "intégré"
 
-#: ../C/evolution.xml:7324(para)
+#: ../C/evolution.xml:7287(para)
 msgid ""
 "Displayed as part of a message or other document, rather than attached as a "
 "separate file. Contrast with <emphasis>attachment</emphasis>."
@@ -15604,11 +15347,11 @@ msgstr ""
 "sous forme d'un fichier séparé. L'inverse d'une <emphasis>pièce jointe</"
 "emphasis>."
 
-#: ../C/evolution.xml:7328(glossterm)
+#: ../C/evolution.xml:7291(glossterm)
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../C/evolution.xml:7330(para)
+#: ../C/evolution.xml:7293(para)
 msgid ""
 "Lightweight Directory Access Protocol. Allows a client to search through a "
 "large database of addresses, phone numbers, and people stored on a server."
@@ -15617,13 +15360,13 @@ msgstr ""
 "une grande base de données d'adresses, de numéros de téléphone et de "
 "personnes stockée sur un serveur."
 
-#: ../C/evolution.xml:7334(glossterm)
+#: ../C/evolution.xml:7297(glossterm)
 msgid "mail client"
 msgstr "client de messagerie"
 
-#: ../C/evolution.xml:7336(para)
+#: ../C/evolution.xml:7299(para)
 msgid ""
-"The application with which a person reads and sends e-mail. Its counterparts "
+"The application with which a person reads and sends email. Its counterparts "
 "are the various types of mail servers, which handle user authentication and "
 "direct messages from the sender to the recipient."
 msgstr ""
@@ -15632,13 +15375,13 @@ msgstr ""
 "qui gèrent l'authentification des utilisateurs et dirigent les messages "
 "depuis l'expéditeur vers les destinataires."
 
-#: ../C/evolution.xml:7340(glossterm)
+#: ../C/evolution.xml:7303(glossterm)
 msgid "POP"
 msgstr "POP"
 
-#: ../C/evolution.xml:7342(para)
+#: ../C/evolution.xml:7305(para)
 msgid ""
-"Post Office Protocol. A mechanism for e-mail transport. In contrast to IMAP, "
+"Post Office Protocol. A mechanism for email transport. In contrast to IMAP, "
 "it is used only to get mail from a server and store it locally on your hard "
 "disk."
 msgstr ""
@@ -15646,15 +15389,15 @@ msgstr ""
 "à IMAP, il est uniquement utilisé pour relever les messages d'un serveur et "
 "les stocker localement sur le disque dur."
 
-#: ../C/evolution.xml:7346(glossterm)
+#: ../C/evolution.xml:7309(glossterm)
 msgid "protocol"
 msgstr "protocole"
 
-#: ../C/evolution.xml:7348(para)
+#: ../C/evolution.xml:7311(para)
 msgid ""
 "An agreed-upon method of communication, especially one for sending "
 "particular types of information between computer systems. Examples include "
-"POP (Post Office Protocol), for e-mail, and HTTP (HypterText Transfer "
+"POP (Post Office Protocol), for email, and HTTP (HyperText Transfer "
 "Protocol) for Web pages."
 msgstr ""
 "Une méthode de communication standardisée, particulièrement dans le cadre de "
@@ -15662,11 +15405,11 @@ msgstr ""
 "exemple, POP (Post Office Protocol) pour la messagerie et HTTP (HyperText "
 "Transfer Protocol) pour les pages Web."
 
-#: ../C/evolution.xml:7352(glossterm)
+#: ../C/evolution.xml:7315(glossterm)
 msgid "public key encryption"
 msgstr "chiffrement par clé publique"
 
-#: ../C/evolution.xml:7354(para)
+#: ../C/evolution.xml:7317(para)
 msgid ""
 "A strong encryption method that uses a set of two keys, one of which is made "
 "public, and one of which is kept private. Data encrypted using the public "
@@ -15678,32 +15421,33 @@ msgstr ""
 "ne peuvent être déchiffrées qu'avec la clé privée. Plus les clés sont "
 "longues, plus il est difficile de casser le chiffrement."
 
-#: ../C/evolution.xml:7358(glossterm)
+#: ../C/evolution.xml:7321(glossterm)
 msgid "regular expression"
 msgstr "expression régulière"
 
-#: ../C/evolution.xml:7360(para)
+#: ../C/evolution.xml:7323(para)
 msgid ""
 "A regular expression (regex) is a way of describing a string of text using "
 "metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
-"means any phrase beginning with ‘fly’ and ending in ‘soup’ or ‘soap’. If you "
-"searched for that expression, you'd find both ‘fly in my soup’ and ‘fly in "
-"my soap.’ For more information, enter <command>man grep</command> from the "
-"command line."
+"means any phrase beginning with <quote>fly</quote> and ending in "
+"<quote>soup</quote> or <quote>soap.</quote> If you searched for that "
+"expression, you'd find both <quote>fly in my soup</quote> and <quote>fly in "
+"my soap.</quote> For more information, enter <command>man grep</command> "
+"from the command line."
 msgstr ""
 "Une expression régulière (regex) est une manière de décrire une chaîne de "
 "caractères avec des méta caractères ou des symboles génériques. Par exemple, "
 "l'expression mouche.*sou[pt]e correspond à tout texte commençant par "
-"« mouche » et se terminant par « soupe » ou « soute ». Si vous recherchez "
-"cette expression, vous trouverez aussi bien « mouche sur ma soupe » que "
-"« mouche dans la soute ». Pour plus d'informations, saisissez <command>man "
-"grep</command> dans une ligne de commande."
+"« mouche » et se terminant par « soupe » ou « soute ». Si vous recherchez cette "
+"expression, vous trouverez aussi bien « mouche sur ma soupe » que « mouche "
+"dans la soute ». Pour plus d'informations, saisissez <command>man grep</"
+"command> dans une ligne de commande."
 
-#: ../C/evolution.xml:7364(glossterm)
+#: ../C/evolution.xml:7327(glossterm)
 msgid "script"
 msgstr "script"
 
-#: ../C/evolution.xml:7366(para)
+#: ../C/evolution.xml:7329(para)
 msgid ""
 "A program written in an interpreted (rather than compiled) language. Often "
 "used as a synonym for macro, to denote a series of prerecorded commands or "
@@ -15716,11 +15460,11 @@ msgstr ""
 "servent à accomplir des tâches répétitives et ennuyeuses, afin d'économiser "
 "du temps aux utilisateurs."
 
-#: ../C/evolution.xml:7370(glossterm)
+#: ../C/evolution.xml:7333(glossterm)
 msgid "search base"
 msgstr "base de recherche"
 
-#: ../C/evolution.xml:7372(para)
+#: ../C/evolution.xml:7335(para)
 msgid ""
 "LDAP can break contact lists into many groups. The search base tells LDAP "
 "the top group to use. How much of the Search Base to search is set by the "
@@ -15731,35 +15475,35 @@ msgstr ""
 "de la recherche » détermine ensuite jusqu'où s'étend la recherche à partir "
 "de la base de recherche."
 
-#: ../C/evolution.xml:7376(glossterm)
+#: ../C/evolution.xml:7339(glossterm)
 msgid "search folder"
 msgstr "dossier de recherche"
 
-#: ../C/evolution.xml:7378(para)
+#: ../C/evolution.xml:7341(para)
 msgid ""
-"An e-mail organization tool. Search folders allow you to create a folder "
-"that contains the results of a complex search. Search folder contents are "
-"updated dynamically."
+"An email organization tool. Search folders allow you to create a folder that "
+"contains the results of a complex search. Search folder contents are updated "
+"dynamically."
 msgstr ""
 "Un outil d'organisation des courriels. Les dossiers de recherche permettent "
 "de créer un dossier contenant les résultats d'une recherche complexe. Les "
 "contenus des dossiers de recherche sont mis à jour dynamiquement."
 
-#: ../C/evolution.xml:7382(glossterm)
+#: ../C/evolution.xml:7345(glossterm)
 msgid "search scope"
 msgstr "étendue de la recherche"
 
-#: ../C/evolution.xml:7384(para)
+#: ../C/evolution.xml:7347(para)
 msgid "Search Scope states how much of the search base to search."
 msgstr ""
 "L'étendue de la recherche précise l'empans de recherche à partir de la base "
 "de recherche."
 
-#: ../C/evolution.xml:7388(glossterm)
+#: ../C/evolution.xml:7351(glossterm)
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../C/evolution.xml:7390(para)
+#: ../C/evolution.xml:7353(para)
 msgid ""
 "A program that sends mail. Evolution can use it instead of SMTP; some people "
 "prefer it because it offers more flexibility; however, it is more difficult "
@@ -15769,11 +15513,11 @@ msgstr ""
 "de SMTP et certaines personnes le préfèrent à cause de sa plus grande "
 "flexibilité ; cependant, il est plus difficile à configurer."
 
-#: ../C/evolution.xml:7394(glossterm)
+#: ../C/evolution.xml:7357(glossterm)
 msgid "switcher"
 msgstr "sélecteur"
 
-#: ../C/evolution.xml:7396(para)
+#: ../C/evolution.xml:7359(para)
 msgid ""
 "An area of Evolution that offers users fast access to the most frequently "
 "used features of the application."
@@ -15781,13 +15525,13 @@ msgstr ""
 "Une zone d'Evolution qui offre aux utilisateurs un accès rapide aux "
 "fonctions les plus fréquemment utilisées de l'application."
 
-#: ../C/evolution.xml:7400(glossterm)
+#: ../C/evolution.xml:7363(glossterm)
 msgid "signature"
 msgstr "signature"
 
-#: ../C/evolution.xml:7402(para)
+#: ../C/evolution.xml:7365(para)
 msgid ""
-"Text placed at the end of every e-mail sent, similar to a hand-written "
+"Text placed at the end of every email sent, similar to a hand-written "
 "signature at the bottom of a written letter. A signature can be anything "
 "from a favorite quotation to a link to a Web page; courtesy dictates that it "
 "be fewer than four lines long."
@@ -15797,11 +15541,11 @@ msgstr ""
 "contenir une citation favorite qu'un lien vers une page Web, mais l'usage "
 "correct demande qu'elle ne fasse pas plus de quatre lignes."
 
-#: ../C/evolution.xml:7406(glossterm)
+#: ../C/evolution.xml:7369(glossterm)
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../C/evolution.xml:7408(para)
+#: ../C/evolution.xml:7371(para)
 msgid ""
 "Simple Mail Transfer Protocol. The most common way of transporting mail "
 "messages from your computer to the server."
@@ -15809,11 +15553,11 @@ msgstr ""
 "Simple Mail Transfer Protocol. La façon la plus courante de transmettre des "
 "messages électroniques de votre ordinateur vers le serveur."
 
-#: ../C/evolution.xml:7412(glossterm)
+#: ../C/evolution.xml:7375(glossterm)
 msgid "tooltip"
 msgstr "info-bulle"
 
-#: ../C/evolution.xml:7414(para)
+#: ../C/evolution.xml:7377(para)
 msgid ""
 "A small box of explanatory text that appears when the mouse pointer is held "
 "over a button or other interface element."
@@ -15822,11 +15566,11 @@ msgstr ""
 "pointeur de la souris demeure au-dessus d'un bouton ou d'un autre élément "
 "d'interface."
 
-#: ../C/evolution.xml:7418(glossterm)
+#: ../C/evolution.xml:7381(glossterm)
 msgid "virus"
 msgstr "virus"
 
-#: ../C/evolution.xml:7420(para)
+#: ../C/evolution.xml:7383(para)
 msgid ""
 "A program that inserts itself into other files or programs. When executed, "
 "it spreads to more programs and other computers. A virus can cause "
@@ -15838,24 +15582,24 @@ msgstr ""
 "Un virus peut provoquer des dommages importants en saturant des réseaux ou "
 "des disques, en supprimant des fichiers ou en créant des failles de sécurité."
 
-#: ../C/evolution.xml:7424(glossterm)
+#: ../C/evolution.xml:7387(glossterm)
 msgid "vCard"
 msgstr "vCard"
 
-#: ../C/evolution.xml:7426(para)
+#: ../C/evolution.xml:7389(para)
 msgid ""
 "A file format for the exchange of contact information. When you get an "
-"address card attached to an e-mail, it is probably in vCard format."
+"address card attached to an email, it is probably in vCard format."
 msgstr ""
 "Un format de fichier pour l'échange d'informations de contacts. Lorsque vous "
 "recevez une carte de visite jointe à un courriel, celle-ci est probablement "
 "au format vCard."
 
-#: ../C/evolution.xml:7432(title)
+#: ../C/evolution.xml:7395(title)
 msgid "Legal Notices"
 msgstr "Mentions légales"
 
-#: ../C/evolution.xml:7434(member)
+#: ../C/evolution.xml:7397(member)
 msgid ""
 "Novell, Inc. makes no representations or warranties with respect to the "
 "contents or use of this documentation, and specifically disclaims any "
@@ -15871,7 +15615,7 @@ msgstr ""
 "sans obligation de notifier qui que ce soit de telles révisions ou "
 "modifications."
 
-#: ../C/evolution.xml:7435(member)
+#: ../C/evolution.xml:7398(member)
 msgid ""
 "Further, Novell, Inc. makes no representations or warranties with respect to "
 "any software, and specifically disclaims any express or implied warranties "
@@ -15886,7 +15630,7 @@ msgstr ""
 "outre le droit de modifier à tout moment tout ou partie des logiciels "
 "Novell, sans notification préalable de ces modifications à quiconque."
 
-#: ../C/evolution.xml:7438(member)
+#: ../C/evolution.xml:7401(member)
 msgid ""
 "You may not use, export, or re-export this product in violation of any "
 "applicable laws or regulations including, without limitation, U.S. export "
@@ -15898,24 +15642,24 @@ msgstr ""
 "matière d'exportation ou la législation en vigueur dans votre pays de "
 "résidence."
 
-#: ../C/evolution.xml:7441(member)
+#: ../C/evolution.xml:7404(member)
 msgid ""
-"Copyright © 2007 Novell, Inc. All rights reserved. Permission is granted to "
-"copy, distribute, and/or modify this document under the terms of the GNU "
-"Free Documentation License (GFDL), Version 1.2 or any later version, "
-"published by the Free Software Foundation with no Invariant Sections, no "
-"Front-Cover Texts, and no Back-Cover Texts. A copy of the GFDL can be found "
-"at http://www.fsf.org/licenses/fdl.html."
+"Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/"
+"or modify this document under the terms of the GNU Free Documentation "
+"License (GFDL), Version 1.2 or any later version, published by the Free "
+"Software Foundation with no Invariant Sections, no Front-Cover Texts, and no "
+"Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/"
+"licenses/fdl.html."
 msgstr ""
-"Copyright © 2007 Novell, Inc. Tous droits réservés. Permission vous est "
-"donnée de copier, distribuer et/ou modifier ce document selon les termes de "
-"la Licence GNU Free Documentation License, Version 1.1 ou ultérieure publiée "
+"Copyright 2007 Novell, Inc. Tous droits réservés. Permission vous est donnée "
+"de copier, distribuer et/ou modifier ce document selon les termes de la "
+"Licence GNU Free Documentation License, Version 1.1 ou ultérieure publiée "
 "par la Free Software Foundation sans section inaltérable, sans texte de "
 "première page de couverture ni texte de dernière page de couverture. Vous "
 "trouverez un exemplaire de cette licence sur http://www.fsf.org/licenses/fdl."
 "html."
 
-#: ../C/evolution.xml:7442(member)
+#: ../C/evolution.xml:7405(member)
 msgid ""
 "THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE "
 "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
@@ -15924,7 +15668,7 @@ msgstr ""
 "LE PRÉSENT DOCUMENT ET SES VERSIONS MODIFIÉES SONT FOURNIS SELON LES TERMES "
 "DE LA LICENCE DE DOCUMENTATION LIBRE GNU SACHANT QUE :"
 
-#: ../C/evolution.xml:7443(member)
+#: ../C/evolution.xml:7406(member)
 msgid ""
 "1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY "
 "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
@@ -15951,7 +15695,7 @@ msgstr ""
 "SA VERSION MODIFIÉE N'EST AUTORISÉE AUX TERMES DU PRÉSENT ACCORD, EXCEPTÉ "
 "SOUS CETTE DÉNÉGATION DE RESPONSABILITÉ ; "
 
-#: ../C/evolution.xml:7444(member)
+#: ../C/evolution.xml:7407(member)
 msgid ""
 "2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
 "(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
@@ -15977,31 +15721,31 @@ msgstr ""
 "À JOUR, ET CE MÊME SI CES PARTIES ONT ÉTÉ INFORMÉES DE LA POSSIBILITÉ DE "
 "TELS DOMMAGES."
 
-#: ../C/evolution.xml:7447(member)
+#: ../C/evolution.xml:7410(member)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
-#: ../C/evolution.xml:7448(member)
+#: ../C/evolution.xml:7411(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404·Wyman·Street,·Suite·500"
 
-#: ../C/evolution.xml:7449(member)
+#: ../C/evolution.xml:7412(member)
 msgid "Waltham, MA 02451"
 msgstr "Waltham, MA 02451"
 
-#: ../C/evolution.xml:7450(member)
+#: ../C/evolution.xml:7413(member)
 msgid "U.S.A."
 msgstr "États-Unis"
 
-#: ../C/evolution.xml:7451(member)
+#: ../C/evolution.xml:7414(member)
 msgid "www.novell.com"
 msgstr "www.novell.com"
 
-#: ../C/evolution.xml:7454(para)
+#: ../C/evolution.xml:7417(para)
 msgid "July 2007"
 msgstr "Juillet 2007"
 
-#: ../C/evolution.xml:7456(member)
+#: ../C/evolution.xml:7419(member)
 msgid ""
 "To access the online documentation for this and other Novell products, and "
 "to get updates, see www.novell.com/documentation"
@@ -16010,11 +15754,11 @@ msgstr ""
 "Novell, ainsi que pour obtenir des mises à jour, consultez www.novell.com/"
 "documentation."
 
-#: ../C/evolution.xml:7459(member)
+#: ../C/evolution.xml:7422(member)
 msgid "Evolution is a trademark of Novell, Inc."
 msgstr "Evolution est une marque déposée de Novell, Inc."
 
-#: ../C/evolution.xml:7460(member)
+#: ../C/evolution.xml:7423(member)
 msgid ""
 "GroupWise is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -16022,7 +15766,7 @@ msgstr ""
 "GroupWise est une marque déposée de Novell Inc. aux États-Unis et dans "
 "d'autres pays."
 
-#: ../C/evolution.xml:7461(member)
+#: ../C/evolution.xml:7424(member)
 msgid ""
 "Novell is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -16030,11 +15774,11 @@ msgstr ""
 "Novell est une marque déposée de Novell Inc. aux États-Unis et dans d'autres "
 "pays."
 
-#: ../C/evolution.xml:7462(member)
+#: ../C/evolution.xml:7425(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
 msgstr "SUSE est une marque déposée de SUSE AG, une filiale de Novell."
 
-#: ../C/evolution.xml:7463(member)
+#: ../C/evolution.xml:7426(member)
 msgid ""
 "Ximian is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -16042,9 +15786,10 @@ msgstr ""
 "Ximian est une marque déposée de Novell Inc. aux États-Unis et dans d'autres "
 "pays."
 
-#: ../C/evolution.xml:7466(member)
+#: ../C/evolution.xml:7429(member)
 msgid "All third-party trademarks are the property of their respective owners."
-msgstr "Toutes les marques tierces appartiennent à leurs propriétaires respectifs."
+msgstr ""
+"Toutes les marques tierces appartiennent à leurs propriétaires respectifs."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: ../C/evolution.xml:0(None)
@@ -16052,5 +15797,5 @@ msgid "translator-credits"
 msgstr ""
 "Marc Lorber <Linux-Lorber@club-internet.fr>, 2006.\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>, 2007.\n"
-"Claude Paroz <claude@2xlibre.net>, 2007."
+"Claude Paroz <claude@2xlibre.net>, 2007-2008."
 
diff --git a/help/quickref/C/quickref.tex b/help/quickref/C/quickref.tex
index 2fbd15f4fa..83cc156e6b 100644
--- a/help/quickref/C/quickref.tex
+++ b/help/quickref/C/quickref.tex
@@ -48,7 +48,7 @@
 		\textit{\textbf{Components}}		&					\\
 		Mail					& \textbf{Ctrl+1}			\\
 		Contacts				& \textbf{Ctrl+2}			\\
-		Calendar				& \textbf{Ctrl+3}			\\
+		Calendars				& \textbf{Ctrl+3}			\\
 		Tasks					& \textbf{Ctrl+4}			\\
 		\vspace{1.5mm}
 		Memos					& \textbf{Ctrl+5}			\\
@@ -67,7 +67,7 @@
 		Move mail/contacts to folder		& \textbf{Shift+Ctrl+V}			\\
 		Copy mail/contacts to folder		& \textbf{Shift+Ctrl+Y}			\\
 	\end{tabular*}
-	\section*{Contacts/Memo Components}
+	\section*{Contacts/Memos Components}
 	\begin{tabular*}{4in}{rp{1.5in}}
 		\textit{\textbf{General Commands}}	&					\\
 		New contact				& \textbf{Shift+Ctrl+C}			\\
@@ -97,7 +97,7 @@
 		Scroll up				& \textbf{Backspace}			\\
 		Scroll down				& \textbf{Space}			\\
 	\end{tabular*}
-	\section*{Calendar/Task Components}
+	\section*{Calendars/Tasks Components}
 	\begin{tabular*}{4in}{rp{1.5in}}
 		\textit{\textbf{General Commands}}	&					\\
 		New appointment				& \textbf{Shift+Ctrl+A}			\\
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0c5bc2e60c..84f7066075 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,246 @@
+2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #546788
+
+	* em-folder-view.c: "/commands/ViewNormal" isn't actually used. It is
+	probably a leftover from a previous way of setting the formatting
+	style. It can be removed. Related cleanups.
+
+2008-08-06  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #546668
+
+	* em-format-html.c: Drop a (pointless) define used only once.
+	* em-format-html-display.c: Drop one unused define.
+
+2008-08-07  Matthew Barnes  <mbarnes@redhat.com>
+
+	* em-format.c (emf_format_secure):
+	* em-format-html-display.c (efhd_xpkcs7mime_add_cert_table):
+	Use CamelDList instead of EDList.
+
+2008-08-06  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #249844
+
+	* em-event.h: (struct _EMEventTargetCustomIcon): Declare 'folder_name'
+	as const char * to let compiler happy; no copy of the pointer anyway.
+	* mail-component.c: (impl__get_userCreatableItems):
+	Do not let compiler claim.
+
+2008-08-05  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* mail/message-list.c: Fix a performance issue, where we can just go
+	by the presence than the exact count.
+
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	* em-migrate.c (migrate_to_db):
+	* em-network-prefs.c (notify_proxy_type_changed),
+	(widget_entry_changed_cb):
+	* em-subscribe-editor.c (sub_fill_level), (sub_queue_fill_level),
+	(sub_row_expanded):
+	* mail-vfolder.c:
+	Use G_STRLOC or G_STRFUNC instead of deprecated
+	G_GNUC_PRETTY_FUNCTION.
+
+2008-08-04  Paul Bolle <pebolle@tiscali.nl>
+
+	** Fix for bug #543058
+
+	* em-folder-properties.c (emfp_dialog_got_folder_quota):
+	* mail-component.c (view_changed): Replace three occurrences of
+	INBOX in the GUI code with Inbox. INBOX is a written in all caps
+	because that is the way it is used in the IMAP protocol. There's
+	little reason to use it in the GUI. Inbox is properly capitalized and
+	can be localized too.
+
+2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Further fix for bug #539268
+
+	* em-format.c (em_format_describe_part): Do not append description 
+	if it is just an empty string.
+
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* em-folder-tree.c (render_display_name):
+	* mail-component.c (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
+2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fixes bug #537088
+
+	* em-format-html.c: (efh_format_headers): Break out of the loop rather
+	that return from this function when running into an empty From: or
+	Sender: header.
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #514006
+
+	* apps-evolution-mail-notification.schemas.in:
+	Quote literal values.
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #544859
+
+	* evolution-mail.schemas.in:
+	Clarify description of "sync_interval" key.
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #545820
+
+	* mail-ops.c (save_messages_desc): Fix a typo. (Nicolas Kaiser)
+
+2008-07-31  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #545436
+
+	* mail/message-list.c: Check the info before accessing it.
+
+2008-07-30  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #500389
+
+	* em-account-editor.c: (emae_option_options_changed),
+	(emae_option_options), (emae_receive_options_extra_item):
+	New ability to define Options (ComboBox) in provider's options.
+
+2008-07-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* mail/em-folder-tree.c: Kill a compilation warning.
+
+2008-07-28  Lucian Langa  <lucilanga@gnome.org>
+
+	* mail/mail-config.glade:
+	Corrected string "Prompt on sending HTML.."
+
+2008-07-28  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #543532
+
+	* em-folder-tree-model.c: (em_folder_tree_model_remove_store_info):
+	Let free memory when we are done with it, not before.
+
+2008-07-28  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #256540
+
+	* mail-dialogs.glade: (message_security_dialog):
+	Do not use GtkNotebook with only one tab.
+
+2008-07-28  Lucian Langa  <lucilanga@gnome.org>
+
+	* mail/mail-config.glade:
+	** See bug #504417: Preferences windows
+	cut off
+
+2008-07-28 Jeff Cai <jeff.cai@sun.com> 
+
+	* em-migrate.c: (migrate_to_db):
+	* em-network-prefs.c: (notify_proxy_type_changed),
+	(widget_entry_changed_cb):
+    Use G_GNUC_PRETTY_FUNCTION instead of __PRETTY__FUNCTION
+
+2008-07-27  Lucian Langa <lucilanga@gnome.org>
+
+	* mail/em-event.h (struct _EMEventTargetCustomIcon):
+	* mail/em-event.c (em_event_target_new_custom_icon):
+	* mail/em-folder-tree.c (render_pixbuf):
+	** See bug #544969: Added the hook for folder
+	custom icon.
+
+2008-07-28  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #543411
+
+	* mail/em-folder-tree-model.c: Dont load known folders.
+	* mail/em-folder-tree.c: Move iter to the last entry.
+
+2008-07-25  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* mail/em-folder-browser.c: Make show unread/etc work well.
+
+2008-07-24  Sankar P  <psankar@novell.com>
+
+	* em-folder-browser.c (get_view_query):
+	Search by Labels.
+
+2008-07-24  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* mail/em-folder-browser.c: Revert Sankar's search hacks.
+
+2008-07-22  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #544022
+
+	* e-searching-tokenizer.c: (dump_trie):
+	Define function only when required. (Compiler warning cleanup.)
+
+2008-07-21  Tor Lillqvist  <tml@novell.com>
+
+	* em-migrate.c: Rearrange G_OS_WIN32 ifdefs a bit, as we need to
+	compile more of this file to support upgrade attempts from 2.12
+	and later.
+	(migrate_folders): Guard against camel_store_get_folder()
+	returning NULL, which happened at least for me. It was for a
+	partially broken GroupWise folder structure on disk, so that is a
+	case of garbage in--garbage out I guess, but it can't hurt to be
+	careful...
+
+2008-07-21  Bharath Acharya  <abharath@novell.com>
+
+	Fixed some compiler warnings for Templates specific hunk.
+
+	* em-composer-utils.c: (edit_message):
+
+2008-07-20  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #200147
+	Added basic Template support
+
+	* em-composer-utils.c (edit_message), (em_utils_edit_message): Modified 
+	to suit it better for plugins to use it. And added support for template 
+	placeholders to be replaced in the messages.
+	* em-composer-utils.h:
+	* em-folder-tree.c (is_special_local_folder):
+	* em-folder-utils.c (emfu_is_special_local_folder):
+	* em-folder-view.c (em_folder_view_open_selected):
+	* em-utils.c (em_utils_folder_is_templates):
+	* em-utils.h:
+	* mail-component.c:
+	* mail-component.h:
+
+2008-07-16  Sankar P  <psankar@novell.com>
+
+	Pushing disk summary changes from the madagascar branch
+
+	* em-folder-browser.c (get_view_query):
+	* em-folder-view.c (emfv_enable_menus):
+	* mail-ops.c (refresh_folder_exec):
+	* message-list.c (regen_list_exec):
+
+2008-07-09  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #269152
+
+	* em-format-quote.c: (emfq_format_header):
+	* em-format-html.c: (efh_format_headers):
+	Use X-MimeOLE as Mailer header when there's nothing better available.
+
+2008-07-09  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #228725
+
+	* message-list.c: (mail_regen_list): Update empty message on regen.
+
 2008-07-09  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #207802 (Patch suggested by Veerapuram Varadhan.)
diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index 8df4fc2afa..98eba23c39 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -34,9 +34,9 @@
     <oaf_attribute name="evolution:button_label" type="string" _value="Mail"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string" _value="Mail"/>
     <oaf_attribute name="evolution:button_sort_order" type="string" value="-10"/>
-    <oaf_attribute name="evolution:button_icon" type="string" value="stock_mail"/>
+    <oaf_attribute name="evolution:button_icon" type="string" value="evolution-mail"/>
 
-    <oaf_attribute name="evolution:component_icon" type="string" value="stock_mail"/>
+    <oaf_attribute name="evolution:component_icon" type="string" value="evolution-mail"/>
     <oaf_attribute name="evolution:component_display_order" type="number" value="1"/>
 
     <oaf_attribute name="evolution:uri_schemas" type="stringv">
@@ -59,7 +59,7 @@
 		   _value="Evolution Mail component"/>
 
     <oaf_attribute name="evolution:shell_component_icon" type="string"
-		   value="stock_mail"/>
+		   value="evolution-mail"/>
     <oaf_attribute name="evolution:shell_component_launch_order" type="number"
 		   value="1"/>
   </oaf_server>
@@ -177,7 +177,7 @@
 		   _value="Configure your network connection settings here"/>
 
     <oaf_attribute name="evolution2:config_item:icon_name" type="string"
-		   value="stock_proxy"/>
+		   value="preferences-system-network-proxy"/>
     
     <oaf_attribute name="evolution2:config_item:priority" type="string" value="-8"/>
     
diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c
index 2880a9461a..1b603acd90 100644
--- a/mail/e-searching-tokenizer.c
+++ b/mail/e-searching-tokenizer.c
@@ -224,6 +224,8 @@ struct _trie {
 	EMemChunk *match_chunks;
 };
 
+/* will be enabled only if debug is enabled */
+#if d(1) -1 != -1
 static void
 dump_trie(struct _state *s, int d)
 {
@@ -242,6 +244,7 @@ dump_trie(struct _state *s, int d)
 		m = m->next;
 	}
 }
+#endif
 
 /* This builds an Aho-Corasick search trie for a set of utf8 words */
 /* See
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 3885b89447..5e691c71fa 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2020,6 +2020,96 @@ emae_option_checkspin(EMAccountEditorService *service, CamelURL *url, const char
 	return hbox;
 }
 
+static void
+emae_option_options_changed (GtkComboBox *options, EMAccountEditorService *service)
+{
+	const char *name = g_object_get_data (G_OBJECT (options), "option-name");
+	char *value = NULL;
+	CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key);
+	int id = gtk_combo_box_get_active (options);
+
+	if (id != -1) {
+		GtkTreeModel *model;
+		GtkTreeIter iter;
+
+		model = gtk_combo_box_get_model (options);
+		if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) {
+			gtk_tree_model_get (model, &iter, 0, &value, -1);
+		}
+	}
+
+	camel_url_set_param (url, name, value);
+	emae_uri_changed (service, url);
+	camel_url_free (url);
+	g_free (value);
+}
+
+/* 'values' is in format "value0:caption0:value2:caption2:...valueN:captionN" */
+static GtkWidget *
+emae_option_options (EMAccountEditorService *service, CamelURL *url, const char *name, const char *values, GtkWidget *l)
+{
+	GtkComboBox *w;
+	GtkListStore *store;
+	GtkTreeIter iter;
+	const char *p, *value, *caption;
+	GtkCellRenderer *cell;
+	int active = 0; /* the first item entered is always a default item */
+	int i;
+	const char *val = camel_url_get_param (url, name);
+
+	w = GTK_COMBO_BOX (gtk_combo_box_new ());
+
+	/* value and caption */
+	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+
+	p = values;
+	for (p = values, i = 0; p; i++) {
+		char *vl, *cp;
+
+		value = p;
+		caption = strchr (p, ':');
+		if (caption) {
+			caption++;
+		} else {
+			g_warning (G_STRLOC ": expected ':' not found at '%s'", p);
+			break;
+		}
+		p = strchr (caption, ':');
+
+		vl = g_strndup (value, caption - value - 1);
+		if (p) {
+			p++;
+			cp = g_strndup (caption, p - caption - 1);
+		} else
+			cp = g_strdup (caption);
+
+		gtk_list_store_append (store, &iter);
+		gtk_list_store_set (store, &iter, 0, vl, 1, dgettext (service->provider->translation_domain, cp), -1);
+
+		if (val && g_ascii_strcasecmp (val, vl) == 0)
+			active = i;
+
+		g_free (vl);
+		g_free (cp);
+	}
+
+	gtk_combo_box_set_model (w, (GtkTreeModel *)store);
+	gtk_combo_box_set_active (w, i > 0 ? active : -1);
+
+	cell = gtk_cell_renderer_text_new ();
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (w), cell, TRUE);
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (w), cell, "text", 1, NULL);
+
+	gtk_widget_show (GTK_WIDGET (w));
+
+	gtk_label_set_mnemonic_widget (GTK_LABEL (l), GTK_WIDGET (w));
+
+	g_object_set_data (G_OBJECT (w), "option-name", (void *)name);
+	g_signal_connect (w, "changed", G_CALLBACK (emae_option_options_changed), service);
+
+	return GTK_WIDGET (w);
+}
+
 static GtkWidget *
 emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
 {
@@ -2062,7 +2152,7 @@ emae_receive_options_extra_item(EConfig *ec, EConfigItem *eitem, struct _GtkWidg
 {
 	EMAccountEditor *emae = data;
 	struct _receive_options_item *item = (struct _receive_options_item *)eitem;
-	GtkWidget *w, *l;
+	GtkWidget *w, *l, *h;
 	CamelProviderConfEntry *entries;
 	GtkWidget *depw;
 	GSList *depl = NULL, *n;
@@ -2151,6 +2241,20 @@ section:
 				depl = g_slist_prepend(depl, w);
 			row++;
 			break;
+		case CAMEL_PROVIDER_CONF_OPTIONS:
+			h = gtk_hbox_new (FALSE, 4);
+			gtk_widget_show (h);
+			l = g_object_new (gtk_label_get_type (), "label", entries[i].text, "xalign", 0.0, "use_underline", TRUE, NULL);
+			gtk_widget_show (l);
+			w = emae_option_options (service, url, entries[i].name, entries[i].value, l);
+			gtk_box_pack_start (GTK_BOX (h), l, FALSE, FALSE, 0);
+			gtk_box_pack_start (GTK_BOX (h), w, FALSE, FALSE, 0);
+			gtk_table_attach ((GtkTable *)parent, h, 0, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+			if (depw) {
+				depl = g_slist_prepend (depl, h);
+			}
+			row++;
+			break;
 		default:
 			break;
 		}
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 257d66c486..8ae537ad7c 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -68,6 +68,8 @@
 #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0)
 #endif
 
+#define GCONF_KEY_TEMPLATE_PLACEHOLDERS "/apps/evolution/mail/template_placeholders"
+
 static EAccount * guess_account (CamelMimeMessage *message, CamelFolder *folder);
 
 struct emcs_t {
@@ -808,8 +810,143 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 {
 	EMsgComposer *composer;
 
+	/* Template specific code follows. */
+	if (em_utils_folder_is_templates(drafts, NULL) == TRUE) {
+		/* retrieve the message from the CamelFolder */
+		CamelDataWrapper *content;
+		CamelStream *mem;
+		CamelContentType *type;
+		CamelMimePart *mime_part = CAMEL_MIME_PART (message);
+		CamelDataWrapper *mail_text;
+		CamelMultipart *body = camel_multipart_new ();
+		CamelStream *stream;		
+		CamelMimePart *part;
+		int count1 = 0, string_changed = 0;
+
+		char *str;
+		gint count = 2;
+
+		content = camel_medium_get_content_object ((CamelMedium *) message);
+		if (!content)
+			return;
+
+		/*
+		 * Get non-multipart content from multipart message.
+		 */
+		while (CAMEL_IS_MULTIPART (content) && count > 0)
+		{
+			mime_part = camel_multipart_get_part (CAMEL_MULTIPART (content), 0);
+			content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+			count--;
+		}
+
+		if (!mime_part)
+			return;
+
+		type = camel_mime_part_get_content_type (mime_part);
+		if (!camel_content_type_is (type, "text", "plain"))
+			return;
+
+		mem = camel_stream_mem_new ();
+		camel_data_wrapper_decode_to_stream (content, mem);
+
+		str = g_strndup ((const gchar*)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
+		camel_object_unref (mem);
+
+		const char *cur = str;
+		int i;
+		for (i = 0; i < strlen(str); i++) {
+			if (!g_ascii_strncasecmp (cur, "$", 1)) {
+				const char *end = cur, *check_env;
+				char *out;
+				GConfClient *gconf;
+				GSList *clue_list = NULL, *list;
+
+				gconf = gconf_client_get_default ();
+
+				while (*end && !g_unichar_isspace (*end) && (*end != '"'))
+					end++;
+
+				out = g_strndup ((const gchar *) cur, end - cur);
+				check_env = out;
+
+				char **temp_str = g_strsplit (str, out, 2);
+
+				/* Get the list from gconf */
+				clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL );
+
+				g_object_unref (gconf);
+
+				for (list = clue_list; list; list = g_slist_next (list)) {
+					char **temp = g_strsplit (list->data, "=", 2);
+					if (!g_ascii_strcasecmp(temp[0], out+1)) {
+						str = g_strdup_printf("%s%s%s", temp_str[0], temp[1], temp_str[1]);
+						cur = str + i;
+						count1 = 1;
+						string_changed = 1;
+					}
+					else
+						count1 = 0;
+					g_strfreev(temp);
+				}
+
+				if (clue_list) {
+					g_slist_foreach (clue_list, (GFunc) g_free, NULL);
+					g_slist_free (clue_list);
+				}
+
+				if (!count1) {
+					if (getenv(out+1)) {
+						str = g_strdup_printf("%s%s%s", temp_str[0], getenv(out + 1), temp_str[1]);
+						cur = str + i;
+						count1 = 1;
+						string_changed = 1;
+					}
+					else
+						count1 = 0;
+				}
+
+				g_strfreev(temp_str);
+			}	
+			else 
+				cur++;
+		}
+
+		if (string_changed) {
+
+			/* Create toplevel container */
+			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (body),
+					"multipart/alternative;");
+			camel_multipart_set_boundary (body, NULL);
+
+			stream = camel_stream_mem_new ();
+
+			mail_text = camel_data_wrapper_new ();
+			camel_data_wrapper_set_mime_type_field (mail_text, type);
+			
+			camel_stream_printf (stream, "%s", g_strdup(str));
+
+			camel_data_wrapper_construct_from_stream (mail_text, stream);
+			camel_object_unref (stream);
+
+			part = camel_mime_part_new ();
+			camel_medium_set_content_object (CAMEL_MEDIUM (part), mail_text);
+			camel_object_unref (mail_text);
+			camel_multipart_add_part (body, part);
+			camel_object_unref (part);
+
+			/* Finish creating the message */
+			camel_medium_set_content_object (CAMEL_MEDIUM (message), CAMEL_DATA_WRAPPER(body));
+			camel_object_unref (body);
+		}
+	}
+		
 	composer = e_msg_composer_new_with_message (message);
-	em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, drafts, uid);
+	
+	if (em_utils_folder_is_templates(drafts, NULL) == TRUE) 
+		em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, NULL, NULL);
+	else
+		em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, drafts, uid);
 
 	composer_set_no_change (composer, TRUE);
 
@@ -819,16 +956,20 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 /**
  * em_utils_edit_message:
  * @message: message to edit
+ * @folder: used to recognize the templates folder
  *
  * Opens a composer filled in with the headers/mime-parts/etc of
  * @message.
  **/
 void
-em_utils_edit_message (CamelMimeMessage *message)
+em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder)
 {
 	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
 
-	edit_message (message, NULL, NULL);
+	if (folder)
+		edit_message (message, folder, NULL);
+	else
+		edit_message (message, NULL, NULL);	
 }
 
 static void
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index 147fb41049..cee813fc8f 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -51,7 +51,7 @@ void em_utils_compose_new_message_with_mailto (const char *url, const char *from
 void em_utils_post_to_folder (struct _CamelFolder *folder);
 void em_utils_post_to_url (const char *url);
 
-void em_utils_edit_message (struct _CamelMimeMessage *message);
+void em_utils_edit_message (struct _CamelMimeMessage *message, struct _CamelFolder *folder);
 void em_utils_edit_messages (struct _CamelFolder *folder, GPtrArray *uids, gboolean replace);
 
 void em_utils_forward_attached (struct _CamelFolder *folder, GPtrArray *uids, const char *fromuri);
diff --git a/mail/em-event.c b/mail/em-event.c
index ec72d4ccc5..2ce8d8afc0 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -189,6 +189,18 @@ em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data,
 	return t;
 }
 
+EMEventTargetCustomIcon *
+em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const char *folder_name, guint32 flags)
+{
+	EMEventTargetCustomIcon *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_CUSTOM_ICON, sizeof(*t));
+
+	t->renderer = renderer;
+	t->folder_name = folder_name;
+	t->target.mask = ~flags;
+
+	return t;
+}
+
 /* ********************************************************************** */
 
 static void *emeh_parent_class;
@@ -215,11 +227,16 @@ static const EEventHookTargetMask emeh_send_receive_masks[] = {
 	{ NULL }
 };
 
+static const EEventHookTargetMask emeh_custom_icon_masks[] = {
+	{ "customicon", EM_EVENT_CUSTOM_ICON },
+	{ NULL }
+};
 static const EEventHookTargetMap emeh_targets[] = {
 	{ "folder", EM_EVENT_TARGET_FOLDER, emeh_folder_masks },
 	{ "message", EM_EVENT_TARGET_MESSAGE, emeh_message_masks },
 	{ "composer", EM_EVENT_TARGET_COMPOSER, emeh_composer_masks},
 	{ "sendreceive", EM_EVENT_TARGET_SEND_RECEIVE, emeh_send_receive_masks},
+	{ "customicon", EM_EVENT_TARGET_CUSTOM_ICON, emeh_custom_icon_masks},
 	{ NULL }
 };
 
diff --git a/mail/em-event.h b/mail/em-event.h
index d8e93f1b34..6b35547084 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -46,6 +46,7 @@ enum _em_event_target_t {
 	EM_EVENT_TARGET_MESSAGE,
 	EM_EVENT_TARGET_COMPOSER,
 	EM_EVENT_TARGET_SEND_RECEIVE,
+	EM_EVENT_TARGET_CUSTOM_ICON,
 };
 
 /* Flags that describe TARGET_FOLDER */
@@ -68,6 +69,11 @@ enum {
 	EM_EVENT_SEND_RECEIVE = 1<< 0,
 };
 
+/* Flags that describe TARGET_CUSTOM_ICON*/
+enum {
+	EM_EVENT_CUSTOM_ICON = 1<< 0,
+};
+
 typedef struct _EMEventTargetFolder EMEventTargetFolder;
 
 struct _EMEventTargetFolder {
@@ -105,6 +111,14 @@ struct _EMEventTargetSendReceive {
 	int row;
 };
 
+typedef struct _EMEventTargetCustomIcon EMEventTargetCustomIcon;
+
+struct _EMEventTargetCustomIcon {
+	EEventTarget target;
+
+	GtkCellRenderer *renderer;
+	const char 	*folder_name;
+};
 
 typedef struct _EEventItem EMEventItem;
 
@@ -127,6 +141,7 @@ EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const char *uri, g
 EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags);
 EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *uid, guint32 flags);
 EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, int row, guint32 flags);
+EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const char *uri, guint32 flags);
 
 /* ********************************************************************** */
 
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index ce17ea2f54..5871cfc4cc 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -877,7 +877,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri)
 		view_sexp = "(match-all (not (system-flag  \"Seen\")))";
 		break;
 	case VIEW_READ_MESSAGES:
-		view_sexp = "(match-all (system-flag  \"Seen\"))";
+		view_sexp = "(match-all (system-flag  \"Seen\" ))";
 		break;
         case VIEW_RECENT_MESSAGES:
 		if (!em_utils_folder_is_sent (folder, folder_uri))
@@ -892,7 +892,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri)
 			view_sexp = " (match-all (> (get-sent-date) (- (get-current-date) 432000)))";
 		break;
         case VIEW_WITH_ATTACHMENTS:
-		view_sexp = "(match-all (system-flag \"Attachments\"))";
+		view_sexp = "(match-all (system-flag \"Attachments\" ))";
 		break;
 	case VIEW_NOT_JUNK:
 		view_sexp = "(match-all (not (system-flag \"junk\")))";
@@ -925,7 +925,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri)
 		duplicate = FALSE;
 		break;
 	case VIEW_MESSAGES_MARKED_AS_IMPORTANT:
-		view_sexp = "(match-all (system-flag  \"Flagged\"))";
+		view_sexp = "(match-all (system-flag  \"Flagged\" ))";
 		break;
 	case VIEW_ANY_FIELD_CONTAINS:
 		break;
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 34be92221a..506522750b 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -351,7 +351,8 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota,
 			}
 			emfp_items_translated = TRUE;
 		}
-	}
+	} else if (!strcmp(prop_data->name, "INBOX"))
+		emfp_items[EMFP_FOLDER_SECTION].label = _("Inbox");
 	else
 		emfp_items[EMFP_FOLDER_SECTION].label = prop_data->name;
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index ce6e15a851..eb6191199e 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -448,6 +448,10 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite
 	const char *name;
 	guint32 flags;
 
+	/* make sure we don't already know about it? */
+	if (g_hash_table_lookup (si->full_hash, fi->full_name))
+		return;
+	
 	if (!fully_loaded)
 		load = fi->child == NULL && !(fi->flags & (CAMEL_FOLDER_NOCHILDREN | CAMEL_FOLDER_NOINFERIORS));
 
@@ -878,8 +882,9 @@ em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *st
 	if (!(si = g_hash_table_lookup (model->store_hash, store)))
 		return;
 
-	g_hash_table_remove (model->store_hash, si->store);
 	g_hash_table_remove (model->account_hash, si->account);
+	/* store_hash owns and frees the si structure, thus free it after done with it */
+	g_hash_table_remove (model->store_hash, si->store);
 }
 
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index ea108daad6..e7cbd0c75b 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -72,6 +72,7 @@
 #include "em-folder-selector.h"
 #include "em-folder-selection.h"
 #include "em-folder-properties.h"
+#include "em-event.h"
 
 #define d(x)
 
@@ -285,6 +286,8 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
 	GdkPixbuf *pixbuf = NULL;
 	gboolean is_store;
 	guint32 flags;
+	EMEventTargetCustomIcon *target;
+	const char *folder_name;
 
 	if (!initialised) {
 		folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU);
@@ -326,8 +329,14 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
 				pixbuf = folder_icons[FOLDER_ICON_SHARED_BY_ME];
 			else if (flags & CAMEL_FOLDER_VIRTUAL)
 				pixbuf = folder_icons[FOLDER_ICON_VIRTUAL];
-			else
+			else {
 				pixbuf = folder_icons[FOLDER_ICON_NORMAL];
+				g_object_set (renderer, "pixbuf", pixbuf, "visible", !is_store, NULL);
+				gtk_tree_model_get (model, iter, COL_STRING_FULL_NAME, &folder_name, -1);
+				target = em_event_target_new_custom_icon (em_event_peek(), renderer, folder_name, EM_EVENT_CUSTOM_ICON);
+     				e_event_emit ((EEvent *)em_event_peek (), "folder.customicon", (EEventTarget *) target);
+				return;
+			}
 		}
 	}
 
@@ -368,7 +377,7 @@ render_display_name (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
 		 * Do not translate the "folder-display|" part. Remove it
 		 * from your translation.
 		 */
-		display = g_strdup_printf (Q_("folder-display|%s (%u)"), name, unread);
+		display = g_strdup_printf (C_("folder-display", "%s (%u)"), name, unread);
 		g_free (name);
 	} else
 		display = name;
@@ -1087,7 +1096,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y
 static gboolean
 is_special_local_folder (const char *name)
 {
-	return (!strcmp (name, "Drafts") || !strcmp (name, "Inbox") || !strcmp (name, "Outbox") || !strcmp (name, "Sent"));
+	return (!strcmp (name, "Drafts") || !strcmp (name, "Inbox") || !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates"));
 }
 
 static GdkAtom
@@ -1724,7 +1733,7 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m)
 {
 	struct _EMFolderTreePrivate *priv = m->emft->priv;
 	struct _EMFolderTreeModelStoreInfo *si;
-	GtkTreeIter root, iter;
+	GtkTreeIter root, iter, titer;
 	CamelFolderInfo *fi;
 	GtkTreeStore *model;
 	GtkTreePath *path;
@@ -1766,6 +1775,13 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m)
 	/* get the first child (which will be a dummy node) */
 	gtk_tree_model_iter_children ((GtkTreeModel *) model, &iter, &root);
 
+	/* Traverse to the last valid iter */
+	titer = iter;
+	while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) 
+		titer = iter; /* Preserve the last valid iter */
+
+	iter = titer;
+
 	/* FIXME: camel's IMAP code is totally on crack here, @top's
 	 * folder info should be @fi and fi->child should be what we
 	 * want to fill our tree with... *sigh* */
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index aae43e2441..551d14bcec 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -81,7 +81,7 @@ extern CamelSession *session;
 static gboolean
 emfu_is_special_local_folder (const char *name)
 {
-	return (!strcmp (name, "Drafts") || !strcmp (name, "Inbox") || !strcmp (name, "Outbox") || !strcmp (name, "Sent"));
+	return (!strcmp (name, "Drafts") || !strcmp (name, "Inbox") || !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates"));
 }
 
 struct _EMCopyFolders {
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index c5e6d1047a..7f6ba0898e 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -220,13 +220,6 @@ static const EMFolderViewEnable emfv_enable_map[] = {
 	{ "MailStop", 0 },
 
 	{ NULL },
-
-	/* always enabled
-
-	{ "ViewFullHeaders", IS_0MESSAGE, 0 },
-	{ "ViewNormal",      IS_0MESSAGE, 0 },
-	{ "ViewSource",      IS_0MESSAGE, 0 },
-	{ "CaretMode",       IS_0MESSAGE, 0 }, */
 };
 
 struct _EMFolderViewPrivate {
@@ -520,6 +513,7 @@ em_folder_view_open_selected(EMFolderView *emfv)
 	}
 
         if (em_utils_folder_is_drafts(emfv->folder, emfv->folder_uri)
+	    || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri) 	
 	    || em_utils_folder_is_outbox(emfv->folder, emfv->folder_uri)) {
 		em_utils_edit_messages(emfv->folder, uids, TRUE);
 		return uids->len;
@@ -2209,13 +2203,6 @@ emfv_enable_menus(EMFolderView *emfv)
 	g_string_free(name, TRUE);
 }
 
-/* must match em_format_mode_t order */
-static const char * const emfv_display_styles[] = {
-	"/commands/ViewNormal",
-	"/commands/ViewFullHeaders",
-	"/commands/ViewSource"
-};
-
 static void
 emfv_view_mode(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
 {
@@ -2299,10 +2286,9 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
 		bonobo_ui_component_add_listener(uic, "CaretMode", emfv_caret_mode, emfv);
 
 		style = ((EMFormat *)emfv->preview)->mode?EM_FORMAT_ALLHEADERS:EM_FORMAT_NORMAL;
-		bonobo_ui_component_set_prop(uic, emfv_display_styles[style], "state", style?"1":"0", NULL);
-		/*		bonobo_ui_component_add_listener(uic, "ViewNormal", emfv_view_mode, emfv); */
+		if (style)
+			bonobo_ui_component_set_prop(uic, "/commands/ViewFullHeaders", "state", "1", NULL);
 		bonobo_ui_component_add_listener(uic, "ViewFullHeaders", emfv_view_mode, emfv);
-		/*		bonobo_ui_component_add_listener(uic, "ViewSource", emfv_view_mode, emfv); */
 		em_format_set_mode((EMFormat *)emfv->preview, style);
 
 		if (emfv->folder)
@@ -2647,7 +2633,7 @@ emfv_list_double_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent
 	/* Ignore double-clicks on columns that handle thier own state */
 	if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col))
 		return;
-
+	
 	em_folder_view_open_selected(emfv);
 }
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index d34f08a837..36b7e74cf6 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -100,8 +100,6 @@
 
 #define d(x)
 
-#define EFHD_TABLE_OPEN "<table>"
-
 struct _EMFormatHTMLDisplayPrivate {
 	/* For the interactive search dialogue */
 	/* TODO: Should this be more subtle, like the mozilla one? */
@@ -1030,10 +1028,10 @@ efhd_xpkcs7mime_viewcert_clicked(GtkWidget *button, struct _smime_pobject *po)
 #endif
 
 static void
-efhd_xpkcs7mime_add_cert_table(GtkWidget *vbox, EDList *certlist, struct _smime_pobject *po)
+efhd_xpkcs7mime_add_cert_table(GtkWidget *vbox, CamelDList *certlist, struct _smime_pobject *po)
 {
 	CamelCipherCertInfo *info = (CamelCipherCertInfo *)certlist->head;
-	GtkTable *table = (GtkTable *)gtk_table_new(e_dlist_length(certlist), 2, FALSE);
+	GtkTable *table = (GtkTable *)gtk_table_new(camel_dlist_length(certlist), 2, FALSE);
 	int n = 0;
 
 	while (info->next) {
@@ -1135,7 +1133,7 @@ efhd_xpkcs7mime_validity_clicked(GtkWidget *button, EMFormatHTMLPObject *pobject
 		gtk_box_pack_start((GtkBox *)vbox, w, TRUE, TRUE, 6);
 	}
 
-	if (!e_dlist_empty(&po->valid->sign.signers))
+	if (!camel_dlist_empty(&po->valid->sign.signers))
 		efhd_xpkcs7mime_add_cert_table(vbox, &po->valid->sign.signers, po);
 
 	gtk_widget_show_all(vbox);
@@ -1167,7 +1165,7 @@ efhd_xpkcs7mime_validity_clicked(GtkWidget *button, EMFormatHTMLPObject *pobject
 		gtk_box_pack_start((GtkBox *)vbox, w, TRUE, TRUE, 6);
 	}
 
-	if (!e_dlist_empty(&po->valid->encrypt.encrypters))
+	if (!camel_dlist_empty(&po->valid->encrypt.encrypters))
 		efhd_xpkcs7mime_add_cert_table(vbox, &po->valid->encrypt.encrypters, po);
 
 	gtk_widget_show_all(vbox);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 5c76c5e861..bb2d176b6e 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -84,7 +84,6 @@
 
 #define d(x)
 
-#define EFH_TABLE_OPEN "<table>"
 #define EFM_MESSAGE_START_ANAME "evolution#message#start"
 #define EFH_MESSAGE_START "<A name=\"" EFM_MESSAGE_START_ANAME "\"></A>"
 
@@ -1868,7 +1867,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 			GString *html;
 
 			if (!(addrs = camel_header_address_decode (header->value, hdr_charset)))
-				return;
+				break;
 
 			html = g_string_new("");
 			name = efh_format_address(efh, html, addrs, header->name);
@@ -1883,7 +1882,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 			GString *html;
 
 			if (!(addrs = camel_header_address_decode (header->value, hdr_charset)))
-				return;
+				break;
 
 			html = g_string_new("");
 			name = efh_format_address(efh, html, addrs, header->name);
@@ -1942,15 +1941,30 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 
 				if (!mailer_shown && mailer && (!g_ascii_strcasecmp (header->name, "X-Mailer") ||
 								!g_ascii_strcasecmp (header->name, "User-Agent") ||
-								!g_ascii_strcasecmp (header->name, "X-Newsreader"))) {
-					struct _camel_header_raw xmailer;
+								!g_ascii_strcasecmp (header->name, "X-Newsreader") ||
+								!g_ascii_strcasecmp (header->name, "X-MimeOLE"))) {
+					struct _camel_header_raw xmailer, *use_header = NULL;
+
+					if (!g_ascii_strcasecmp (header->name, "X-MimeOLE")) {
+						for (use_header = header->next; use_header; use_header = use_header->next) {
+							if (!g_ascii_strcasecmp (use_header->name, "X-Mailer") ||
+							    !g_ascii_strcasecmp (use_header->name, "User-Agent") ||
+							    !g_ascii_strcasecmp (use_header->name, "X-Newsreader")) {
+								/* even we have X-MimeOLE, then use rather the standard one, when available */
+								break;
+							}
+						}
+					}
+
+					if (!use_header)
+						use_header = header;
 
 					xmailer.name = "X-Evolution-Mailer";
-					xmailer.value = header->value;
+					xmailer.value = use_header->value;
 					mailer_shown = TRUE;
 
 					efh_format_header (emf, stream, part, &xmailer, h->flags, charset);
-					if (strstr(header->value, "Evolution"))
+					if (strstr(use_header->value, "Evolution"))
 						have_icon = TRUE;
 				} else if (!g_ascii_strcasecmp (header->name, "Face") && !face_decoded) {
 					char *cp = header->value;
@@ -2086,7 +2100,7 @@ static void efh_format_source(EMFormat *emf, CamelStream *stream, CamelMimePart
 	camel_stream_filter_add(filtered_stream, html_filter);
 	camel_object_unref(html_filter);
 
-	camel_stream_write_string((CamelStream *)stream, EFH_TABLE_OPEN "<tr><td><tt>");
+	camel_stream_write_string((CamelStream *)stream, "<table><tr><td><tt>");
 	em_format_format_text(emf, (CamelStream *)filtered_stream, dw);
 	camel_object_unref(filtered_stream);
 
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index f7427eb284..804eead5fd 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -343,7 +343,9 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const
 	} else if (!strcmp (name, "X-Evolution-Mailer")) { /* pseudo-header */
 		if (!(txt = camel_medium_get_header (part, "x-mailer")))
 			if (!(txt = camel_medium_get_header (part, "user-agent")))
-				return;
+				if (!(txt = camel_medium_get_header (part, "x-newsreader")))
+					if (!(txt = camel_medium_get_header (part, "x-mimeole")))
+						return;
 		
 		txt = value = camel_header_format_ctext (txt, charset);
 		
diff --git a/mail/em-format.c b/mail/em-format.c
index eaa0d77185..483b86cf34 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -735,7 +735,7 @@ emf_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel
 	if (emf->valid == NULL) {
 		emf->valid = valid;
 	} else {
-		e_dlist_addtail(&emf->valid_parent->children, (EDListNode *)valid);
+		camel_dlist_addtail(&emf->valid_parent->children, (CamelDListNode *)valid);
 		camel_cipher_validity_envelope(emf->valid_parent, valid);
 	}
 
@@ -1159,6 +1159,7 @@ em_format_describe_part(CamelMimePart *part, const char *mime_type)
 	if ((filename = camel_mime_part_get_filename (part)))
 		g_string_append_printf(stext, " (%s)", filename);
 	if ((description = camel_mime_part_get_description(part)) &&
+		(*description != 0) &&
 		!(filename && (strcmp(filename, description) == 0)))
 		g_string_append_printf(stext, ", \"%s\"", description);
 
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 6fa53646e8..07e9c1cdab 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -67,16 +67,19 @@
 #include "e-util/e-util-private.h"
 #include "e-util/e-plugin.h"
 
+#include "mail-component.h"
 #include "mail-config.h"
+#include "mail-session.h"
 #include "em-utils.h"
 #include "em-migrate.h"
 
 #define d(x) x
 
 #ifndef G_OS_WIN32
-
-/* No previous versions have been available on Win32, so don't bother
- * with upgrade support from 1.x on Win32.
+/* No versions previous to 2.8 or thereabouts have been available on
+ * Windows, so don't bother with upgrade support from earlier versions
+ * on Win32. Do try to support upgrades from 2.12 and later to the
+ * current version.
  */
 
 /* upgrade helper functions */
@@ -1189,12 +1192,14 @@ em_migrate_session_new (const char *path)
 }
 
 
+#endif	/* !G_OS_WIN32 */
+
 static GtkWidget *window;
 static GtkLabel *label;
 static GtkProgressBar *progress;
 
 static void
-em_migrate_setup_progress_dialog (void)
+em_migrate_setup_progress_dialog (const char *desc)
 {
 	GtkWidget *vbox, *hbox, *w;
 
@@ -1207,9 +1212,8 @@ em_migrate_setup_progress_dialog (void)
 	gtk_widget_show (vbox);
 	gtk_container_add ((GtkContainer *) window, vbox);
 
-	w = gtk_label_new (_("The location and hierarchy of the Evolution mailbox "
-			     "folders has changed since Evolution 1.x.\n\nPlease be "
-			     "patient while Evolution migrates your folders..."));
+	w = gtk_label_new (desc);
+	
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
 	gtk_widget_show (w);
 	gtk_box_pack_start_defaults ((GtkBox *) vbox, w);
@@ -1240,12 +1244,11 @@ em_migrate_set_folder_name (const char *folder_name)
 {
 	char *text;
 
-	text = g_strdup_printf (_("Migrating `%s':"), folder_name);
+	text = g_strdup_printf (_("Migrating '%s':"), folder_name);
 	gtk_label_set_text (label, text);
 	g_free (text);
 
 	gtk_progress_bar_set_fraction (progress, 0.0);
-
 	while (gtk_events_pending ())
 		gtk_main_iteration ();
 }
@@ -1264,6 +1267,8 @@ em_migrate_set_progress (double percent)
 		gtk_main_iteration ();
 }
 
+#ifndef G_OS_WIN32
+
 static gboolean
 is_mail_folder (const char *metadata)
 {
@@ -1476,10 +1481,8 @@ cp (const char *src, const char *dest, gboolean show_progress, int mode)
 			goto exception;
 
 		total += nwritten;
-#ifndef G_OS_WIN32
 		if (show_progress)
 			em_migrate_set_progress (((double) total) / ((double) st.st_size));
-#endif
 	} while (total < st.st_size);
 
 	if (fsync (writefd) == -1)
@@ -1862,7 +1865,9 @@ em_migrate_local_folders_1_4 (EMMigrateSession *session, CamelException *ex)
 		return -1;
 	}
 
-	em_migrate_setup_progress_dialog ();
+	em_migrate_setup_progress_dialog (_("The location and hierarchy of the Evolution mailbox "
+			     "folders has changed since Evolution 1.x.\n\nPlease be "
+			     "patient while Evolution migrates your folders..."));
 
 	while (res == 0 && (dent = readdir (dir))) {
 		char *full_path;
@@ -2671,7 +2676,7 @@ em_update_accounts_2_11 (void)
 		mail_config_save_accounts ();
 }
 
-#endif
+#endif	/* !G_OS_WIN32 */
 
 static int
 emm_setup_initial(const char *evolution_dir)
@@ -2837,6 +2842,113 @@ em_update_sa_junk_setting_2_23 (void)
 	g_object_unref (client);
 }
 
+
+static void
+migrate_folders(CamelStore *store, CamelFolderInfo *fi, const char *acc, CamelException *ex)
+{
+	CamelFolder *folder;
+
+	while (fi) {
+		char *tmp = g_strdup_printf ("%s/%s", acc, fi->full_name);
+		em_migrate_set_folder_name (tmp);
+		g_free (tmp);
+		folder = camel_store_get_folder (store, fi->full_name, 0, ex);
+		if (folder != NULL)
+			camel_folder_summary_migrate_infos (folder->summary);
+		migrate_folders(store, fi->child, acc, ex);
+		fi = fi->next;
+	}
+}
+
+static CamelStore *
+setup_local_store (MailComponent *mc)
+{
+	CamelURL *url;
+	char *tmp;
+	CamelStore *store;
+	
+	url = camel_url_new("mbox:", NULL);
+	tmp = g_build_filename (mail_component_peek_base_directory(mc), "local", NULL);
+	camel_url_set_path(url, tmp);
+	g_free(tmp);
+	tmp = camel_url_to_string(url, 0);
+	store = (CamelStore *)camel_session_get_service(session, tmp, CAMEL_PROVIDER_STORE, NULL);
+	g_free(tmp);
+
+	return store;
+	
+}
+static void
+migrate_to_db()
+{
+	EAccountList *accounts;
+	EIterator *iter;
+	int i=0, len;
+	MailComponent *component = mail_component_peek ();
+	CamelStore *store = NULL;
+	CamelFolderInfo *info;
+	
+	if (!(accounts = mail_config_get_accounts ()))
+		return;
+	
+	iter = e_list_get_iterator ((EList *) accounts);
+	len = e_list_length ((EList *) accounts);
+	
+	camel_session_set_online ((CamelSession *) session, FALSE);
+	em_migrate_setup_progress_dialog (_("The summary format of the Evolution mailbox "
+			     "folders has been moved to sqlite since Evolution 2.24.\n\nPlease be "
+			     "patient while Evolution migrates your folders..."));
+
+	em_migrate_set_progress ( (double)i/(len+1));
+	store = setup_local_store (component);
+	info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL);	
+	if (info) {
+		migrate_folders(store, info, _("On This Computer"), NULL);
+	}
+	i++;
+	em_migrate_set_progress ( (double)i/(len+1));
+
+	
+	while (e_iterator_is_valid (iter)) {
+		EAccount *account = (EAccount *) e_iterator_get (iter);
+		EAccountService *service;
+		const char *name;
+
+		
+		service = account->source;
+		name = account->name;
+		em_migrate_set_progress ( (double)i/(len+1));		
+		if (account->enabled
+		    && service->url != NULL
+		    && service->url[0]
+		    && strncmp(service->url, "mbox:", 5) != 0) {
+
+			CamelException ex;
+
+			camel_exception_init (&ex);
+			mail_component_load_store_by_uri (component, service->url, name);
+
+			store = (CamelStore *) camel_session_get_service (session, service->url, CAMEL_PROVIDER_STORE, &ex);
+			info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &ex);
+			if (info) {
+				migrate_folders(store, info, account->name, &ex);
+				
+			} else
+				printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC);
+			camel_exception_clear(&ex);
+				
+		}
+		i++;
+		e_iterator_next (iter);
+
+	}
+
+	//camel_session_set_online ((CamelSession *) session, TRUE);
+
+	g_object_unref (iter);
+	em_migrate_close_progress_dialog ();
+}
+
 int
 em_migrate (const char *evolution_dir, int major, int minor, int revision, CamelException *ex)
 {
@@ -2860,8 +2972,8 @@ em_migrate (const char *evolution_dir, int major, int minor, int revision, Camel
 	if (major == 0)
 		return emm_setup_initial(evolution_dir);
 
-#ifndef G_OS_WIN32
 	if (major == 1 && minor < 5) {
+#ifndef G_OS_WIN32
 		xmlDocPtr config_xmldb = NULL, filters, vfolders;
 
 		path = g_build_filename (g_get_home_dir (), "evolution", NULL);
@@ -2917,18 +3029,27 @@ em_migrate (const char *evolution_dir, int major, int minor, int revision, Camel
 		}
 
 		g_free (path);
+#else
+		g_error ("Upgrading from ancient versions not supported on Windows");
+#endif
 	}
 
 	if (major < 2 || (major == 2 && minor < 12)) {
+#ifndef G_OS_WIN32
 		em_update_accounts_2_11 ();
+#else
+		g_error ("Upgrading from ancient versions not supported on Windows");
+#endif
 	}
 
+
 	if (major < 2 || (major == 2 && minor < 22))
 		em_update_message_notify_settings_2_21 ();
 
-	if (major < 2 || (major == 2 && minor < 24))
+	if (major < 2 || (major == 2 && minor < 24)) {
 		em_update_sa_junk_setting_2_23 ();
+		migrate_to_db();
+	}
 
-#endif	/* !G_OS_WIN32 */
 	return 0;
 }
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index ea44ef46b2..31b703864a 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -323,8 +323,7 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs)
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE);
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, FALSE);
 		if (type == NETWORK_PROXY_SYS_SETTINGS) {
-			d(g_print ("%s:%s:%d: Loading sys settings... \n", 
-				   __FILE__, __PRETTY_FUNCTION__, __LINE__));
+			d(g_print ("%s:%s: Loading sys settings... \n", G_STRLOC, G_STRFUNC));
 			emnp_load_sys_settings (prefs->gconf);
 		}
 
@@ -357,11 +356,11 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data)
 	if (GTK_IS_SPIN_BUTTON (widget)) {
 		port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
 		gconf_client_set_int (gconf, (const char *)data, port, NULL);
-		d(g_print ("%s:%s:%d: %s is SpinButton: value = [%d]\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, (const char *)data, port));
+		d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, (const char *)data, port));
 	} else if (GTK_IS_ENTRY (widget)) {
 		value = gtk_entry_get_text (GTK_ENTRY (widget));
 		gconf_client_set_string (gconf, (const char *)data, value, NULL);
-		d(g_print ("%s:%s:%d: %s is Entry: value = [%s]\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, (const char *)data, value));
+		d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, (const char *)data, value));
 	}
 
 }
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 23aca40c4d..8a5e3fd0dd 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -312,8 +312,8 @@ sub_fill_level(EMSubscribe *sub, CamelFolderInfo *info,  GtkTreeIter *parent, in
 					e_dlist_addtail(&sub->pending, (EDListNode *)node);
 			}
 		} else {
-			d(printf("%s:%d:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n",
-				 __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, fi->flags & CAMEL_FOLDER_NOINFERIORS,
+			d(printf("%s:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n",
+				 G_STRLOC, G_STRFUNC, fi->flags & CAMEL_FOLDER_NOINFERIORS,
 				 node->path));
 		}
 
@@ -408,7 +408,7 @@ sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node)
 	struct _emse_folderinfo_msg *m;
 	int id;
 
-	d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__,
+	d(printf("%s:%s: Starting get folderinfo of '%s'\n", G_STRLOC, G_STRFUNC,
 		 node?node->info->full_name:"<root>"));
 
 	m = mail_msg_new (&sub_folderinfo_info);
@@ -501,7 +501,7 @@ sub_row_expanded(GtkTreeView *tree, GtkTreeIter *iter, GtkTreePath *path, EMSubs
 	char *row_name;
 
 	gtk_tree_model_get(model, iter, 1, &row_name, -1);
-	d(printf("%s:%d:%s: row-expanded '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__,
+	d(printf("%s:%s: row-expanded '%s'\n", G_STRLOC, G_STRFUNC,
 		 row_name?row_name:"<root>"));
 
 	/* Do we really need to fetch the children for this row? */
diff --git a/mail/em-utils.c b/mail/em-utils.c
index ff686f3d8c..4fd8a98958 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1364,7 +1364,53 @@ em_utils_temp_save_part(GtkWidget *parent, CamelMimePart *part, gboolean mode)
 	return path;
 }
 
+/** em_utils_folder_is_templates:
+ * @folder: folder
+ * @uri: uri for this folder, if known
+ *
+ * Decides if @folder is a Templates folder.
+ *
+ * Returns %TRUE if this is a Drafts folder or %FALSE otherwise.
+ **/
+
+gboolean
+em_utils_folder_is_templates (CamelFolder *folder, const char *uri)
+{
+	EAccountList *accounts;
+	EAccount *account;
+	EIterator *iter;
+	int is = FALSE;
+	char *templates_uri;
 
+	if (folder == mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_TEMPLATES))
+		return TRUE;
+	
+	if (uri == NULL)
+		return FALSE;
+		
+	accounts = mail_config_get_accounts();
+	iter = e_list_get_iterator ((EList *)accounts);
+	while (e_iterator_is_valid (iter)) {
+		account = (EAccount *)e_iterator_get (iter);
+		
+		if (account->templates_folder_uri) {
+			templates_uri = em_uri_to_camel (account->templates_folder_uri);
+			if (camel_store_folder_uri_equal (folder->parent_store, templates_uri, uri)) {
+				g_free (templates_uri);
+				is = TRUE;
+				break;
+			}
+			g_free (templates_uri);
+		}
+		
+		e_iterator_next (iter);
+	}
+	
+	g_object_unref (iter);
+	
+	return is;
+}
+		
 /**
  * em_utils_folder_is_drafts:
  * @folder: folder
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 045b922e3d..5fd05faafb 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -82,6 +82,7 @@ char *em_utils_temp_save_part(struct _GtkWidget *parent, struct _CamelMimePart *
 void em_utils_save_parts (struct _GtkWidget *parent, const char *prompt, GSList * parts);
 
 gboolean em_utils_folder_is_drafts(struct _CamelFolder *folder, const char *uri);
+gboolean em_utils_folder_is_templates(struct _CamelFolder *folder, const char *uri);
 gboolean em_utils_folder_is_sent(struct _CamelFolder *folder, const char *uri);
 gboolean em_utils_folder_is_outbox(struct _CamelFolder *folder, const char *uri);
 
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 29d7dd12aa..7868d1f44c 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -318,9 +318,9 @@
          <short>Load images for HTML messages over http</short>
          <long>
           Load images for HTML messages over http(s). Possible values are:
-          0 - Never load images off the net.
-          1 - Load images in messages from contacts.
-          2 - Always load images off the net.
+          "0" - Never load images off the net.
+          "1" - Load images in messages from contacts.
+          "2" - Always load images off the net.
          </long>
       </locale>
     </schema>
@@ -506,8 +506,9 @@
       <locale name="C">
          <short>Hides the per-folder preview and removes the selection</short>
          <long>
-          This key is read only once and reset to false after read. This unselects the 
-	  mail in the list and removes the preview for that folder.
+          This key is read only once and reset to "false" after read. This
+          unselects the mail in the list and removes the preview for that
+          folder.
          </long>
       </locale>
     </schema>
@@ -1026,8 +1027,9 @@
       <default>0</default>
       <locale name="C">
          <short>Level beyond which the message should be logged.</short>
-         <long> This can have three possible values. 0 for errors. 1 for warnings. 
-	 	2 for debug messages.
+         <long>
+           This can have three possible values. "0" for errors.
+           "1" for warnings. "2" for debug messages.
          </long>
       </locale>
     </schema>
@@ -1341,10 +1343,10 @@
       <type>int</type>
       <default>60</default>
       <locale name="C">
-        <short>Time interval, in seconds, how often upload store changes to server.</short>
+        <short>Server synchronization interval</short>
         <long>
-          Time interval, in seconds, how often upload store changes to server.
-	  The actual value cannot be less than 30 seconds.
+          Controls how frequently local changes are synchronized with the
+          remote mail server.  The interval must be at least 30 seconds.
         </long>
       </locale>
     </schema>
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 18c489b7ae..f18ccb08d0 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -161,6 +161,7 @@ static struct {
 	{ N_("Drafts"), },
 	{ N_("Outbox"), },
 	{ N_("Sent"), },
+	{ N_("Templates"), },
 	{ "Inbox", },		/* 'always local' inbox */
 };
 
@@ -578,6 +579,8 @@ view_changed(EMFolderView *emfv, EComponentView *component_view)
 		    && (!strcmp (name, "Drafts") || !strcmp (name, "Inbox")
 			|| !strcmp (name, "Outbox") || !strcmp (name, "Sent")))
 			use_name = _(name);
+		else if (!strcmp (name, "INBOX"))
+ 			use_name = _("Inbox");
 		else
 			use_name = name;
 
@@ -753,7 +756,7 @@ impl_createView (PortableServer_Servant servant,
 	gtk_widget_show (statusbar_widget);
 
 	vbox = gtk_vbox_new(FALSE, 0);
-	info = e_info_label_new("stock_mail");
+	info = e_info_label_new("evolution-mail");
 	e_info_label_set_info((EInfoLabel *)info, _("Mail"), "");
 	gtk_box_pack_start((GtkBox *)vbox, info, FALSE, TRUE, 0);
 	gtk_box_pack_start((GtkBox *)vbox, tree_widget, TRUE, TRUE, 0);
@@ -911,7 +914,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment
 
 	list->_buffer[0].id = "message";
 	list->_buffer[0].description = _("New Mail Message");
-	list->_buffer[0].menuDescription = _("_Mail Message");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Mail Message");
 	list->_buffer[0].tooltip = _("Compose a new mail message");
 	list->_buffer[0].menuShortcut = 'm';
 	list->_buffer[0].iconName = "mail-message-new";
@@ -919,7 +922,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment
 
 	list->_buffer[1].id = "folder";
 	list->_buffer[1].description = _("New Mail Folder");
-	list->_buffer[1].menuDescription = _("Mail _Folder");
+	list->_buffer[1].menuDescription = (char *) C_("New", "Mail _Folder");
 	list->_buffer[1].tooltip = _("Create a new mail folder");
 	list->_buffer[1].menuShortcut = '\0';
 	list->_buffer[1].iconName = "folder-new";
diff --git a/mail/mail-component.h b/mail/mail-component.h
index 0a418d2238..9e775ad59f 100644
--- a/mail/mail-component.h
+++ b/mail/mail-component.h
@@ -47,6 +47,7 @@ enum _mail_component_folder_t {
 	MAIL_COMPONENT_FOLDER_DRAFTS,
 	MAIL_COMPONENT_FOLDER_OUTBOX,
 	MAIL_COMPONENT_FOLDER_SENT,
+	MAIL_COMPONENT_FOLDER_TEMPLATES,
 	MAIL_COMPONENT_FOLDER_LOCAL_INBOX,
 };
 
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 867f786f9f..41e5b27465 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -4962,7 +4962,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 				<widget class="GtkCheckButton" id="mlimit_checkbutton">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Do not format text contents in messages if the text si_ze exceeds</property>
+				  <property name="label" translatable="yes">Do not format messages when text si_ze exceeds</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
@@ -5646,7 +5646,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 		    <widget class="GtkCheckButton" id="chkPromptWantHTML">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Prompt when sending HTML messages to contacts that do not want them</property>
+		      <property name="label" translatable="yes">_Prompt on sending HTML mail to contacts that do not want them</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -6847,7 +6847,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 		      <child>
 			<widget class="GtkLabel" id="label590">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">This option will be overridden if a match for custom junk headers is found.</property>
+			  <property name="label" translatable="yes">Option is ignored if a match for custom junk headers is found.</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/mail/mail-dialogs.glade b/mail/mail-dialogs.glade
index 398875ff3c..1ecf410ed5 100644
--- a/mail/mail-dialogs.glade
+++ b/mail/mail-dialogs.glade
@@ -235,17 +235,6 @@
 	</packing>
       </child>
 
-      <child>
-	<widget class="GtkNotebook" id="notebook1">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
 	  <child>
 	    <widget class="GtkVBox" id="vbox161">
 	      <property name="border_width">12</property>
@@ -473,68 +462,8 @@
 		</packing>
 	      </child>
 	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label473">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Summary</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
 	  </child>
 
-	  <child>
-	    <placeholder/>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label474">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Details</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
     </widget>
   </child>
 </widget>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 7b3fd70551..bc0efb22fa 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1976,7 +1976,7 @@ static gchar *
 save_messages_desc (struct _save_messages_msg *m)
 {
 	return g_strdup_printf(ngettext("Saving %d message",
-					"Saving %d messsages", m->uids->len),
+					"Saving %d messages", m->uids->len),
 			       m->uids->len);
 }
 
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index cf21b3c60f..6d0d83e46e 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -50,7 +50,7 @@
 #include "mail-tools.h"
 #include "mail-vfolder.h"
 
-#define d(x)  /* (printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__), (x))*/
+#define d(x)  /* (printf("%s:%s: ",  G_STRLOC, G_STRFUNC), (x))*/
 
 static EMVFolderContext *context;	/* context remains open all time */
 CamelStore *vfolder_store; /* the 1 static vfolder store */
diff --git a/mail/message-list.c b/mail/message-list.c
index 8fd0ea8092..9149fd673b 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2589,7 +2589,7 @@ find_next_selectable (MessageList *ml)
 		return NULL;
 
 	info = get_message_info (ml, node);
-	if (is_node_selectable (ml, info))
+	if (info && is_node_selectable (ml, info))
 		return NULL;
 
 	last = e_tree_row_count (ml->tree);
@@ -2603,7 +2603,7 @@ find_next_selectable (MessageList *ml)
 	while (vrow < last) {
 		node = e_tree_node_at_row (et, vrow);
 		info = get_message_info (ml, node);
-		if (is_node_selectable (ml, info))
+		if (info && is_node_selectable (ml, info))
 			return g_strdup (camel_message_info_uid (info));
 		vrow ++;
 	}
@@ -2615,7 +2615,7 @@ find_next_selectable (MessageList *ml)
 	while (vrow >= 0) {
 		node = e_tree_node_at_row (et, vrow);
 		info = get_message_info (ml, node);
-		if (is_node_selectable (ml, info))
+		if (info && is_node_selectable (ml, info))
 			return g_strdup (camel_message_info_uid (info));
 		vrow --;
 	}
@@ -3644,6 +3644,9 @@ glib_crapback(void *key, void *data, void *x)
 	struct _glibsuxcrap *y = x;
 	CamelMessageInfo *mi;
 
+	if(y->count)
+		return;
+
 	mi = camel_folder_get_message_info(y->folder, key);
 	if (mi) {
 		y->count++;
@@ -3651,7 +3654,7 @@ glib_crapback(void *key, void *data, void *x)
 	}
 }
 
-/* returns number of hidden messages */
+/* returns 0 or 1 depending if there are hidden messages */
 unsigned int
 message_list_hidden(MessageList *ml)
 {
@@ -4310,6 +4313,15 @@ mail_regen_list (MessageList *ml, const char *search, const char *hideexpr, Came
 		camel_folder_thread_messages_ref(m->tree);
 	}
 
+	if (message_list_length (ml) <= 0) {
+		/* there is some info why the message list is empty, let it be something useful */
+		char *txt = g_strconcat (_("Generating message list"), "..." , NULL);
+
+		e_tree_set_info_message (m->ml->tree, txt);
+
+		g_free (txt);
+	}
+
 	/* if we're busy already kick off timeout processing, so normal updates are immediate */
 	if (ml->regen == NULL)
 		ml_regen_timeout(m);
diff --git a/plugins/addressbook-file/ChangeLog b/plugins/addressbook-file/ChangeLog
index c44ddb846c..167e44dc61 100644
--- a/plugins/addressbook-file/ChangeLog
+++ b/plugins/addressbook-file/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-addressbook-file.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
 2006-02-28  Christian Kellner  <gicmo@gnome.org>
 
 	* addressbook-file.c: fixing a leak.
diff --git a/plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml b/plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
index 4b041f8c45..b9fe52e341 100644
--- a/plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
+++ b/plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
@@ -4,7 +4,8 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-addressbook-file@SOEXT@"
      id="org.gnome.evolution.addressbook.file"
-     _name="Local Address Books">
+     _name="Local Address Books"
+     system_plugin="true">
      <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
      <_description>Provides core functionality for local address books.</_description>
         <hook class="org.gnome.evolution.addressbook.config:1.0">
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index 2abd006846..3dbab34a81 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #543754
+
+	* org-gnome-backup-restore.error.xml:
+	Reword "insufficient-permissions" error message.
+
 2008-07-03  Roger Zauner  <roger@eskimo.com>
 
 	** Fix for bug #540400
diff --git a/plugins/backup-restore/org-gnome-backup-restore.error.xml b/plugins/backup-restore/org-gnome-backup-restore.error.xml
index 6085a1196d..6b3bb8ad52 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.error.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.error.xml
@@ -19,6 +19,6 @@
   </error>  
    <error id="insufficient-permissions" type="error">
    	<_title>Insufficient Permissions</_title>
-	<_secondary>The selected folder does not have enough permissions to create the file</_secondary>
+	<_secondary>The selected folder is not writable.</_secondary>
    </error>
 </error-list>
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 18b7b6afbc..53d5e13f7e 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,18 @@
+2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fixes bug #546785
+
+	* bbdb.c: (e_plugin_lib_enable): The bbdb plugin is noisy when
+	enabled:
+	    "BBDB spinning up..."
+	Make this plugin just as polite as google-account-setup.
+
+2008-07-28  Lucian Langa  <lucilanga@gnome.org>
+
+	** See bug #504417
+
+	* bbdb.c: - Preferences window cut off
+
 2008-01-10  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #496402
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index feac342232..98db91fb99 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -49,6 +49,8 @@
 
 #include "bbdb.h"
 
+#define d(x)
+
 /* Plugin hooks */
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
 void bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target);
@@ -119,7 +121,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
  	/* Start up the plugin. */
 	if (enable) {
-		fprintf (stderr, "BBDB spinning up...\n");
+		d(fprintf (stderr, "BBDB spinning up...\n"));
 
 		if (bbdb_check_gaim_enabled ())
 			bbdb_sync_buddy_list_check ();
@@ -562,7 +564,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Enable BBDB checkbox */
-	check = gtk_check_button_new_with_mnemonic (_("_Automatically create entries in the addressbook when responding to messages"));
+	check = gtk_check_button_new_with_mnemonic (_("_Auto-create addressbook entries when replying to messages"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (enable_toggled_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), check, FALSE, FALSE, 0);
@@ -598,7 +600,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
 
 	/* Enable Gaim Checkbox */
-	check_gaim = gtk_check_button_new_with_mnemonic (_("Periodically synchronize contact information and images from Pidgin buddy list"));
+	check_gaim = gtk_check_button_new_with_mnemonic (_("Synchronize contact info and images from Pidgin buddy list"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_gaim), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL));
 	g_signal_connect (GTK_TOGGLE_BUTTON (check_gaim), "toggled", G_CALLBACK (enable_gaim_toggled_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), check_gaim, FALSE, FALSE, 0);
diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog
index 0801aed8cd..43cc26248f 100644
--- a/plugins/caldav/ChangeLog
+++ b/plugins/caldav/ChangeLog
@@ -1,3 +1,20 @@
+2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fixes bug #546785
+
+	* caldav-source.c: (e_plugin_lib_enable): The caldav plugin is noisy
+	when enabled:
+	    "CalDAV Eplugin starting up ..."
+	Make this plugin just as polite as google-account-setup.
+
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-caldav.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
 2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* caldav-source.c: (ensure_caldav_source_group):
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 784e79bf8d..8b48bf6319 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -38,6 +38,8 @@
 
 #include <string.h>
 
+#define d(x)
+
 /*****************************************************************************/
 /* prototypes */
 int              e_plugin_lib_enable      (EPluginLib                 *ep,
@@ -84,7 +86,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
 
 	if (enable) {
-		g_print ("CalDAV Eplugin starting up ...\n");
+		d(g_print ("CalDAV Eplugin starting up ...\n"));
 		ensure_caldav_source_group ();
 	}
 
diff --git a/plugins/caldav/org-gnome-evolution-caldav.eplug.xml b/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
index 40710b39f7..dc728f1e7f 100644
--- a/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
+++ b/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
@@ -7,7 +7,8 @@
 	  load-on-startup="true"
 	  domain="@GETTEXT_PACKAGE@"
 	  localedir="@LOCALEDIR@"
-	  _name="CalDAV sources">
+	  _name="CalDAV sources"
+          system_plugin="true">
   		<author name="Christian Kellner" email="gicmo@gnome.org"/>
 		<_description>CalDAV Calendar sources</_description>
 
diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog
index a98c581934..351dc79c96 100644
--- a/plugins/calendar-file/ChangeLog
+++ b/plugins/calendar-file/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-calendar-file.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
 2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #419524
diff --git a/plugins/calendar-file/org-gnome-calendar-file.eplug.xml b/plugins/calendar-file/org-gnome-calendar-file.eplug.xml
index f2af9a0037..246b176059 100644
--- a/plugins/calendar-file/org-gnome-calendar-file.eplug.xml
+++ b/plugins/calendar-file/org-gnome-calendar-file.eplug.xml
@@ -4,7 +4,8 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-calendar-file@SOEXT@"
      id="org.gnome.evolution.calendar.file"
-     _name="Local Calendars">
+     _name="Local Calendars"
+     system_plugin="true">
      <author name="JP Rosevear" email="jpr@novell.com"/>
      <_description>Provides core functionality for local calendars.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog
index 76fb7d8cba..8cadbba783 100644
--- a/plugins/calendar-http/ChangeLog
+++ b/plugins/calendar-http/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-calendar-http.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
 2008-03-31  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #346555
diff --git a/plugins/calendar-http/org-gnome-calendar-http.eplug.xml b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
index 3d4f885aec..8b75a0f2c3 100644
--- a/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
+++ b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
@@ -4,7 +4,8 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-calendar-http@SOEXT@"
      id="org.gnome.evolution.calendar.http"
-     _name="HTTP Calendars">
+     _name="HTTP Calendars"
+     system_plugin="true">
      <author name="David Trowbridge" email="David.Trowbridge@Colorado.edu"/>
      <_description>Provides core functionality for webcal and http calendars.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
index 78f2dc28d7..13f1f22a89 100644
--- a/plugins/calendar-weather/ChangeLog
+++ b/plugins/calendar-weather/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-calendar-weather.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
 2008-03-31  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #346555
diff --git a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
index 442fd83074..e6767d128a 100644
--- a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
+++ b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
@@ -4,7 +4,8 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-calendar-weather@SOEXT@"
      id="org.gnome.evolution.calendar.weather"
-     _name="Weather Calendars">
+     _name="Weather Calendars"
+     system_plugin="true">
         <_description>Provides core functionality for weather calendars.</_description>
 	<author name="David Trowbridge" email="trowbrds@cs.colorado.edu"/>
         <hook class="org.gnome.evolution.calendar.config:1.0">
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index 0fbc6ac296..7f4dc1918a 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,31 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #543755
+
+	* apps_evolution_email_custom_header.schemas.in: Fix typo.
+
+2008-07-22  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #544022
+
+	* email-custom-header.c: Compiler warning cleanup.
+
+2008-06-25  Ashish Shrivastava  <shashish@novell.com>
+	* email-custom-header.glade:  Marked strings for
+	translation.
+	remove "window1" string from translation.
+
+2008-06-24  Ashish Shrivastava  <shashish@novell.com>
+
+	* email-custom-header.c: (e_plugin_lib_get_configure_widget),
+	(org_gnome_email_custom_header_config_option):
+	Added Support for configuring gconf values.
+	* email-custom-header.glade: 
+	Configure email-custom-header plugin within the plugin-manager.
+	* org-gnome-email-custom-header.eplug.xml: Add hook class
+	for Configure tab.
+	* Makefile.am: Add new file.(email-custom-header.glade).
+
 2008-06-02  Matthew Barnes  <mbarnes@redhat.com>
 
 	* Makefile.am:
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index f7a9c84e2f..91a3b52df4 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -42,7 +42,8 @@ install-data-local:
 	fi
 
 glade_DATA =							\
-	org-gnome-email-custom-header.glade
+	org-gnome-email-custom-header.glade			\
+	email-custom-header.glade
 
 EXTRA_DIST = 							\
 	org-gnome-email-custom-header.eplug.xml			\
diff --git a/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in b/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
index 79c8a9d8ec..cb3bd97ce8 100644
--- a/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
+++ b/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
@@ -8,7 +8,7 @@
       <list_type>string</list_type>
       <default>[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
       <locale name="C">
-         <short>List of Custom Header</short>
+         <short>List of Custom Headers</short>
          <long>The key specifies the list of custom headers that you can add  to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";"</long>
       </locale>
     </schema>
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index ef2ac976a7..6918a9b43c 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -33,10 +33,28 @@
 #include "mail/em-event.h"
 #include "composer/e-msg-composer.h"
 #include "libedataserver/e-account.h"
+#include "e-util/e-config.h"
 #include "email-custom-header.h"
 
 
 #define d(x) x
+#define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader"
+
+typedef struct {
+        GladeXML *xml;
+        GConfClient *gconf;
+        GtkWidget   *treeview;
+        GtkWidget   *header_add;
+        GtkWidget   *header_edit;
+        GtkWidget   *header_remove;
+        GtkListStore *store;
+} ConfigData;
+
+enum {
+        HEADER_KEY_COLUMN,
+	HEADER_VALUE_COLUMN,
+        HEADER_N_COLUMNS,
+};
 
 struct _EmailCustomHeaderOptionsDialogPrivate {
 	/* Glade XML data */
@@ -60,8 +78,17 @@ static void epech_dialog_init (GObject *object);
 static void epech_dialog_dispose (GObject *object);
 static void epech_setup_widgets (CustomHeaderOptionsDialog *mch);
 static gint epech_check_existing_composer_window(gconstpointer a, gconstpointer b);
-
+static void commit_changes (ConfigData *cd);
+int e_plugin_lib_enable (EPluginLib *ep, int enable);
+GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl);
 gboolean e_plugin_ui_init(GtkUIManager *manager, EMsgComposer *composer);
+GtkWidget *org_gnome_email_custom_header_config_option (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
+
+int
+e_plugin_lib_enable (EPluginLib *ep, int enable)
+{
+        return 0;
+}
 
 static void 
 epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
@@ -242,7 +269,7 @@ epech_get_header_list (CustomHeaderOptionsDialog *mch)
 
 	client = gconf_client_get_default (); 
 	g_return_if_fail (GCONF_IS_CLIENT (client));
-	gconf_client_add_dir (client, "/apps/evolution/eplugin/email_custom_header" , GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+	gconf_client_add_dir (client, GCONF_KEY_CUSTOM_HEADER, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	epech_load_from_gconf (client, "/apps/evolution/eplugin/email_custom_header/customHeader", mch);
 
 	return;
@@ -554,3 +581,388 @@ e_plugin_ui_init (GtkUIManager *manager,
 	return TRUE;
 }
 
+static void
+commit_changes (ConfigData *cd)
+{
+	GtkTreeModel *model = NULL;
+	GSList *header_config_list = NULL;
+	GtkTreeIter iter;
+	gboolean valid;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->treeview));
+	valid = gtk_tree_model_get_iter_first (model, &iter);
+
+	while (valid) {
+		gchar *keyword = NULL, *value = NULL;
+		gtk_tree_model_get (model, &iter, HEADER_KEY_COLUMN, &keyword, -1);
+		/* Check if the keyword is not empty */
+		gtk_tree_model_get (model, &iter, HEADER_VALUE_COLUMN, &value, -1);
+                /* Check if the keyword is not empty */
+                if ((keyword) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0)){
+                        if ((value) && (g_utf8_strlen(g_strstrip(value), -1) > 0)){
+                                keyword = g_strconcat (keyword, "=", value, NULL);
+                        }
+                        header_config_list = g_slist_append (header_config_list, g_strdup(keyword));
+                }
+		g_free (keyword);
+		valid = gtk_tree_model_iter_next (model, &iter);
+	}
+
+	gconf_client_set_list (cd->gconf, GCONF_KEY_CUSTOM_HEADER, GCONF_VALUE_STRING, header_config_list, NULL);
+
+	g_slist_foreach (header_config_list, (GFunc) g_free, NULL);
+	g_slist_free (header_config_list);
+}
+
+static void
+header_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, ConfigData *cd)
+{
+	GtkTreeSelection *selection;
+	char *keyword = NULL;
+	char *value = NULL;
+	gboolean valid;
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cd->treeview));
+	/* move to the previous node */
+	valid = gtk_tree_path_prev (path);
+
+	gtk_tree_model_get (model, iter, HEADER_KEY_COLUMN, &keyword, -1);
+
+	if ((keyword) && !(g_utf8_strlen (g_strstrip (keyword), -1) > 0))
+		gtk_list_store_remove (cd->store, iter);
+
+	/* Check if we have a valid row to select. If not, then select
+	 * the previous row */
+	if (gtk_list_store_iter_is_valid (GTK_LIST_STORE (model), iter)) {
+		gtk_tree_selection_select_iter (selection, iter);
+	} else {
+		if (path && valid) {
+			gtk_tree_model_get_iter (model, iter, path);
+			gtk_tree_selection_select_iter (selection, iter);
+		}
+	}
+
+	gtk_widget_grab_focus (cd->treeview);
+	g_free (keyword);
+	g_free (value);
+}
+
+static gboolean
+header_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, ConfigData *cd)
+{
+	gboolean valid;
+
+	valid = gtk_tree_model_get_iter_first (model, iter);
+	while (valid && gtk_list_store_iter_is_valid (cd->store, iter)) {
+		char *keyword = NULL;
+		gtk_tree_model_get (model, iter, HEADER_KEY_COLUMN, &keyword, -1);
+		/* Check if the keyword is not empty and then emit the row-changed
+		signal (if we delete the row, then the iter gets corrupted) */
+		if ((keyword) && !(g_utf8_strlen (g_strstrip (keyword), -1) > 0))
+			gtk_tree_model_row_changed (model, path, iter);
+		
+		char *value = NULL;
+                gtk_tree_model_get (model, iter, HEADER_VALUE_COLUMN, &value, -1);
+                /* Check if the keyword is not empty and then emit the row-changed
+                signal (if we delete the row, then the iter gets corrupted) */
+                if ((value) && !(g_utf8_strlen (g_strstrip (value), -1) > 0))
+                        gtk_tree_model_row_changed (model, path, iter);
+
+		g_free (keyword);
+                g_free (value);
+
+		valid = gtk_tree_model_iter_next (model, iter);
+	}
+
+	return FALSE;
+}
+
+static void
+cell_edited_callback (GtkCellRendererText *cell,
+		      gchar               *path_string,
+		      gchar               *new_text,
+		      ConfigData             *cd)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->treeview));
+
+	gtk_tree_model_get_iter_from_string (model, &iter, path_string);
+
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+				    HEADER_KEY_COLUMN, new_text, -1);
+
+	commit_changes (cd);
+}
+
+static void
+cell_value_edited_callback (GtkCellRendererText *cell,
+                      gchar               *path_string,
+                      gchar               *new_text,
+                      ConfigData          *cd)
+{
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+
+        model = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->treeview));
+
+        gtk_tree_model_get_iter_from_string (model, &iter, path_string);
+
+        gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                    HEADER_VALUE_COLUMN, new_text, -1);
+
+        commit_changes (cd);
+}
+
+static void
+header_add_clicked (GtkButton *button, ConfigData *cd)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	gchar *new_header = NULL;
+	GtkTreeViewColumn *focus_col;
+	GtkTreePath *path;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->treeview));
+	gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc) header_foreach_check_isempty, cd);
+
+	/* Disconnect from signal so that we can create an empty row */
+	g_signal_handlers_disconnect_matched(G_OBJECT(model), G_SIGNAL_MATCH_FUNC, 0, 0, NULL, header_isempty, cd);
+
+	new_header = g_strdup ("");
+	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+			    HEADER_KEY_COLUMN, new_header, -1);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+			    HEADER_VALUE_COLUMN, new_header, -1);
+
+	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), HEADER_KEY_COLUMN);
+	path = gtk_tree_model_get_path (model, &iter);
+
+	if (path) {
+		gtk_tree_view_set_cursor (GTK_TREE_VIEW (cd->treeview), path, focus_col, TRUE);
+		gtk_tree_view_row_activated(GTK_TREE_VIEW(cd->treeview), path, focus_col);
+		gtk_tree_path_free (path);
+	}
+
+	/* We have done our job, connect back to the signal */
+	g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(header_isempty), cd);
+}
+
+static void
+header_remove_clicked (GtkButton *button, ConfigData *cd)
+{
+	GtkTreeSelection *selection;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	GtkTreePath *path;
+	gboolean valid;
+	gint len;
+
+	valid = FALSE;
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cd->treeview));
+	if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+		return;
+
+	/* Get the path and move to the previous node :) */
+	path = gtk_tree_model_get_path (model, &iter);
+	if (path)
+		valid = gtk_tree_path_prev(path);
+
+	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+
+	len = gtk_tree_model_iter_n_children (model, NULL);
+	if (len > 0) {
+		if (gtk_list_store_iter_is_valid (GTK_LIST_STORE(model), &iter)) {
+			gtk_tree_selection_select_iter (selection, &iter);
+		} else {
+			if (path && valid) {
+				gtk_tree_model_get_iter(model, &iter, path);
+				gtk_tree_selection_select_iter (selection, &iter);
+			}
+		}
+	} else {
+		gtk_widget_set_sensitive (cd->header_edit, FALSE);
+		gtk_widget_set_sensitive (cd->header_remove, FALSE);
+	}
+
+	gtk_widget_grab_focus(cd->treeview);
+	gtk_tree_path_free (path);
+
+	commit_changes (cd);
+}
+
+static void
+header_edit_clicked (GtkButton *button, ConfigData *cd)
+{
+	GtkTreeSelection *selection;
+	GtkTreeModel *model;
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	GtkTreeViewColumn *focus_col;
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cd->treeview));
+	if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+		return;
+
+	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), HEADER_KEY_COLUMN);
+	path = gtk_tree_model_get_path (model, &iter);
+
+	if (path) {
+		gtk_tree_view_set_cursor (GTK_TREE_VIEW (cd->treeview), path, focus_col, TRUE);
+		gtk_tree_path_free (path);
+	}
+}
+
+static void
+selection_changed (GtkTreeSelection *selection, ConfigData *cd)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+
+	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+		gtk_widget_set_sensitive (cd->header_edit, TRUE);
+		gtk_widget_set_sensitive (cd->header_remove, TRUE);
+	} else {
+		gtk_widget_set_sensitive (cd->header_edit, FALSE);
+		gtk_widget_set_sensitive (cd->header_remove, FALSE);
+	}
+}
+
+static void
+destroy_cd_data (gpointer data)
+{
+	ConfigData *cd = (ConfigData *) data;
+
+	if (!cd)
+		return;
+
+	g_object_unref (cd->xml);
+	g_object_unref (cd->gconf);
+	g_free (cd);
+}
+
+GtkWidget *
+e_plugin_lib_get_configure_widget (EPlugin *epl)
+{
+	GtkCellRenderer *renderer;
+	GtkTreeSelection *selection;
+	GtkTreeIter iter;
+	GtkWidget *hbox;
+	GSList *list;
+	GSList *header_list = NULL;
+	GtkTreeModel *model;
+	gint index;
+        gchar *buffer;
+        char *str_colon = NULL, *str1_colon = NULL;
+        GtkTreeViewColumn *col;
+	int col_pos;
+
+	GConfClient *client = gconf_client_get_default();
+
+	ConfigData *cd = g_new0 (ConfigData, 1);
+
+	char *gladefile;
+
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+			"email-custom-header.glade",
+			NULL);
+	cd->xml = glade_xml_new (gladefile, "ech_configuration_box", NULL);
+	g_free (gladefile);
+
+	cd->gconf = gconf_client_get_default ();
+
+	cd->treeview = glade_xml_get_widget (cd->xml, "header_treeview");
+
+	cd->store = gtk_list_store_new (HEADER_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
+
+	gtk_tree_view_set_model (GTK_TREE_VIEW (cd->treeview), GTK_TREE_MODEL (cd->store));
+
+	renderer = gtk_cell_renderer_text_new ();
+	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cd->treeview), -1, _("Key"),
+			renderer, "text", HEADER_KEY_COLUMN, NULL);
+	col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), col_pos -1);
+        gtk_tree_view_column_set_resizable (col, TRUE);
+        gtk_tree_view_column_set_reorderable(col, TRUE);
+        g_object_set (col, "min-width", 50, NULL);
+
+	g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
+	g_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, cd);
+
+	renderer = gtk_cell_renderer_text_new ();
+        col_pos = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cd->treeview), -1, _("Values"),
+                        renderer, "text", HEADER_VALUE_COLUMN, NULL);
+        col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), col_pos -1);
+        gtk_tree_view_column_set_resizable (col, TRUE);
+        gtk_tree_view_column_set_reorderable(col, TRUE);
+        g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
+
+        g_signal_connect(renderer, "edited", (GCallback) cell_value_edited_callback, cd);
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cd->treeview));
+	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+	g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), cd);
+	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (cd->treeview), TRUE);
+
+	cd->header_add = glade_xml_get_widget (cd->xml, "header_add");
+	g_signal_connect (G_OBJECT (cd->header_add), "clicked", G_CALLBACK (header_add_clicked), cd);
+
+	cd->header_remove = glade_xml_get_widget (cd->xml, "header_remove");
+	g_signal_connect (G_OBJECT (cd->header_remove), "clicked", G_CALLBACK (header_remove_clicked), cd);
+	gtk_widget_set_sensitive (cd->header_remove, FALSE);
+
+	cd->header_edit = glade_xml_get_widget (cd->xml, "header_edit");
+	g_signal_connect (G_OBJECT (cd->header_edit), "clicked", G_CALLBACK (header_edit_clicked), cd);
+	gtk_widget_set_sensitive (cd->header_edit, FALSE);
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->treeview));
+	g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(header_isempty), cd);
+
+	/* Populate tree view with values from gconf */
+	header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);	
+
+	for (list = header_list; list; list = g_slist_next (list)) {
+		gtk_list_store_append (cd->store, &iter);
+		gchar **parse_header_list;
+                buffer = list->data;
+                parse_header_list = g_strsplit_set (buffer, "=,", -1);
+                str_colon = g_strconcat (parse_header_list[0], "", NULL);
+                gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1);
+		
+		for (index = 0; parse_header_list[index+1] ; ++index) {
+                        str1_colon = g_strconcat (parse_header_list[index+1], "", NULL);
+                        gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, str1_colon, -1);
+                }
+	}
+	g_free (str_colon);
+	g_free (str1_colon);
+
+	if (header_list) {
+		g_slist_foreach (header_list, (GFunc) g_free, NULL);
+		g_slist_free (header_list);
+	}
+
+	/* Add the list here */
+
+	hbox = gtk_vbox_new (FALSE, 0);
+
+	gtk_box_pack_start (GTK_BOX (hbox), glade_xml_get_widget (cd->xml, "ech_configuration_box"), TRUE, TRUE, 0);
+
+	/* to let free data properly on destroy of configuration widget */
+	g_object_set_data_full (G_OBJECT (hbox), "mycd-data", cd, destroy_cd_data);
+
+	return hbox;
+}
+
+/* Configuration in Mail Prefs Page goes here */
+
+GtkWidget *
+org_gnome_email_custom_header_config_option (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
+{
+	/* This function and the hook needs to be removed,
+	once the configure code is thoroughly tested */
+
+	return NULL;
+
+}
diff --git a/plugins/email-custom-header/email-custom-header.glade b/plugins/email-custom-header/email-custom-header.glade
new file mode 100644
index 0000000000..14a618f977
--- /dev/null
+++ b/plugins/email-custom-header/email-custom-header.glade
@@ -0,0 +1,176 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="window1">
+  <property name="visible">True</property>
+  <property name="title" translatable="no">window1</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+
+  <child>
+    <widget class="GtkVBox" id="ech_configuration_box">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<widget class="GtkVBox" id="vbox2">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="label1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes" comments="To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values">The format for specifying a Custom Header key value is:
+Name of the Custom Header key values separated by &quot;;&quot;.</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">True</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkVBox" id="header_configuration_box">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">5</property>
+
+	  <child>
+	    <widget class="GtkHBox" id="header_container">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">6</property>
+
+	      <child>
+		<widget class="GtkScrolledWindow" id="scrolledwindow1">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		  <child>
+		    <widget class="GtkTreeView" id="header_treeview">
+		      <property name="border_width">1</property>
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="headers_visible">True</property>
+		      <property name="rules_hint">False</property>
+		      <property name="reorderable">False</property>
+		      <property name="enable_search">True</property>
+		      <property name="fixed_height_mode">False</property>
+		      <property name="hover_selection">False</property>
+		      <property name="hover_expand">False</property>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkVButtonBox" id="vbuttonbox1">
+		  <property name="visible">True</property>
+		  <property name="layout_style">GTK_BUTTONBOX_START</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkButton" id="header_add">
+		      <property name="visible">True</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-add</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="header_edit">
+		      <property name="visible">True</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-edit</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="header_remove">
+		      <property name="visible">True</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-remove</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
diff --git a/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml b/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
index 055acc1030..94102ba62a 100644
--- a/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
+++ b/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
@@ -18,5 +18,12 @@
 				</menubar>
 			</ui-manager>
 		</hook>
+		
+		<hook class="org.gnome.evolution.mail.config:1.0">
+                        <group target="prefs" id="org.gnome.evolution.mail.composerPrefs">
+                                <item type="section" path="00.general/10.alerts/" factory="org_gnome_email_custom_header_config_option"/>
+                        </group>
+                </hook>
+
 	</e-plugin>
 </e-plugin-list>
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 5386d2bbfd..f16f1301cf 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,34 @@
+2008-08-06  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #435969
+
+	* org-gnome-exchange-operations.eplug.xml:
+	Show authentication section in an account druid too.
+
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-exchange-operations.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
+2008-07-30  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #500389
+
+	* exchange-account-setup.c: (gal_auth_to_string),
+	(owa_authenticate_user): Use default authentication for GAL.
+
+2008-07-11  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #542149
+
+	* exchange-folder-subscription.c: (subscribe_to_folder): Display an 
+	error message to restart if user tries to subscribe to other's mailbox.
+	* org-gnome-exchange-operations.error.xml: Added the corresponding 
+	error message.
+
 2008-06-16  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #273627
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 55d3d7c8a1..3e9e64ea6a 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -413,6 +413,18 @@ print_error (const char *owa_url, E2kAutoconfigResult result)
 	}
 }
 
+static const char *
+gal_auth_to_string (E2kAutoconfigGalAuthPref ad_auth)
+{
+	switch (ad_auth) {
+	case E2K_AUTOCONFIG_USE_GAL_DEFAULT: return "default";
+	case E2K_AUTOCONFIG_USE_GAL_BASIC:   return "basic";
+	case E2K_AUTOCONFIG_USE_GAL_NTLM:    return "ntlm";
+	}
+
+	return "default";
+}
+
 static void
 owa_authenticate_user(GtkWidget *button, EConfig *config)
 {
@@ -430,6 +442,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	exchange_params = g_new0 (ExchangeParams, 1);
 	exchange_params->host = NULL;
 	exchange_params->ad_server = NULL;
+	exchange_params->ad_auth = E2K_AUTOCONFIG_USE_GAL_DEFAULT;
 	exchange_params->mailbox = NULL;
 	exchange_params->owa_path = NULL;
 	exchange_params->is_ntlm = TRUE;
@@ -487,6 +500,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	camel_url_set_param (url, "ad_server", valid ? exchange_params->ad_server: NULL);
 	camel_url_set_param (url, "mailbox", valid ? exchange_params->mailbox : NULL);
 	camel_url_set_param (url, "owa_path", valid ? exchange_params->owa_path : NULL);
+	camel_url_set_param (url, "ad_auth", valid ? gal_auth_to_string (exchange_params->ad_auth) : NULL);
 
 	if (mailbox_entry) {
 		const char *par = camel_url_get_param (url, "mailbox");
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 021a06434b..9706dd29ab 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -237,9 +237,12 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 									  user_email_address,
 									  folder_name, &folder);
 			g_free (folder_name);
+			gtk_widget_hide (dialog);
 			switch (result) {
 				case EXCHANGE_ACCOUNT_FOLDER_OK:
 					exchange_account_rescan_tree (subscription_info->account);
+					if (!g_ascii_strcasecmp (e_folder_get_type_string (folder), "mail"))
+						e_error_run (NULL, ERROR_DOMAIN ":folder-restart-evo", NULL);
 					break;
 				case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS:
 					e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL);
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
index b551b8d746..16f4a7b311 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
@@ -5,7 +5,8 @@
     id="org.gnome.evolution.plugin.exchange-operations"
     location="@PLUGINDIR@/liborg-gnome-exchange-operations@SOEXT@"
     load-on-startup="true"
-    _name="Exchange Operations">
+    _name="Exchange Operations"
+    system_plugin="true">
     <author name="Sushma Rai" email="rsushma@novell.com"/>
     <author name="Praveen Kumar" email="kpraveen@novell.com"/>
     <author name="Shakti Sen" email="shprasad@novell.com"/>
@@ -37,6 +38,9 @@
                 <item type="item_table"
                         path="10.receive/10.config/20.owa"
 			factory="org_gnome_exchange_owa_url"/>
+		<item type="section"
+			path="10.receive/30.auth/00.exchange_auth"
+			factory="org_gnome_exchange_auth_section"/>
 	</group>
 
         <group
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
index 0aa4b6fb79..c162f365ec 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
@@ -221,6 +221,10 @@ username, and password, and try again.</_secondary>
   <_primary>Folder already exists</_primary>
  </error>
 
+ <error id="folder-restart-evo" type="error">
+  <_primary>Evolution requires a restart to load the subscribed user's mailbox</_primary>
+ </error>
+
  <error id="folder-doesnt-exist-error" type="error">
   <_primary>Folder does not exist</_primary>
  </error>
diff --git a/plugins/external-editor/ChangeLog b/plugins/external-editor/ChangeLog
index d49ecb97a4..1eb9b8fdef 100644
--- a/plugins/external-editor/ChangeLog
+++ b/plugins/external-editor/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #517151
+
+	* org-gnome-external-editor.xml:
+	Give a mnemonic to "Composer in External Editor".
+
 2008-04-17  Sankar P  <psankar@novell.com>
 
 	* Makefile.am:
diff --git a/plugins/external-editor/org-gnome-external-editor.xml b/plugins/external-editor/org-gnome-external-editor.xml
index 71be9e1266..e472f8bd1c 100644
--- a/plugins/external-editor/org-gnome-external-editor.xml
+++ b/plugins/external-editor/org-gnome-external-editor.xml
@@ -1,7 +1,7 @@
 <Root>
   <commands>
 
-    <cmd name="EPExtEditor" _label="Compose in External Editor"
+    <cmd name="EPExtEditor" _label="Compose in _External Editor"
       _tip="Compose messages using an external editor"
       pixtype="pixmap"/>
 
diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog
index a1019c05e7..037aa01a3c 100644
--- a/plugins/google-account-setup/ChangeLog
+++ b/plugins/google-account-setup/ChangeLog
@@ -1,3 +1,41 @@
+2008-08-07  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #535745
+
+	* google-source.c: (sanitize_user_mail), (construct_default_uri),
+	(is_default_uri), (init_combo_values), (user_changed),
+	(cal_combo_changed), (claim_error), (retrieve_list_clicked),
+	(plugin_google): New widgets and functionality to retrieve list
+	of subscribed calendars from the Google account and let user choose
+	which one would be shown.
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #544860
+
+	* google-contacts-source.c (plugin_google_contacts):
+	Add translator comments for split "update every" sentence.
+
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-evolution-google.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
+2008-05-24  Jörgen Scheibengruber  <mfcn@gmx.de>
+
+	* Makefile.am:
+	* google-contacts-source.c (ensure_google_contacts_source_group),
+	(remove_google_contacts_source_group), (on_username_entry_changed),
+	(on_update_cb_toggled), (on_interval_sb_value_changed),
+	(plugin_google_contacts):
+	* google-contacts-source.h:
+	* google-source.c (e_plugin_lib_enable):
+	* org-gnome-evolution-google.eplug.xml:
+	Added a UI for the addressbook part
+
 2008-03-31  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #346555
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index 898083c65a..d1c385b172 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = 						\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	-I .						\
 	-I$(top_srcdir)	                                \
 	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		
@@ -10,7 +11,9 @@ plugin_DATA = org-gnome-evolution-google.eplug
 plugin_LTLIBRARIES = liborg-gnome-evolution-google.la
 
 liborg_gnome_evolution_google_la_SOURCES =        \
-	google-source.c
+	google-source.c \
+	google-contacts-source.h \
+	google-contacts-source.c
 
 liborg_gnome_evolution_google_la_LIBADD = 	\
 	$(EVOLUTION_CALENDAR_LIBS)		\
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
new file mode 100644
index 0000000000..d0c8e71e63
--- /dev/null
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2008, Joergen Scheibengruber <joergen.scheibengruber@googlemail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include <config.h>
+#include <string.h>
+
+#include <glib/gi18n-lib.h>
+#include <glib.h>
+
+#include <gtk/gtk.h>
+
+#include <e-util/e-config.h>
+#include <e-util/e-plugin.h>
+#include <addressbook/gui/widgets/eab-config.h>
+
+#include <libedataserver/e-source.h>
+#include <libedataserver/e-source-list.h>
+#include <libedataserver/e-url.h>
+#include <libedataserver/e-account-list.h>
+
+#include "google-contacts-source.h"
+
+
+void
+ensure_google_contacts_source_group (void)
+{
+    ESourceList  *source_list;
+    ESourceGroup *group;
+
+    source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
+
+    if (source_list == NULL) {
+        return;
+    }
+
+    group = e_source_list_peek_group_by_name (source_list, _("Google"));
+
+    if (group == NULL) {
+        gboolean res;
+
+        group = e_source_group_new (_("Google"), "google://");
+        res = e_source_list_add_group (source_list, group, -1);
+
+        if (res == FALSE) {
+            g_warning ("Could not add Google source group!");
+        } else {
+            e_source_list_sync (source_list, NULL);
+        }
+
+        g_object_unref (group);
+    }
+    g_object_unref (source_list);
+}
+
+void
+remove_google_contacts_source_group (void)
+{
+    ESourceList  *source_list;
+    ESourceGroup *group;
+
+    source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
+
+    if (source_list == NULL) {
+        return;
+    }
+
+    group = e_source_list_peek_group_by_name (source_list, _("Google"));
+
+    if (group) {
+        GSList *sources;
+
+        sources = e_source_group_peek_sources (group);
+
+        if (NULL == sources) {
+            e_source_list_remove_group (source_list, group);
+            e_source_list_sync (source_list, NULL);
+        }
+    }
+    g_object_unref (source_list);
+}
+
+static void
+on_username_entry_changed (GtkEntry *entry, gpointer user_data)
+{
+    ESource *source = user_data;
+    const char *text;
+    char *username;
+
+    text = gtk_entry_get_text (entry);
+
+    if (strstr (text, "@")) {
+        username = g_strdup (text);
+    } else {
+        username = g_strdup_printf ("%s@gmail.com", text);
+    }
+
+    e_source_set_relative_uri (source, username);
+    e_source_set_property (source, "username", username);
+    e_source_set_property (source, "auth", "plain/password");
+    g_free (username);
+}
+
+static void
+on_update_cb_toggled (GtkToggleButton *tb, gpointer user_data)
+{
+    ESource *source = user_data;
+    GtkWidget *sb = g_object_get_data (G_OBJECT (tb), "sb");
+
+    gtk_widget_set_sensitive (sb, gtk_toggle_button_get_active (tb));
+    if (gtk_toggle_button_get_active (tb)) {
+        gdouble value;
+        char *value_string;
+
+        value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (sb));
+        value_string = g_strdup_printf ("%d", (int)(value * 60.0));
+        e_source_set_property (source, "refresh-interval", value_string);
+        g_free (value_string);
+    } else {
+        e_source_set_property (source, "refresh-interval", "-1");
+    }
+}
+
+static void
+on_interval_sb_value_changed (GtkSpinButton *sb, gpointer user_data)
+{
+    ESource *source = user_data;
+    gdouble value;
+    char *value_string;
+
+    value = gtk_spin_button_get_value (sb);
+    value_string = g_strdup_printf ("%d", (int)(value * 60.0));
+    e_source_set_property (source, "refresh-interval", value_string);
+    g_free (value_string);
+}
+
+GtkWidget *
+plugin_google_contacts (EPlugin                    *epl,
+                        EConfigHookItemFactoryData *data)
+{
+    EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
+    ESource      *source;
+    ESourceGroup *group;
+    const char   *base_uri;
+    const char   *username;
+    const char   *refresh_interval_str;
+    int           refresh_interval;
+    GtkWidget    *parent;
+    GtkWidget    *vbox;
+
+    GtkWidget    *section;
+    GtkWidget    *vbox2;
+
+    GtkWidget    *hbox;
+    GtkWidget    *spacer;
+    GtkWidget    *label;
+    GtkWidget    *username_entry;
+
+    GtkWidget    *update_cb;
+    GtkWidget    *interval_sb;
+
+
+    source = t->source;
+    group = e_source_peek_group (source);
+
+    base_uri = e_source_group_peek_base_uri (group);
+
+    g_object_set_data_full (G_OBJECT (epl), "widget", NULL,
+                            (GDestroyNotify)gtk_widget_destroy);
+
+    if (strcmp (base_uri, "google://")) {
+        return NULL;
+    }
+
+    /* Build up the UI */
+    parent = data->parent;
+    vbox = gtk_widget_get_ancestor (gtk_widget_get_parent (parent), GTK_TYPE_VBOX);
+
+    vbox2 = gtk_vbox_new (FALSE, 6);
+    gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
+
+    section = gtk_label_new (NULL);
+    gtk_label_set_markup (GTK_LABEL (section), _("<b>Server</b>"));
+    gtk_misc_set_alignment (GTK_MISC (section), 0.0, 0.0);
+    gtk_box_pack_start (GTK_BOX (vbox2), section, FALSE, FALSE, 0);
+
+    hbox = gtk_hbox_new (FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0);
+
+    spacer = gtk_label_new ("   ");
+    gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
+
+    label = gtk_label_new (_("Username:"));
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+    username_entry = gtk_entry_new ();
+    username = e_source_get_property (source, "username");
+    if (username) {
+        gtk_entry_set_text (GTK_ENTRY (username_entry), username);
+    }
+    gtk_box_pack_start (GTK_BOX (hbox), username_entry, TRUE, TRUE, 0);
+
+    hbox = gtk_hbox_new (FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0);
+
+    spacer = gtk_label_new ("   ");
+    gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
+
+    refresh_interval_str = e_source_get_property (source, "refresh-interval");
+    if (refresh_interval_str &&
+        (1 == sscanf (refresh_interval_str, "%d", &refresh_interval))) {
+    } else {
+        refresh_interval = -1;
+    }
+
+    /* Translators: This is the first half of the sentence "Update
+     * every NNN minute(s)", where NNN is a spin button widget. */
+    update_cb = gtk_check_button_new_with_label (_("Update every"));
+    gtk_box_pack_start (GTK_BOX (hbox), update_cb, FALSE, FALSE, 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (update_cb),
+                                  refresh_interval > 0);
+
+    interval_sb = gtk_spin_button_new_with_range (1, 60, 1);
+    gtk_widget_set_sensitive (interval_sb,
+                              refresh_interval > 0);
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (interval_sb),
+                               refresh_interval > 0 ? refresh_interval / 60 : 30);
+    gtk_box_pack_start (GTK_BOX (hbox), interval_sb, FALSE, FALSE, 0);
+
+    /* Translators: This is the second half of the sentence "Update
+     * every NNN minute(s)", where NNN is a spin button widget. */
+    label = gtk_label_new (_("minute(s)"));
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+    gtk_widget_show_all (vbox2);
+
+    g_object_set_data (G_OBJECT (update_cb), "sb", interval_sb);
+    g_object_set_data_full (G_OBJECT (epl), "widget", vbox2,
+                            (GDestroyNotify)gtk_widget_destroy);
+
+    g_signal_connect (G_OBJECT (username_entry), "changed",
+                      G_CALLBACK (on_username_entry_changed),
+                      source);
+    g_signal_connect (G_OBJECT (update_cb), "toggled",
+                      G_CALLBACK (on_update_cb_toggled),
+                      source);
+    g_signal_connect (G_OBJECT (interval_sb), "value-changed",
+                      G_CALLBACK (on_interval_sb_value_changed),
+                      source);
+
+    return NULL;
+}
+
+
diff --git a/plugins/google-account-setup/google-contacts-source.h b/plugins/google-account-setup/google-contacts-source.h
new file mode 100644
index 0000000000..17421fb232
--- /dev/null
+++ b/plugins/google-account-setup/google-contacts-source.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2008, Joergen Scheibengruber <joergen.scheibengruber@googlemail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef __GOOGLE_CONTACTS_SOURCE_H__
+#define __GOOGLE_CONTACTS_SOURCE_H__
+
+GtkWidget *plugin_google_contacts (EPlugin                    *epl,
+                                   EConfigHookItemFactoryData *data);
+
+void       ensure_google_contacts_source_group (void);
+
+void       remove_google_contacts_source_group (void);
+
+#endif
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index d586b3027e..57727c6122 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -40,8 +40,18 @@
 #include <libedataserver/e-url.h>
 #include <libedataserver/e-account-list.h>
 #include <libecal/e-cal.h>
+#include <libedataserverui/e-cell-renderer-color.h>
+#include <libedataserverui/e-passwords.h>
+
+#include <google/libgdata/gdata-service-iface.h>
+#include <google/libgdata/gdata-feed.h>
+#include <google/libgdata-google/gdata-google-service.h>
+
+#include "google-contacts-source.h"
 
 #define CALENDAR_LOCATION "http://www.google.com/calendar/feeds/"
+#define CALENDAR_DEFAULT_PATH "/private/full"
+#define URL_GET_SUBSCRIBED_CALENDARS "http://www.google.com/calendar/feeds/default/allcalendars/full"
 
 #define d(x)
 
@@ -56,6 +66,8 @@ GtkWidget *      plugin_google               (EPlugin                    *epl,
 /*****************************************************************************/
 /* plugin intialization */
 
+
+
 static void
 ensure_google_source_group ()
 {
@@ -96,6 +108,9 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 	if (enable) {
 		d(printf ("\n Google Eplugin starting up ...\n"));
 		ensure_google_source_group ();
+		ensure_google_contacts_source_group ();
+	} else {
+		remove_google_contacts_source_group ();
 	}
 
 	return 0;
@@ -169,6 +184,83 @@ is_email (const char *address)
 	return TRUE;
 }
 
+static char *
+sanitize_user_mail (const char *user)
+{
+	if (!user)
+		return NULL;
+
+	if (!is_email (user)) {
+		return g_strconcat (user, "%40gmail.com", NULL);
+	} else {
+		char *tmp = g_malloc0 (sizeof (char) * (1 + strlen (user) + 2));
+		char *at = strchr (user, '@');
+
+		strncpy (tmp, user, at - user);
+		strcat (tmp, "%40");
+		strcat (tmp, at + 1);
+
+		return tmp;
+	}
+}
+
+static char *
+construct_default_uri (const char *username)
+{
+	char *user, *uri;
+
+	user = sanitize_user_mail (username);
+	uri = g_strconcat (CALENDAR_LOCATION, user, CALENDAR_DEFAULT_PATH, NULL);
+	g_free (user);
+
+	return uri;
+}
+
+/* checks whether the given_uri is pointing to the default user's calendar or not */
+static gboolean
+is_default_uri (const char *given_uri, const char *username)
+{
+	char *uri, *at;
+	int ats;
+	gboolean res;
+
+	if (!given_uri)
+		return TRUE;
+
+	uri = construct_default_uri (username);
+
+	/* count number of '@' in given_uri to know how much memory will be required */
+	ats = 0;
+	for (at = strchr (given_uri, '@'); at; at = strchr (at + 1, '@')) {
+		ats++;
+	}
+
+	if (!ats)
+		res = g_ascii_strcasecmp (given_uri, uri) == 0;
+	else {
+		const char *last;
+		char *tmp = g_malloc0 (sizeof (char) * (1 + strlen (given_uri) + (2 * ats)));
+
+		last = given_uri;
+		for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) {
+			strncat (tmp, last, at - last);
+			strcat (tmp, "%40");
+			last = at + 1;
+		}
+		strcat (tmp, last);
+
+		res = g_ascii_strcasecmp (tmp, uri) == 0;
+
+		g_free (tmp);
+	}
+
+	g_free (uri);
+
+	return res;
+}
+
+static void init_combo_values (GtkComboBox *combo, const char *deftitle, const char *defuri);
+
 static void
 user_changed (GtkEntry *editable, ESource *source)
 {
@@ -176,10 +268,8 @@ user_changed (GtkEntry *editable, ESource *source)
 	char       *uri;
 	char       *ruri;
 	const char *user;
-	char *projection;
 
 	uri = e_source_get_uri (source);
-	user = gtk_entry_get_text (GTK_ENTRY (editable));
 
 	if (uri == NULL) {
 		g_free (uri);
@@ -188,24 +278,27 @@ user_changed (GtkEntry *editable, ESource *source)
 
 	euri = e_uri_new (uri);
 	g_free (euri->user);
+	euri->user = NULL;
 
-	if (user != NULL) {
-		euri->user = g_strdup (user);
-		e_source_set_property (source, "auth", "1");
-	} else {
-		e_source_set_property (source, "auth", NULL);
-	}
-
-	projection = g_strdup ("/private/full");
+	/* two reasons why set readonly to FALSE:
+	   a) the e_source_set_relative_uri does nothing for readonly sources
+	   b) we are going to set default uri, which should be always writeable */
+	e_source_set_readonly (source, FALSE);
 
-	if (!is_email (user)) {
-		user = g_strconcat (user, "@gmail.com", NULL);
-	}
+	user = gtk_entry_get_text (GTK_ENTRY (editable));
+	uri = construct_default_uri (user);
+	e_source_set_relative_uri (source, uri);
+	g_free (uri);
 
-	e_source_set_relative_uri (source, g_strconcat (CALENDAR_LOCATION, g_strdup(user), g_strdup (projection), NULL));
-	e_source_set_property (source, "username", euri->user);
+	e_source_set_property (source, "username", gtk_entry_get_text (GTK_ENTRY (editable)));
 	e_source_set_property (source, "protocol", "google");
 	e_source_set_property (source, "auth-domain", "google");
+	e_source_set_property (source, "auth", (user && *user) ? "1" : NULL);
+	e_source_set_property (source, "googlename", NULL);
+
+	/* we changed user, thus reset the chosen calendar combo too, because
+	   other user means other calendars subscribed */
+	init_combo_values (GTK_COMBO_BOX (g_object_get_data (G_OBJECT (editable), "CalendarCombo")), _("Default"), NULL);
 
 	ruri = print_uri_noproto (euri);
 	g_free (ruri);
@@ -291,6 +384,229 @@ set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *option)
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time);
 }
 
+enum {
+	COL_COLOR = 0, /* GDK_TYPE_COLOR */
+	COL_TITLE,     /* G_TYPE_STRING */
+	COL_URL_PATH,  /* G_TYPE_STRING */
+	COL_READ_ONLY, /* G_TYPE_BOOLEAN */
+	NUM_COLUMNS
+};
+
+static void
+init_combo_values (GtkComboBox *combo, const char *deftitle, const char *defuri)
+{
+	GtkTreeIter iter;
+	GtkListStore *store;
+
+	if (!combo)
+		return;
+
+	store = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
+
+	gtk_list_store_clear (store);
+
+	gtk_list_store_append (store, &iter);
+	gtk_list_store_set (store, &iter,
+		COL_COLOR, NULL,
+		COL_TITLE, deftitle,
+		COL_URL_PATH, defuri,
+		COL_READ_ONLY, FALSE,
+		-1);
+
+	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
+}
+
+static void
+cal_combo_changed (GtkComboBox *combo, ESource *source)
+{
+	GtkListStore *store;
+	GtkTreeIter iter;
+
+	g_return_if_fail (combo != NULL);
+	g_return_if_fail (source != NULL);
+
+	store = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
+
+	if (gtk_combo_box_get_active_iter (combo, &iter)) {
+		char *uri = NULL, *title = NULL;
+		gboolean readonly = FALSE;
+
+		gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_TITLE, &title, COL_URL_PATH, &uri, COL_READ_ONLY, &readonly, -1);
+
+		if (!uri)
+			uri = construct_default_uri (e_source_get_property (source, "username"));
+
+		if (is_default_uri (uri, e_source_get_property (source, "username"))) {
+			/* do not store title when we use default uri */
+			g_free (title);
+			title = NULL;
+		}
+
+		/* first set readonly to FALSE, otherwise if TRUE, then e_source_set_readonly does nothing */
+		e_source_set_readonly (source, FALSE);
+		e_source_set_relative_uri (source, uri);
+		e_source_set_readonly (source, readonly);
+		e_source_set_property (source, "googlename", title);
+		e_source_set_property (source, "protocol", "google");
+		e_source_set_property (source, "auth-domain", "google");
+
+		g_free (title);
+		g_free (uri);
+	}
+}
+
+static void
+claim_error (GtkWindow *parent, const char *error)
+{
+	GtkWidget *dialog;
+
+	dialog = gtk_message_dialog_new (parent,
+			GTK_DIALOG_DESTROY_WITH_PARENT,
+			GTK_MESSAGE_ERROR,
+			GTK_BUTTONS_CLOSE,
+			error);
+	gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
+}
+
+static void
+retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
+{
+	ESource *source;
+	GDataGoogleService *service;
+	GDataFeed *feed;
+	char *password, *tmp;
+	const char *username;
+	GError *error = NULL;
+	GtkWindow *parent;
+
+	g_return_if_fail (button != NULL);
+	g_return_if_fail (combo != NULL);
+
+	parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (button)));
+
+	source = g_object_get_data (G_OBJECT (button), "ESource");
+	g_return_if_fail (source != NULL);
+
+	username = e_source_get_property (source, "username");
+	if (!username || !*username) {
+		claim_error (parent, _("Please enter user name first."));
+		return;
+	}
+
+	tmp = g_strdup_printf (_("Enter password for user %s to access list of subscribed calendars."), username);
+	password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp, 
+			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_REPROMPT | E_PASSWORDS_SECRET | E_PASSWORDS_DISABLE_REMEMBER,
+			NULL, parent);
+	g_free (tmp);
+
+	if (!password)
+		return;
+
+	service = gdata_google_service_new ("cl", "evolution-client-0.0.1");
+	gdata_service_set_credentials (GDATA_SERVICE (service), username, password);
+	/* privacy... maybe... */
+	memset (password, 0, strlen (password));
+	g_free (password);
+
+	feed = gdata_service_get_feed (GDATA_SERVICE (service), URL_GET_SUBSCRIBED_CALENDARS, &error);
+
+	if (feed) {
+		GSList *l;
+		char *old_selected = NULL;
+		int idx, active = -1, default_idx = -1;
+		GtkListStore *store = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
+		GtkTreeIter iter;
+
+		if (gtk_combo_box_get_active_iter (combo, &iter))
+			gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_URL_PATH, &old_selected, -1);
+
+		gtk_list_store_clear (store);
+
+		for (l = gdata_feed_get_entries (feed), idx = 1; l != NULL; l = l->next) {
+			const char *uri, *title, *color, *access;
+			GSList *links;
+			GDataEntry *entry = (GDataEntry *) l->data;
+
+			if (!entry || !GDATA_IS_ENTRY (entry))
+				continue;
+
+			/* skip hidden entries */
+			if (gdata_entry_get_custom (entry, "hidden") && g_ascii_strcasecmp (gdata_entry_get_custom (entry, "hidden"), "true") == 0)
+				continue;
+
+			uri = NULL;
+			for (links = gdata_entry_get_links (entry); links && !uri; links = links->next) {
+				GDataEntryLink *link = (GDataEntryLink *)links->data;
+
+				if (!link || !link->href || !link->rel)
+					continue;
+
+				if (g_ascii_strcasecmp (link->rel, "alternate") == 0)
+					uri = link->href;
+			}
+
+			title = gdata_entry_get_title (entry);
+			color = gdata_entry_get_custom (entry, "color");
+			access = gdata_entry_get_custom (entry, "accesslevel");
+
+			if (uri && title) {
+				GdkColor gdkcolor;
+
+				if (old_selected && g_str_equal (old_selected, uri))
+					active = idx;
+
+				if (color)
+					gdk_color_parse (color, &gdkcolor);
+
+				if (default_idx == -1 && is_default_uri (uri, username)) {
+					/* have the default uri always NULL and first in the combo */
+					uri = NULL;
+					gtk_list_store_insert (store, &iter, 0);
+					default_idx = idx;
+				} else {
+					gtk_list_store_append (store, &iter);
+				}
+
+				gtk_list_store_set (store, &iter,
+					COL_COLOR, color ? &gdkcolor : NULL,
+					COL_TITLE, title,
+					COL_URL_PATH, uri,
+					COL_READ_ONLY, access && !g_str_equal (access, "owner") && !g_str_equal (access, "contributor"),
+					-1);
+				idx++;
+			}
+		}
+
+		if (default_idx == -1) {
+			/* Hey, why we didn't find the default uri? Did something go so wrong or what? */
+			gtk_list_store_insert (store, &iter, 0);
+			gtk_list_store_set (store, &iter,
+				COL_COLOR, NULL,
+				COL_TITLE, _("Default"),
+				COL_URL_PATH, NULL,
+				COL_READ_ONLY, FALSE,
+				-1);
+		}
+
+		gtk_combo_box_set_active (combo, active == -1 ? 0 : active);
+
+		g_free (old_selected);
+		g_object_unref (feed);
+	} else {
+		tmp = g_strdup_printf (_("Cannot read data from Google server.\n%s"), (error && error->message) ? error->message : _("Unknown error."));
+		claim_error (parent, tmp);
+		g_free (tmp);
+
+		if (error) {
+			g_error_free (error);
+			error = NULL;
+		}
+	}
+
+	g_object_unref (service);
+}
+
 GtkWidget *
 plugin_google  (EPlugin                    *epl,
 	     EConfigHookItemFactoryData *data)
@@ -305,11 +621,14 @@ plugin_google  (EPlugin                    *epl,
 	GtkWidget    *luser;
 	GtkWidget    *user;
 	GtkWidget    *label;
+	GtkWidget    *combo;
 	char         *uri;
 	char         *username;
 	const char   *ssl_prop;
 	gboolean      ssl_enabled;
 	int           row;
+	GtkCellRenderer *renderer;
+	GtkListStore *store;
 
 	GtkWidget *option, *spin, *menu, *hbox;
 	GtkWidget *times [4];
@@ -425,7 +744,48 @@ plugin_google  (EPlugin                    *epl,
         g_free (uri);
 	g_free (username);
 
-	return widget;
-}
+	label = gtk_label_new_with_mnemonic (_("Cal_endar:"));
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_widget_show (label);
+	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row + 4, row + 5, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+
+	store = gtk_list_store_new (
+		NUM_COLUMNS,
+		GDK_TYPE_COLOR,		/* COL_COLOR */
+		G_TYPE_STRING,		/* COL_TITLE */
+		G_TYPE_STRING,		/* COL_URL_PATH */
+		G_TYPE_BOOLEAN);	/* COL_READ_ONLY */
+
+	combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
+
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+
+	renderer = e_cell_renderer_color_new ();
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "color", COL_COLOR, NULL);
+
+	renderer = gtk_cell_renderer_text_new ();
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "text", COL_TITLE, NULL);
+
+	init_combo_values (GTK_COMBO_BOX (combo),
+		e_source_get_property (source, "googlename") ? e_source_get_property (source, "googlename") : _("Default"),
+		e_source_get_property (source, "googlename") ? e_source_peek_relative_uri (source) : NULL);
 
+	g_signal_connect (combo, "changed", G_CALLBACK (cal_combo_changed), source);
 
+	g_object_set_data (G_OBJECT (user), "CalendarCombo", combo);
+
+	hbox = gtk_hbox_new (FALSE, 6);
+
+	gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+	label = gtk_button_new_with_mnemonic (_("Retrieve _list"));
+	g_signal_connect (label, "clicked", G_CALLBACK (retrieve_list_clicked), combo);
+	g_object_set_data (G_OBJECT (label), "ESource", source);
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+	gtk_widget_show_all (hbox);
+	gtk_table_attach (GTK_TABLE (parent), hbox, 1, 2, row + 4, row + 5, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+
+	return widget;
+}
diff --git a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
index d6087ad748..93a8aeee2d 100644
--- a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
+++ b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0"?>
 <e-plugin-list>
   <e-plugin id="org.gnome.evolution.google" type="shlib" _name="Google sources"
-    location="@PLUGINDIR@/liborg-gnome-evolution-google@SOEXT@" load-on-startup="false" localedir = "@LOCALEDIR@">
+    location="@PLUGINDIR@/liborg-gnome-evolution-google@SOEXT@" load-on-startup="false" localedir = "@LOCALEDIR@" system_plugin="true">
     <author name="Ebby Wiselyn" email="ebbywiselyn@gmail.com"/>
-    <_description>A plugin to setup google calendar.</_description>
-    
+    <author name="Joergen Scheibengruber" email="joergen.scheibengruber@googlemail.com"/>
+    <_description>A plugin to setup google calendar and contacts.</_description>
+
     <hook class="org.gnome.evolution.calendar.config:1.0">
       <group target="source" id="org.gnome.evolution.calendar.calendarProperties">
-	<item type="item_table" path="00.general/00.source/15.google" factory="plugin_google"/>
+        <item type="item_table" path="00.general/00.source/15.google" factory="plugin_google"/>
+      </group>
+    </hook>
+    <hook class="org.gnome.evolution.addressbook.config:1.0">
+      <group target="source" id="com.novell.evolution.addressbook.config.accountEditor">
+        <item type="item" path="00.general/10.display/00.google" factory="plugin_google_contacts"/>
       </group>
     </hook>
   </e-plugin>
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 6e158a510c..6c0e4211e6 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-gw-account-setup.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
 2008-04-30  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	** Fixes #358644 (bnc)
diff --git a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
index dd7886348c..3174226137 100644
--- a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
+++ b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <e-plugin-list>
   <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="Groupwise Account Setup"
-    location="@PLUGINDIR@/liborg-gnome-gw-account-setup@SOEXT@" load-on-startup="true">
+    location="@PLUGINDIR@/liborg-gnome-gw-account-setup@SOEXT@" load-on-startup="true" system_plugin="true">
     <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
     <_description>A plugin to setup groupwise calendar and contacts sources.</_description>
     
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index f0587b07df..1b18e0c3f2 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,18 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #544861
+
+	* org-gnome-proxy-login-errors.xml:
+	Reword "invalid-user" error message.
+
+2008-07-28  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #543756
+
+	* org-gnome-shared-folder.errors.xml:
+	* process-meeting.c: (process_meeting):
+	Make question better translatable.
+
 2008-06-20  Sankar P  <psankar@novell.com>
 
 	* mail-retract.c (retract_mail_settings):
diff --git a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
index 2523f51056..36d8527e49 100644
--- a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
+++ b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
@@ -3,7 +3,7 @@
 <error id="invalid-user" type="error">
 <_primary>Invalid user</_primary>
 <_secondary>
-Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and try again. 
+Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again. 
 </_secondary>
 </error>
 
diff --git a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
index 85ce4ac156..5e7bfb28e5 100644
--- a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
+++ b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
@@ -15,9 +15,17 @@ You cannot share folder with specified user &quot;{0}&quot;
 </_secondary>
 </error>
 
-<error id="recurrence" type="question" default="GTK_RESPONSE_YES">
+<error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES">
 <_primary>This is a recurring meeting</_primary>
-<_secondary>What would you like to {0}?</_secondary>
+<_secondary>Would you like to accept it?</_secondary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button label="This instance" response="GTK_RESPONSE_NO"/>
+ <button label="All instances" response="GTK_RESPONSE_YES"/>
+</error>
+
+<error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES">
+<_primary>This is a recurring meeting</_primary>
+<_secondary>Would you like to decline it?</_secondary>
  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
  <button label="This instance" response="GTK_RESPONSE_NO"/>
  <button label="All instances" response="GTK_RESPONSE_YES"/>
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 5b8da30b7e..f4606439ce 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -221,14 +221,14 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 
 		if (recurring) {
 			gint response;
-			const char *arg;
+			const char *msg;
 
 			if (status == ICAL_PARTSTAT_ACCEPTED || status == ICAL_PARTSTAT_TENTATIVE)
-				arg = "accept";
+				msg = "org.gnome.evolution.mail_shared_folder:recurrence-accept";
 			else
-				arg = "decline";
+				msg = "org.gnome.evolution.mail_shared_folder:recurrence-decline";
 
-			response = e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:recurrence", arg, NULL);
+			response = e_error_run (NULL, msg, NULL);
 			if (response == GTK_RESPONSE_YES) {
 				icalproperty *prop;
 				const char *uid = icalcomponent_get_uid (r_data->icalcomp);
diff --git a/plugins/hula-account-setup/ChangeLog b/plugins/hula-account-setup/ChangeLog
index 5ada817be3..de0ceee8de 100644
--- a/plugins/hula-account-setup/ChangeLog
+++ b/plugins/hula-account-setup/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-hula-account-setup.eplug.xml:
+	Add "system_plugin=true" so it's not shown in the Plugin Manager.
+	This plugin is not designed to be disabled by the user.
+
 2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* camel-hula-listener.c: (camel_hula_listener_new):
diff --git a/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml b/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
index 9a0c92e891..24b3467d19 100644
--- a/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
+++ b/plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <e-plugin-list>
   <e-plugin id="org.gnome.evolution.plugin.hula-account-setup" type="shlib" _name="Hula Account Setup"
-    location="@PLUGINDIR@/liborg-gnome-evolution-hula-account-setup@SOEXT@" load-on-startup="true">
+    location="@PLUGINDIR@/liborg-gnome-evolution-hula-account-setup@SOEXT@" load-on-startup="true" system_plugin="true">
     <author name="Harish Krishnaswamy" email="kharish@novell.com"/>
     <_description>A plugin to setup hula calendar sources.</_description>
     
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index fbcd25aa96..6d6d93f1e2 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,22 @@
+2008-07-28  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #491176
+
+	* itip-view.c: (itip_view_init): Word-wrap the summary if necessary;
+	expand also value-labels in the table, thus the text will be aligned
+	on the left; align action buttons on the left too.
+
+2008-07-17  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	* itip-formatter.c: (view_response_cb): Added some 
+	FIXME's for code cleanup.						
+
+2008-07-16  Sankar P  <psankar@novell.com>
+
+	Pushing disk summary changes from the madagascar branch
+
+	* itip-formatter.c (view_response_cb):
+
 2008-05-29  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #535459
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 5447ac3537..d89d74ccf5 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -1652,6 +1652,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 		icalcomponent_add_property (pitip->ical_comp, prop);
 	}
 
+	/*FIXME Save schedules is misused here, remove it */
 	save_schedules = e_cal_get_save_schedules (pitip->current_ecal);
 
 	switch (response) {
@@ -1713,6 +1714,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 			break;
 	}
 
+	/* FIXME Remove this and handle this at the groupwise mail provider */
 	if (delete_invitation_from_cache) {
 		CamelFolderChangeInfo *changes = NULL;
 		const char *tag = NULL;
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index d130d3a6f1..061e1daf6b 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -995,8 +995,10 @@ itip_view_init (ItipView *view)
 	/* Summary */
 	priv->summary_label = gtk_label_new (NULL);
 	gtk_misc_set_alignment (GTK_MISC (priv->summary_label), 0, 0.5);
+	gtk_label_set_line_wrap_mode (GTK_LABEL (priv->summary_label), PANGO_WRAP_WORD);
+	gtk_label_set_line_wrap (GTK_LABEL (priv->summary_label), TRUE);
 	gtk_widget_show (priv->summary_label);
-	gtk_table_attach (GTK_TABLE (table), priv->summary_label, 0, 2, 0, 1, GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (table), priv->summary_label, 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	/* Location */
 	priv->location_header = gtk_label_new (_("Location:"));
@@ -1004,7 +1006,7 @@ itip_view_init (ItipView *view)
 	gtk_misc_set_alignment (GTK_MISC (priv->location_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->location_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->location_header, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), priv->location_label, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (table), priv->location_label, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	/* Start time */
 	priv->start_header = gtk_label_new (_("Start time:"));
@@ -1013,7 +1015,7 @@ itip_view_init (ItipView *view)
 	gtk_misc_set_alignment (GTK_MISC (priv->start_label), 0, 0.5);
 	gtk_widget_show (priv->start_header);
 	gtk_table_attach (GTK_TABLE (table), priv->start_header, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), priv->start_label, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (table), priv->start_label, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	/* End time */
 	priv->end_header = gtk_label_new (_("End time:"));
@@ -1021,7 +1023,7 @@ itip_view_init (ItipView *view)
 	gtk_misc_set_alignment (GTK_MISC (priv->end_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->end_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->end_header, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), priv->end_label, 1, 2, 3, 4, GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (table), priv->end_label, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	/* Status */
 	priv->status_header = gtk_label_new (_("Status:"));
@@ -1029,7 +1031,7 @@ itip_view_init (ItipView *view)
 	gtk_misc_set_alignment (GTK_MISC (priv->status_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->status_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->status_header, 0, 1, 4, 5, GTK_FILL, 0, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), priv->status_label, 1, 2, 4, 5, GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (table), priv->status_label, 1, 2, 4, 5, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	/* Comment */
 	priv->comment_header = gtk_label_new (_("Comment:"));
@@ -1037,7 +1039,7 @@ itip_view_init (ItipView *view)
 	gtk_misc_set_alignment (GTK_MISC (priv->comment_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->comment_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->comment_header, 0, 1, 5, 6, GTK_FILL, 0, 0, 0);
-	gtk_table_attach (GTK_TABLE (table), priv->comment_label, 1, 2, 5, 6, GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (table), priv->comment_label, 1, 2, 5, 6, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	/* Upper Info items */
 	priv->upper_info_box = gtk_vbox_new (FALSE, 12);
@@ -1119,7 +1121,7 @@ itip_view_init (ItipView *view)
 
 	/* The buttons for actions */
 	priv->button_box = gtk_hbutton_box_new ();
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (priv->button_box), GTK_BUTTONBOX_END);
+	gtk_button_box_set_layout (GTK_BUTTON_BOX (priv->button_box), GTK_BUTTONBOX_START);
 	gtk_box_set_spacing (GTK_BOX (priv->button_box), 12);
 	gtk_widget_show (priv->button_box);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->button_box, FALSE, FALSE, 0);
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog
index b14337ce9a..278f8bb93a 100644
--- a/plugins/mail-notification/ChangeLog
+++ b/plugins/mail-notification/ChangeLog
@@ -1,3 +1,34 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #514006
+
+	* apps-evolution-mail-notification.schemas.in:
+	Quote literal values.
+
+2008-08-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #353927
+
+	* mail-notification.c: (icon_activated), (stop_blinking_cb),
+	(new_notify_status): Do not blink the icon more than 15 seconds.
+
+2008-07-22  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #544022
+
+	* Makefile.am:
+	* mail-notification.c: (send_dbus_message): Do not redefine
+	DBUS_VERSION define, it's supplied by dbus itself.
+
+2008-07-16  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #543134
+
+	* mail-notification.c: (get_cfg_widget), (do_properties),
+	(popup_menu_status), (new_notify_status),
+	(e_plugin_lib_get_configure_widget):
+	Show popup menu when right-click over the status icon.
+
 2008-01-28  Johnny Jacob  <jjohnny@novell.com>
 
 	* mail-notification.c (new_notify_status): Adding proper 
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 38b4f051f7..86fc91cc11 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES =					\
 
 if ENABLE_DBUS
 INCLUDES += 	-DDBUS_API_SUBJECT_TO_CHANGE=1		\
-		-DDBUS_VERSION=$(DBUS_VERSION)          \
+		-DFOUND_DBUS_VERSION=$(FOUND_DBUS_VERSION)          \
 		$(NMN_CFLAGS)
 endif
 
diff --git a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
index 4bdafcfec1..c0a038068d 100644
--- a/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
+++ b/plugins/mail-notification/apps-evolution-mail-notification.schemas.in
@@ -77,7 +77,7 @@
       <default>true</default>
       <locale name="C">
         <short>Beep or play sound file.</short>
-        <long>If true, then beep, otherwise will play sound file when new messages arrive.</long>
+        <long>If "true", then beep, otherwise will play sound file when new messages arrive.</long>
       </locale>
     </schema>
     <schema>
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 8af29023b8..afa633c999 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -55,6 +55,7 @@
 #define GCONF_KEY_ENABLED_SOUND	 	GCONF_KEY_ROOT "sound-enabled"
 
 static gboolean enabled = FALSE;
+static GtkWidget *get_cfg_widget (void);
 
 /**
  * each part should "implement" its own "public" functions:
@@ -135,7 +136,7 @@ send_dbus_message (const char *name, const char *data, guint new)
 
 	/* Appends the data as an argument to the message */
 	dbus_message_append_args (message,
-#if DBUS_VERSION >= 310
+#if FOUND_DBUS_VERSION >= 310
 				  DBUS_TYPE_STRING, &data,
 #else
 				  DBUS_TYPE_STRING, data,
@@ -145,7 +146,7 @@ send_dbus_message (const char *name, const char *data, guint new)
 	if (new) {
 		char * display_name = em_utils_folder_name_from_uri (data);
 		dbus_message_append_args (message,
-#if DBUS_VERSION >= 310
+#if FOUND_DBUS_VERSION >= 310
 					  DBUS_TYPE_STRING, &display_name, DBUS_TYPE_UINT32, &new,
 #else
 					  DBUS_TYPE_STRING, display_name, DBUS_TYPE_UINT32, new,
@@ -270,6 +271,7 @@ get_config_widget_dbus (void)
 #define GCONF_KEY_STATUS_NOTIFICATION	GCONF_KEY_ROOT "status-notification"
 
 static GtkStatusIcon *status_icon = NULL;
+static guint blink_timeout_id = 0;
 static unsigned int status_count = 0;
 
 #ifdef HAVE_LIBNOTIFY
@@ -294,6 +296,11 @@ icon_activated (GtkStatusIcon *icon, gpointer pnotify)
 	gtk_status_icon_set_visible (status_icon, FALSE);
 	g_object_unref (status_icon);
 
+	if (blink_timeout_id) {
+		g_source_remove (blink_timeout_id);
+		blink_timeout_id = 0;
+	}
+
 	status_icon = NULL;
 	status_count = 0;
 }
@@ -306,6 +313,17 @@ notification_callback (gpointer notify)
 }
 #endif
 
+static gboolean
+stop_blinking_cb (gpointer data)
+{
+	blink_timeout_id = 0;
+
+	if (status_icon)
+		gtk_status_icon_set_blinking (status_icon, FALSE);
+
+	return FALSE;
+}
+
 struct _StatusConfigureWidgets
 {
 	GtkWidget *enable;
@@ -348,11 +366,88 @@ toggled_status_cb (GtkWidget *widget, gpointer data)
 /* -------------------------------------------------------------------  */
 
 static void
+do_properties (GtkMenuItem *item, gpointer user_data)
+{
+	GtkWidget *cfg, *dialog, *vbox, *label, *hbox;
+	char *text;
+
+	cfg = get_cfg_widget ();
+	if (!cfg)
+		return;
+
+	text = g_strconcat ("<span size=\"x-large\">", _("Evolution's Mail Notification"), "</span>", NULL);
+
+	vbox = gtk_vbox_new (FALSE, 10);
+	label = gtk_label_new (NULL);
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+	gtk_label_set_markup (GTK_LABEL (label), text);
+	g_free (text);
+
+	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+	gtk_widget_show (label);
+	gtk_widget_show (vbox);
+
+	hbox = gtk_hbox_new (FALSE, 10);
+	label = gtk_label_new ("   ");
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+	gtk_widget_show_all (hbox);
+
+	gtk_box_pack_start (GTK_BOX (hbox), cfg, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+
+	dialog = gtk_dialog_new_with_buttons (_("Mail Notification Properties"),
+						NULL, 
+						GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, 
+						GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+						NULL);
+
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
+	gtk_widget_set_size_request (dialog, 400, -1);
+	g_signal_connect_swapped (dialog, "response",  G_CALLBACK (gtk_widget_destroy), dialog);
+	gtk_widget_show (dialog);
+}
+
+static void
+popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
+{
+	GtkMenu *menu;
+	GtkWidget *item;
+
+	menu = GTK_MENU (gtk_menu_new ());
+
+	item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, NULL);
+	#ifdef HAVE_LIBNOTIFY
+	g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (icon_activated), notify);
+	#else
+	g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (icon_activated), NULL);
+	#endif
+	gtk_widget_show (item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	
+	item = gtk_separator_menu_item_new ();
+	gtk_widget_show (item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+	item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
+	g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (do_properties), NULL);
+	gtk_widget_show (item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+	g_object_ref_sink (menu);
+	gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, activate_time);
+	g_object_unref (menu);
+}
+
+static void
 new_notify_status (EMEventTargetFolder *t)
 {
 	char *msg;
+	gboolean new_icon = !status_icon;
 
-	if (!status_icon) {
+	if (new_icon) {
 		status_icon = gtk_status_icon_new ();
 		gtk_status_icon_set_from_pixbuf (status_icon, e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_LARGE_TOOLBAR));
 	}
@@ -370,8 +465,13 @@ new_notify_status (EMEventTargetFolder *t)
 	}
 
 	gtk_status_icon_set_tooltip (status_icon, msg);
+
+	if (new_icon && is_part_enabled (GCONF_KEY_STATUS_BLINK)) {
+		gtk_status_icon_set_blinking (status_icon, TRUE);
+		blink_timeout_id = g_timeout_add_seconds (15, stop_blinking_cb, NULL);
+	}
+
 	gtk_status_icon_set_visible (status_icon, TRUE);
-	gtk_status_icon_set_blinking (status_icon, is_part_enabled (GCONF_KEY_STATUS_BLINK));
 
 	#ifdef HAVE_LIBNOTIFY
 	/* Now check whether we're supposed to send notifications */
@@ -399,6 +499,8 @@ new_notify_status (EMEventTargetFolder *t)
 	#else
 	g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL);
 	#endif
+
+	g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL);
 }
 
 static void
@@ -694,6 +796,37 @@ toggled_only_inbox_cb (GtkWidget *widget, gpointer data)
 	set_part_enabled (GCONF_KEY_NOTIFY_ONLY_INBOX, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
 }
 
+static GtkWidget *
+get_cfg_widget (void)
+{
+	GtkWidget *cfg, *vbox, *check;
+
+	vbox = gtk_vbox_new (FALSE, 6);
+	check = gtk_check_button_new_with_mnemonic (_("Notify new messages for _Inbox only"));
+
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), is_part_enabled (GCONF_KEY_NOTIFY_ONLY_INBOX));
+	g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (toggled_only_inbox_cb), NULL);
+	gtk_widget_show (check);
+	gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+
+#ifdef HAVE_DBUS	
+	cfg = get_config_widget_dbus ();
+	if (cfg)
+		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
+#endif 
+	cfg = get_config_widget_status ();
+	if (cfg)
+		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
+
+	cfg = get_config_widget_sound ();
+	if (cfg)
+		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
+
+	gtk_widget_show (vbox);
+
+	return vbox;
+}
+
 void org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t);
 void org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t);
 
@@ -779,30 +912,5 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 GtkWidget *
 e_plugin_lib_get_configure_widget (EPlugin *epl)
 {
-	GtkWidget *cfg, *vbox, *check;
-
-	vbox = gtk_vbox_new (FALSE, 6);
-	check = gtk_check_button_new_with_mnemonic (_("Notify new messages for _Inbox only"));
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), is_part_enabled (GCONF_KEY_NOTIFY_ONLY_INBOX));
-	g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (toggled_only_inbox_cb), NULL);
-	gtk_widget_show (check);
-	gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
-
-#ifdef HAVE_DBUS	
-	cfg = get_config_widget_dbus ();
-	if (cfg)
-		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
-#endif 
-	cfg = get_config_widget_status ();
-	if (cfg)
-		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
-
-	cfg = get_config_widget_sound ();
-	if (cfg)
-		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
-
-	gtk_widget_show (vbox);
-
-	return vbox;
+	return get_cfg_widget ();
 }
diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog
index bfd604cfbe..caf1e71e70 100644
--- a/plugins/mark-all-read/ChangeLog
+++ b/plugins/mark-all-read/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-07  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #530402
+
+	* mark-all-read.c (prompt_user):
+	Improve dialog wording, and don't use a window title (HIG).
+
 2008-05-16  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #514383
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index 8940551e47..af6c482288 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -34,9 +34,10 @@
 #include "e-util/e-error.h"
 
 #define PRIMARY_TEXT \
-	N_("Mark all messages in this folder and subfolders as read?")
+	N_("Also mark messages in subfolders?")
 #define SECONDARY_TEXT \
-	N_("Do you want the operation to be performed also in the subfolders?")
+	N_("Do you want to mark messages as read in the current folder " \
+	   "only, or in the current folder as well as all subfolders?")
 
 void org_gnome_mark_all_read (EPlugin *ep, EMPopupTargetFolder *target);
 static void mar_got_folder (char *uri, CamelFolder *folder, void *data);
@@ -81,8 +82,7 @@ prompt_user (void)
 	dialog = gtk_dialog_new ();
 	gtk_widget_hide (GTK_DIALOG (dialog)->action_area);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-	gtk_window_set_title (
-		GTK_WINDOW (dialog), _("Mark All Messages as Read"));
+	gtk_window_set_title (GTK_WINDOW (dialog), "");
 	g_signal_connect (
 		dialog, "map",
 		G_CALLBACK (gtk_widget_queue_resize), NULL);
diff --git a/plugins/python/ChangeLog b/plugins/python/ChangeLog
index 43a0bd3482..063418150e 100644
--- a/plugins/python/ChangeLog
+++ b/plugins/python/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-21  Johnny Jacob  <jjohnny@novell.com>
+
+	* Makefile.am (example_sources): More typo fixes. :(
+
+2008-07-21  Johnny Jacob  <jjohnny@novell.com>
+
+	* Makefile.am (example_SOURCES): Add example sources
+	EXTRA_DIST.
+
 2008-06-12  Johnny Jacob  <jjohnny@novell.com>
 
 	* example/org-gnome-hello-python-ui.xml: Added.
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index 854c7915f6..7a65c4586a 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -15,7 +15,14 @@ liborg_gnome_evolution_python_la_LIBADD =	\
 	$(PY_LIBS) \
 	$(E_UTIL_LIBS)
 
-EXTRA_DIST = org-gnome-evolution-python.eplug.xml
+example_sources =					\
+	example/hello_python.py 			\
+	example/org-gnome-hello-python-ui.xml		\
+	example/org-gnome-hello-python.eplug.xml	\
+	example/Makefile.am	
+
+EXTRA_DIST = org-gnome-evolution-python.eplug.xml	\
+	$(example_sources)
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog
index 2aad1c410e..faeebb70f1 100644
--- a/plugins/startup-wizard/ChangeLog
+++ b/plugins/startup-wizard/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #529460
+
+	* org-gnome-evolution-startup-wizard.eplug.xml:
+	Change "Startup Wizard" to "Setup Assistant".  Also make the
+	plugin description less lame.
+
 2008-06-02  Jacob Brown  <jeblinux@gmail.com>
 
 	** Fix for bug #529464
diff --git a/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml b/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
index 0f57b6db89..1197633a23 100644
--- a/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
+++ b/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
@@ -4,9 +4,9 @@
 	    type="shlib"
 	    id="org.gnome.evolution.plugin.startup-wizard"
 	    location="@PLUGINDIR@/liborg-gnome-evolution-startup-wizard@SOEXT@"
-	    _name="Startup wizard">
+	    _name="Setup Assistant">
 	     <author name="JP Rosevear" email="jpr@novell.com"/>
-	     <_description>A plugin that manages the Startup wizard.</_description>
+	     <_description>Guides you through your initial account setup.</_description>
 		<hook class="org.gnome.evolution.shell.events:1.0">
 			<event
 			   id="upgrade.done"
diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog
new file mode 100644
index 0000000000..c559689e43
--- /dev/null
+++ b/plugins/templates/ChangeLog
@@ -0,0 +1,19 @@
+2008-07-21  Johnny Jacob  <jjohnny@novell.com>
+
+	* templates.c: Remove unused header files.
+
+	* Makefile.am (INCLUDES): Allow includes from top_builddir.
+
+2008-07-18  Bharath Acharya  <abharath@novell.com>
+
+	** Fixes Bug #200147
+
+	Basic functionality implemented by Diego Escalante Urrelo 
+	<diegoe@gnome.org> Everyone owes him a big mug of Beer for that.
+
+	** Added Templates plugin
+	* Makefile.am:
+	* apps-evolution-template-placeholders.schemas.in:
+	* org-gnome-templates.eplug.xml:
+	* templates.c: 
+	* templates.glade:
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
new file mode 100644
index 0000000000..f43dce0992
--- /dev/null
+++ b/plugins/templates/Makefile.am
@@ -0,0 +1,41 @@
+INCLUDES =						\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	-I$(top_builddir)/composer			\
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
+	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
+
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = 					\
+		org-gnome-templates.eplug	\
+		templates.glade
+
+plugin_LTLIBRARIES = liborg-gnome-templates.la
+
+liborg_gnome_templates_la_SOURCES = templates.c
+liborg_gnome_templates_la_LDFLAGS = -module -avoid-version
+
+schemadir       = $(GCONF_SCHEMA_FILE_DIR)
+schema_in_files = apps-evolution-template-placeholders.schemas.in
+schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
+
+@INTLTOOL_SCHEMAS_RULE@
+
+install-data-local:
+	if test -z "$(DESTDIR)" ; then                                                                                          \
+		for p in $(schema_DATA) ; do                                                                                    \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p;             \
+		done                                                                                                            \
+	fi
+
+EXTRA_DIST = 	org-gnome-templates.eplug.xml	\
+		$(schema_in_files)	   	\
+		templates.glade
+
+BUILT_SOURCES = org-gnome-templates.eplug
+
+CLEANFILES = $(BUILT_SOURCES)
+
+DISTCLEANFILES = $(schema_DATA)
diff --git a/plugins/templates/apps-evolution-template-placeholders.schemas.in b/plugins/templates/apps-evolution-template-placeholders.schemas.in
new file mode 100644
index 0000000000..c6a1f4d07d
--- /dev/null
+++ b/plugins/templates/apps-evolution-template-placeholders.schemas.in
@@ -0,0 +1,26 @@
+<gconfschemafile>
+  <schemalist>
+    <schema>
+      <key>/schemas/apps/evolution/mail/template_placeholders</key>
+      <applyto>/apps/evolution/mail/template_placeholders</applyto>
+      <owner>evolution-mail</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+
+      <!-- The following are the keyword/value pairs used by the plugin to 
+      substitute the messages stored under the Templates folder. The list can 
+      have any number of such pairs.-->
+
+      <default>[myphone=012345,myplace=Abcd,myname=Alice]</default>
+      <locale name="C">
+         <short>List of keyword/value pairs for the Templates plugin to 
+		substitute in a message body.</short>
+         <long>
+	       List of keyword/value pairs for the Templates plugin to 
+	       substitute in a message body.
+         </long>
+      </locale>
+    </schema>
+  </schemalist>
+</gconfschemafile>
+
diff --git a/plugins/templates/org-gnome-templates.eplug.xml b/plugins/templates/org-gnome-templates.eplug.xml
new file mode 100644
index 0000000000..02b14148ad
--- /dev/null
+++ b/plugins/templates/org-gnome-templates.eplug.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<e-plugin-list>
+    <e-plugin
+        type="shlib"
+        id="org.gnome.evolution.plugin.templates"
+        location="@PLUGINDIR@/liborg-gnome-templates@SOEXT@"
+        _name="Templates">
+        <_description>Drafts based template plugin</_description>
+        <author name="Bharath Acharya" email="abharath@novell.com"/>
+	<author name="Diego Escalante Urrelo" email="diegoe@gnome.org"/>
+
+        <!-- hook into the mail popup menu -->
+        <hook class="org.gnome.evolution.mail.popup:1.0">
+            <menu 
+                id="org.gnome.evolution.mail.folderview.popup" 
+                target="select"
+                factory="org_gnome_templates_popup">
+            </menu>
+        </hook>
+
+	<hook class="org.gnome.evolution.ui:1.0">
+		<ui-manager id="org.gnome.evolution.composer">
+			<menubar name='main-menu'>
+				<placeholder name='pre-edit-menu'>
+      					<menu action='file-menu'>
+						<placeholder name="template-holder">
+							<menuitem action="Template"/>
+						</placeholder>
+					</menu>
+				</placeholder>
+			</menubar>
+		</ui-manager>
+	</hook>
+    </e-plugin>
+</e-plugin-list>
+
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
new file mode 100644
index 0000000000..c72ae942a9
--- /dev/null
+++ b/plugins/templates/templates.c
@@ -0,0 +1,763 @@
+/*
+ * templates.c
+ * This file is part of Draft Templates plugin for Evolution
+ *
+ * Authors:
+ *	Diego Escalante Urrelo <diegoe@gnome.org>
+ * 	Bharath Acharya <abharath@novell.com>
+ * Copyright (C) 2008 - Diego Escalante Urrelo
+ * 			Bharath Acharya
+ *
+ * Draft Templates is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Draft Templates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Draft Templates; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, 
+ * Boston, MA  02110-1301  USA
+ */
+
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <string.h>
+
+#include <gconf/gconf-client.h>
+
+#include <e-util/e-config.h>
+#include <camel/camel-url.h>
+#include <camel/camel-folder.h>
+#include <camel/camel-mime-message.h>
+#include <camel/camel-multipart.h>
+#include <camel/camel-stream-mem.h>
+#include <camel/camel-store.h>
+
+#include <mail/em-composer-utils.h>
+#include <mail/em-popup.h>
+#include <mail/mail-session.h>
+#include <mail/mail-ops.h>
+#include <e-util/e-error.h>
+#include <e-util/e-plugin.h>
+#include <glade/glade.h>
+
+#include <composer/e-msg-composer.h>
+
+#define GCONF_KEY_TEMPLATE_PLACEHOLDERS "/apps/evolution/mail/template_placeholders"
+
+typedef struct {
+	GladeXML *xml;
+	GConfClient *gconf;
+	GtkWidget   *treeview;
+	GtkWidget   *clue_add;
+	GtkWidget   *clue_edit;
+	GtkWidget   *clue_remove;
+	GtkListStore *store;
+} UIData;
+
+enum {
+	CLUE_KEYWORD_COLUMN,
+	CLUE_VALUE_COLUMN,
+	CLUE_N_COLUMNS,
+};
+
+typedef struct {
+    CamelMimeMessage *msg;
+    EMPopupTargetSelect *t;
+} UserData;
+
+static char* get_content	(CamelMimeMessage *message);
+
+static void reply_with_template	(EPopup *ep, EPopupItem *item, void *data);
+
+static void popup_free		(EPopup *ep, GSList *l, void *data);
+
+static GSList *fill_submenu	(CamelStore *store, 
+                             	CamelFolderInfo *info, 
+                              	GSList *list, 
+                              	EMPopupTargetSelect *t);
+
+static GSList *append_to_menu 	(CamelFolder *folder, 
+                             	GPtrArray *uids, 
+                             	GSList *list, 
+                             	EMPopupTargetSelect *t);
+
+void org_gnome_templates_popup	(EPlugin *ep, EMPopupTargetSelect *t);
+
+GtkWidget *e_plugin_lib_get_configure_widget	(EPlugin *epl);
+
+gboolean e_plugin_ui_init	(GtkUIManager *manager, EMsgComposer *composer);
+
+
+/* Thanks to attachment reminder plugin for this*/
+static void commit_changes (UIData *ui);
+
+static void  key_cell_edited_callback (GtkCellRendererText *cell, gchar *path_string,
+				   gchar *new_text,UIData *ui);
+
+static void  value_cell_edited_callback (GtkCellRendererText *cell, gchar *path_string,
+				   gchar *new_text,UIData *ui);				   
+
+static gboolean clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath
+					*path, GtkTreeIter *iter, UIData *ui);
+
+static void
+selection_changed (GtkTreeSelection *selection, UIData *ui)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+
+	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+		gtk_widget_set_sensitive (ui->clue_edit, TRUE);
+		gtk_widget_set_sensitive (ui->clue_remove, TRUE);
+	} else {
+		gtk_widget_set_sensitive (ui->clue_edit, FALSE);
+		gtk_widget_set_sensitive (ui->clue_remove, FALSE);
+	}
+}
+
+static void
+destroy_ui_data (gpointer data)
+{
+	UIData *ui = (UIData *) data;
+
+	if (!ui)
+		return;
+
+	g_object_unref (ui->xml);
+	g_object_unref (ui->gconf);
+	g_free (ui);
+}
+
+static void
+commit_changes (UIData *ui)
+{
+	GtkTreeModel *model = NULL;
+	GSList *clue_list = NULL;
+	GtkTreeIter iter;
+	gboolean valid;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
+	valid = gtk_tree_model_get_iter_first (model, &iter);
+
+	while (valid) {
+		char *keyword, *value;
+		char *key;
+		
+		gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1);
+		gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1);
+
+		/* Check if the keyword and value are not empty */
+		if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0) 
+			&& (g_utf8_strlen(g_strstrip(value), -1) > 0)) {
+			key = g_strdup_printf("%s=%s", keyword, value);
+			clue_list = g_slist_append (clue_list, key);
+		}	
+		valid = gtk_tree_model_iter_next (model, &iter);
+	}
+
+	gconf_client_set_list (ui->gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, clue_list, NULL);
+
+	g_slist_foreach (clue_list, (GFunc) g_free, NULL);
+	g_slist_free (clue_list);
+}
+
+static void
+clue_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui)
+{
+	GtkTreeSelection *selection;
+	char *keyword = NULL;
+	gboolean valid;
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview));
+	/* move to the previous node */
+	valid = gtk_tree_path_prev (path);
+
+	gtk_tree_model_get (model, iter, CLUE_KEYWORD_COLUMN, &keyword, -1);
+	if ((keyword) && !(g_utf8_strlen (g_strstrip (keyword), -1) > 0))
+		gtk_list_store_remove (ui->store, iter);
+
+	/* Check if we have a valid row to select. If not, then select
+	 * the previous row */
+	if (gtk_list_store_iter_is_valid (GTK_LIST_STORE (model), iter)) {
+		gtk_tree_selection_select_iter (selection, iter);
+	} else {
+		if (path && valid) {
+			gtk_tree_model_get_iter (model, iter, path);
+			gtk_tree_selection_select_iter (selection, iter);
+		}
+	}
+
+	gtk_widget_grab_focus (ui->treeview);
+	g_free (keyword);
+}
+
+static gboolean
+clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui)
+{
+	gboolean valid;
+
+	valid = gtk_tree_model_get_iter_first (model, iter);
+	while (valid && gtk_list_store_iter_is_valid (ui->store, iter)) {
+		char *keyword = NULL;
+		gtk_tree_model_get (model, iter, CLUE_KEYWORD_COLUMN, &keyword, -1);
+		/* Check if the keyword is not empty and then emit the row-changed
+		signal (if we delete the row, then the iter gets corrupted) */
+		if ((keyword) && !(g_utf8_strlen (g_strstrip (keyword), -1) > 0))
+			gtk_tree_model_row_changed (model, path, iter);
+
+		g_free (keyword);
+		valid = gtk_tree_model_iter_next (model, iter);
+	}
+
+	return FALSE;
+}
+
+static void
+key_cell_edited_callback (GtkCellRendererText *cell,
+		      gchar               *path_string,
+		      gchar               *new_text,
+		      UIData             *ui)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	char *value;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
+
+	gtk_tree_model_get_iter_from_string (model, &iter, path_string);
+
+	gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1);	
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+				    CLUE_KEYWORD_COLUMN, new_text, CLUE_VALUE_COLUMN, value, -1);
+
+	commit_changes (ui);
+}
+
+static void
+value_cell_edited_callback (GtkCellRendererText *cell,
+		      gchar               *path_string,
+		      gchar               *new_text,
+		      UIData             *ui)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	char *keyword;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
+
+	gtk_tree_model_get_iter_from_string (model, &iter, path_string);
+	
+	gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1);
+
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+				    CLUE_KEYWORD_COLUMN, keyword, CLUE_VALUE_COLUMN, new_text, -1);
+
+	commit_changes (ui);
+}
+
+static void
+clue_add_clicked (GtkButton *button, UIData *ui)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	gchar *new_clue = NULL;
+	GtkTreeViewColumn *focus_col;
+	GtkTreePath *path;
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
+	gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc) clue_foreach_check_isempty, ui);
+
+	/* Disconnect from signal so that we can create an empty row */
+	g_signal_handlers_disconnect_matched(G_OBJECT(model), G_SIGNAL_MATCH_FUNC, 0, 0, NULL, clue_check_isempty, ui);
+
+	/* TODO : Trim and check for blank strings */
+	new_clue = g_strdup ("");
+	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+				    CLUE_KEYWORD_COLUMN, new_clue, CLUE_VALUE_COLUMN, new_clue, -1);
+
+	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (ui->treeview), CLUE_KEYWORD_COLUMN);
+	path = gtk_tree_model_get_path (model, &iter);
+
+	if (path) {
+		gtk_tree_view_set_cursor (GTK_TREE_VIEW (ui->treeview), path, focus_col, TRUE);
+		gtk_tree_view_row_activated(GTK_TREE_VIEW(ui->treeview), path, focus_col);
+		gtk_tree_path_free (path);
+	}
+
+	/* We have done our job, connect back to the signal */
+	g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(clue_check_isempty), ui);
+}
+
+static void
+clue_remove_clicked (GtkButton *button, UIData *ui)
+{
+	GtkTreeSelection *selection;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	GtkTreePath *path;
+	gboolean valid;
+	gint len;
+
+	valid = FALSE;
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview));
+	if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+		return;
+
+	/* Get the path and move to the previous node :) */
+	path = gtk_tree_model_get_path (model, &iter);
+	if (path)
+		valid = gtk_tree_path_prev(path);
+
+	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+
+	len = gtk_tree_model_iter_n_children (model, NULL);
+	if (len > 0) {
+		if (gtk_list_store_iter_is_valid (GTK_LIST_STORE(model), &iter)) {
+			gtk_tree_selection_select_iter (selection, &iter);
+		} else {
+			if (path && valid) {
+				gtk_tree_model_get_iter(model, &iter, path);
+				gtk_tree_selection_select_iter (selection, &iter);
+			}
+		}
+	} else {
+		gtk_widget_set_sensitive (ui->clue_edit, FALSE);
+		gtk_widget_set_sensitive (ui->clue_remove, FALSE);
+	}
+
+	gtk_widget_grab_focus(ui->treeview);
+	gtk_tree_path_free (path);
+
+	commit_changes (ui);
+}
+
+static void
+clue_edit_clicked (GtkButton *button, UIData *ui)
+{
+	GtkTreeSelection *selection;
+	GtkTreeModel *model;
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	GtkTreeViewColumn *focus_col;
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview));
+	if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+		return;
+
+	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (ui->treeview), CLUE_KEYWORD_COLUMN);
+	path = gtk_tree_model_get_path (model, &iter);
+
+	if (path) {
+		gtk_tree_view_set_cursor (GTK_TREE_VIEW (ui->treeview), path, focus_col, TRUE);
+		gtk_tree_path_free (path);
+	}
+}
+
+GtkWidget *
+e_plugin_lib_get_configure_widget (EPlugin *epl)
+{
+	GtkCellRenderer *renderer_key, *renderer_value;
+	GtkTreeSelection *selection;
+	GtkTreeIter iter;
+	GConfClient *gconf = gconf_client_get_default();
+	GtkWidget *hbox;
+	GSList *clue_list = NULL, *list;
+	GtkTreeModel *model;
+
+	UIData *ui = g_new0 (UIData, 1);
+
+	char *gladefile;
+
+	gladefile = g_build_filename (EVOLUTION_PLUGINDIR,
+			"templates.glade",
+			NULL);
+	ui->xml = glade_xml_new (gladefile, "templates_configuration_box", NULL);
+	g_free (gladefile);
+
+	ui->gconf = gconf_client_get_default ();
+
+	ui->treeview = glade_xml_get_widget (ui->xml, "clue_treeview");
+
+	ui->store = gtk_list_store_new (CLUE_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
+
+	gtk_tree_view_set_model (GTK_TREE_VIEW (ui->treeview), GTK_TREE_MODEL (ui->store));
+
+	renderer_key = gtk_cell_renderer_text_new ();
+	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Keywords"),
+			renderer_key, "text", CLUE_KEYWORD_COLUMN, NULL);
+	g_object_set (G_OBJECT (renderer_key), "editable", TRUE, NULL);
+	g_signal_connect(renderer_key, "edited", (GCallback) key_cell_edited_callback, ui);
+
+	renderer_value = gtk_cell_renderer_text_new ();
+	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Values"),
+			renderer_value, "text", CLUE_VALUE_COLUMN, NULL);
+	g_object_set (G_OBJECT (renderer_value), "editable", TRUE, NULL);
+	g_signal_connect(renderer_value, "edited", (GCallback) value_cell_edited_callback, ui);
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview));
+	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+	g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui);
+	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ui->treeview), TRUE);
+
+	ui->clue_add = glade_xml_get_widget (ui->xml, "clue_add");
+	g_signal_connect (G_OBJECT (ui->clue_add), "clicked", G_CALLBACK (clue_add_clicked), ui);
+
+	ui->clue_remove = glade_xml_get_widget (ui->xml, "clue_remove");
+	g_signal_connect (G_OBJECT (ui->clue_remove), "clicked", G_CALLBACK (clue_remove_clicked), ui);
+	gtk_widget_set_sensitive (ui->clue_remove, FALSE);
+
+	ui->clue_edit = glade_xml_get_widget (ui->xml, "clue_edit");
+	g_signal_connect (G_OBJECT (ui->clue_edit), "clicked", G_CALLBACK (clue_edit_clicked), ui);
+	gtk_widget_set_sensitive (ui->clue_edit, FALSE);
+
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
+	g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(clue_check_isempty), ui);
+
+	/* Populate tree view with values from gconf */
+	clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL );
+
+	for (list = clue_list; list; list = g_slist_next (list)) {
+		char **temp = g_strsplit (list->data, "=", 2);
+		gtk_list_store_append (ui->store, &iter);
+		gtk_list_store_set (ui->store, &iter, CLUE_KEYWORD_COLUMN, temp[0], CLUE_VALUE_COLUMN, temp[1], -1);
+		g_strfreev(temp);
+	}
+
+	if (clue_list) {
+		g_slist_foreach (clue_list, (GFunc) g_free, NULL);
+		g_slist_free (clue_list);
+	}
+
+	/* Add the list here */
+
+	hbox = gtk_vbox_new (FALSE, 0);
+
+	gtk_box_pack_start (GTK_BOX (hbox), glade_xml_get_widget (ui->xml, "templates_configuration_box"), TRUE, TRUE, 0);
+
+	/* to let free data properly on destroy of configuration widget */
+	g_object_set_data_full (G_OBJECT (hbox), "myui-data", ui, destroy_ui_data);
+
+	return hbox;
+}
+
+/* borrowed from plugins/mail-to-task/ */
+static char *
+get_content (CamelMimeMessage *message)
+{
+	CamelDataWrapper *content;
+	CamelStream *mem;
+	CamelContentType *type;
+	CamelMimePart *mime_part = CAMEL_MIME_PART (message);
+	char *str, *convert_str = NULL;
+	gsize bytes_read, bytes_written;
+	gint count = 2;
+
+	content = camel_medium_get_content_object ((CamelMedium *) message);
+	if (!content)
+		return NULL;
+
+	/* Get non-multipart content from multipart message. */
+	while (CAMEL_IS_MULTIPART (content) && count > 0) {
+		mime_part = camel_multipart_get_part (CAMEL_MULTIPART (content), 0);
+		content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+		count--;
+	}
+
+	if (!mime_part)
+		return NULL;
+
+	type = camel_mime_part_get_content_type (mime_part);
+	if (!camel_content_type_is (type, "text", "plain"))
+		return NULL;
+
+	mem = camel_stream_mem_new ();
+	camel_data_wrapper_decode_to_stream (content, mem);
+
+	str = g_strndup ((const gchar*)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
+	camel_object_unref (mem);
+
+	/* convert to UTF-8 string */
+	if (str && content->mime_type->params && content->mime_type->params->value) {
+		convert_str = g_convert (str, strlen (str),
+				"UTF-8", content->mime_type->params->value,
+				&bytes_read, &bytes_written, NULL);
+	}
+
+	if (convert_str) {
+		g_free (str);
+		return convert_str;
+	}
+	else 
+		return str;
+			
+}
+
+static void
+reply_with_template (EPopup *ep, EPopupItem *item, void *data)
+{
+	CamelMimeMessage *new, *template, *reply_to;
+	CamelStore *store;
+	CamelFolder *templates_folder;
+	struct _camel_header_raw *header;
+	UserData *userdata = item->user_data;
+	char *cont, *basedir, *url;
+
+	/* We get the templates folder and all the uids of the messages in there */
+	basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL);
+	url = g_strdup_printf ("mbox://%s", basedir);
+	g_free (basedir);
+
+	store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL);
+	g_free (url);
+
+	templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL);
+
+	/* Get from the currently selected folder, the currently selected message */
+	reply_to = camel_folder_get_message (userdata->t->folder, 
+			g_ptr_array_index (userdata->t->uids, 0), 
+			NULL);
+
+	/* The message we'll be using has been stored when building the menu */
+	template = userdata->msg;
+
+	/* The new message we are creating */
+	new = camel_mime_message_new();
+
+	/* Add the headers from the message we are replying to, so CC and that
+	 * stuff is preserved.
+	 */
+	header = ((CamelMimePart *)reply_to)->headers;
+	while (header) {
+		if (g_ascii_strncasecmp (header->name, "content-", 8) != 0) {
+			camel_medium_add_header((CamelMedium *) new, 
+					header->name, 
+					header->value);
+		}
+		header = header->next;
+	}
+
+	camel_mime_part_set_encoding((CamelMimePart *) new, CAMEL_TRANSFER_ENCODING_8BIT);
+
+	/* Get the template content. */
+	cont = get_content (template);
+
+	/* Set the To: field to the same To: field of the message we are replying to. */
+	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO, 
+			camel_mime_message_get_from (reply_to));
+
+
+	/* Copy the CC and BCC from the template.*/
+	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC, 
+			camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_CC));
+
+	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC, 
+			camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_BCC));
+
+	camel_mime_part_set_content((CamelMimePart *)new,
+			cont, (int) g_utf8_strlen(cont, -1), "text");
+
+	/* Create the composer */
+	em_utils_edit_message (new, templates_folder);
+
+	camel_object_unref(new);
+}
+
+static void 
+popup_free (EPopup *ep, GSList *l, void *data)
+{
+	g_slist_free (l);
+}
+
+static GSList
+*append_to_menu (CamelFolder *folder, GPtrArray *uids, GSList *list, EMPopupTargetSelect *t)
+{
+	int i;
+
+	for (i = 0; i < uids->len; i++) {
+		const char *subject;
+		char *path;
+		EPopupItem *item;
+		CamelMimeMessage *message;
+		const char *uid;
+
+		uid = g_strdup (g_ptr_array_index (uids, i));
+
+		/* Same as in fill_submenu */
+		if (!g_str_has_suffix (folder->name, "Templates"))
+			path = g_strdup_printf ("80.%s", folder->full_name);
+		else
+			path = "80.Templates";
+
+		/* If this uid is trashed, ignore it */
+		if (camel_folder_get_message_flags (folder, uid) & CAMEL_MESSAGE_DELETED)
+			continue;
+		
+		/* Get the message for this uid */
+		message = camel_folder_get_message (folder, 
+				uid, 
+				NULL);
+
+		subject = camel_mime_message_get_subject (message);
+
+		/* Create the menu item for it */
+		item = g_slice_alloc0(sizeof(*item));
+		item->type = E_POPUP_ITEM;
+		item->path = g_strdup_printf ("%s/%02d", path, i);
+		item->label = g_strdup ((strlen(subject) > 0) ? subject : _("No title"));
+		item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE;
+
+		/* Make some info available to the callback */
+		UserData *user_data;
+		user_data = g_slice_new(UserData);
+		user_data->msg = message;
+		user_data->t = t;
+
+		item->user_data = user_data;
+		item->activate = reply_with_template;
+
+		list = g_slist_prepend (list, item);
+	}
+
+	return list;
+}
+
+static GSList 
+*fill_submenu (CamelStore *store, CamelFolderInfo *info, GSList *list, EMPopupTargetSelect *t)
+{
+	while (info) {
+		CamelFolder *folder;
+		GPtrArray *uids;
+		EPopupItem *item;
+
+		folder = camel_store_get_folder (store, info->full_name, 0, NULL);
+
+		item = g_slice_alloc0(sizeof(*item));
+		item->type = E_POPUP_SUBMENU;
+		item->label = folder->name; 
+		item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE;
+
+		/* To avoid having a Templates dir, we ignore the top level */
+		if (!g_str_has_suffix (folder->name, "Templates"))
+			item->path = g_strdup_printf ("80.%s", folder->full_name);
+		else
+			item->path = "80.Templates";
+
+		list = g_slist_prepend (list, item);
+
+		/* Get the uids for this folder and fill them in the menu */
+		uids = camel_folder_get_uids (folder);
+		list = append_to_menu (folder, uids, list, t);
+		camel_folder_free_uids (folder, uids);
+
+		/* If the folder has a child, call this function again */
+		if (info->child) {
+			list = fill_submenu (store, info->child, list, t);
+		}
+
+		info = info->next;
+	}
+
+	return list;
+}
+
+void
+org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t)
+{
+	CamelFolder *templates_folder;
+	CamelFolderInfo *templates_info;
+	CamelStore *store;
+	char *basedir;
+	char *url;
+
+	GSList *list = NULL;
+
+	/* We get the templates folder and all the uids of the messages in there */
+	basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL);
+	url = g_strdup_printf ("mbox://%s", basedir);
+
+	g_free (basedir);
+
+	store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL);
+	g_free (url);
+
+	templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL);
+
+	templates_info = camel_store_get_folder_info (store, 
+			templates_folder->full_name, 
+			CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, 
+			NULL);
+
+	/* Get subfolders and fill it */
+	list = fill_submenu (store, templates_info, list, t);
+
+	e_popup_add_items (t->target.popup, list, NULL, popup_free, NULL);
+
+	return;
+}
+
+static void
+action_template_cb (GtkAction *action,
+		EMsgComposer *composer)
+{
+	CamelMessageInfo *info;
+	CamelMimeMessage *msg;
+	CamelStore *store;
+	CamelFolder *templates_folder;
+
+	char *basedir;
+	char *url;
+
+	/* We get the templates folder and all the uids of the messages in there */
+	basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL);
+	url = g_strdup_printf ("mbox://%s", basedir);
+	g_free (basedir);
+
+	store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL);
+	g_free (url);
+
+	templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL);
+
+	msg = e_msg_composer_get_message_draft (composer);
+	info = camel_message_info_new (NULL);
+
+	/* FIXME: what's the ~0 for? :) */
+	camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DRAFT, ~0);
+
+	mail_append_mail (templates_folder, msg, info, NULL, composer);
+
+	return;
+}
+
+static GtkActionEntry entries[] = {
+
+	{ "Template",
+	  GTK_STOCK_SAVE,
+	  N_("Save as _Template"),
+  	  "<Shift><Control>t",
+	  N_("Save as Template"),
+	  G_CALLBACK (action_template_cb) }
+};
+
+gboolean
+e_plugin_ui_init (GtkUIManager *manager,
+                  EMsgComposer *composer)
+{
+	GtkhtmlEditor *editor;
+
+	editor = GTKHTML_EDITOR (composer);
+
+	/* Add actions to the "composer" action group. */
+	gtk_action_group_add_actions (
+		gtkhtml_editor_get_action_group (editor, "composer"),
+		entries, G_N_ELEMENTS (entries), composer);
+
+	return TRUE;
+}
diff --git a/plugins/templates/templates.glade b/plugins/templates/templates.glade
new file mode 100644
index 0000000000..60720ef3e0
--- /dev/null
+++ b/plugins/templates/templates.glade
@@ -0,0 +1,126 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="window1">
+  <property name="visible">True</property>
+  <property name="title">window1</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+
+  <child>
+    <widget class="GtkVBox" id="templates_configuration_box">
+      <property name="width_request">385</property>
+      <property name="height_request">189</property>
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">5</property>
+
+      <child>
+	<widget class="GtkHBox" id="clue_container">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">6</property>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkTreeView" id="clue_treeview">
+		  <property name="border_width">1</property>
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="headers_visible">True</property>
+		  <property name="rules_hint">False</property>
+		  <property name="reorderable">False</property>
+		  <property name="enable_search">True</property>
+		  <property name="fixed_height_mode">False</property>
+		  <property name="hover_selection">False</property>
+		  <property name="hover_expand">False</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVButtonBox" id="vbuttonbox2">
+	      <property name="visible">True</property>
+	      <property name="layout_style">GTK_BUTTONBOX_START</property>
+	      <property name="spacing">6</property>
+
+	      <child>
+		<widget class="GtkButton" id="clue_add">
+		  <property name="visible">True</property>
+		  <property name="can_default">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-add</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="clue_edit">
+		  <property name="visible">True</property>
+		  <property name="can_default">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-edit</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="clue_remove">
+		  <property name="visible">True</property>
+		  <property name="can_default">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-remove</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am
new file mode 100644
index 0000000000..ea2ea5fdcb
--- /dev/null
+++ b/plugins/webdav-account-setup/Makefile.am
@@ -0,0 +1,22 @@
+INCLUDES = \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)      \
+	-I .				     \
+	-I$(top_srcdir)
+
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-evolution-webdav.eplug
+plugin_LTLIBRARIES = liborg-gnome-evolution-webdav.la
+
+liborg_gnome_evolution_webdav_la_SOURCES = \
+	webdav-contacts-source.c
+
+liborg_gnome_evolution_webdav_la_LIBADD = \
+	$(EPLUGIN_LIBS)		
+
+liborg_gnome_evolution_webdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+EXTRA_DIST = \
+	org-gnome-evolution-webdav.eplug.xml
+
+CLEANFILES = org-gnome-evolution-webdav.eplug
diff --git a/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml b/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
new file mode 100644
index 0000000000..6699a4ae8e
--- /dev/null
+++ b/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<e-plugin-list>
+	<e-plugin id="org.gnome.evolution.webdav"
+	          type="shlib"
+	          _name="WebDAV contacts"
+	          location="@PLUGINDIR@/liborg-gnome-evolution-webdav@SOEXT@"
+	          load-on-startup="false"
+	          localedir = "@LOCALEDIR@">
+		<author name="Matthias Braun"
+		        email="matze@braunis.de"/>
+		<_description>A plugin to setup WebDAV contacts.</_description>
+
+		<hook class="org.gnome.evolution.addressbook.config:1.0">
+				<group target="source"
+				       id="com.novell.evolution.addressbook.config.accountEditor">
+					<item type="item"
+					      path="00.general/10.display/00.WebDAV"
+					      factory="plugin_webdav_contacts"/>
+				</group>
+		</hook>
+	</e-plugin>
+</e-plugin-list>
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
new file mode 100644
index 0000000000..8f944de5ed
--- /dev/null
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -0,0 +1,370 @@
+/*
+ *
+ * Copyright (C) 2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include <glib/gi18n-lib.h>
+#include <glib.h>
+
+#include <gtk/gtk.h>
+
+#include <e-util/e-config.h>
+#include <e-util/e-plugin.h>
+#include <addressbook/gui/widgets/eab-config.h>
+
+#include <libedataserver/e-source.h>
+#include <libedataserver/e-source-list.h>
+#include <libedataserver/e-url.h>
+#include <libedataserver/e-account-list.h>
+
+#define BASE_URI "webdav://"
+
+typedef struct {
+	ESource         *source;
+	GtkWidget       *box;
+	GtkEntry        *url_entry;
+	GtkEntry        *username_entry;
+	GtkToggleButton *avoid_ifmatch_toggle;
+} ui_data;
+
+GtkWidget *
+plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data);
+
+int
+e_plugin_lib_enable(EPluginLib *ep, int enable);
+
+static void
+ensure_webdav_contacts_source_group(void)
+{
+	ESourceList  *source_list;
+	ESourceGroup *group;
+
+	source_list = e_source_list_new_for_gconf_default("/apps/evolution/addressbook/sources");
+
+	if (source_list == NULL) {
+		return;
+	}
+
+	group = e_source_list_peek_group_by_name(source_list, _("WebDAV"));
+
+	if (group == NULL) {
+		gboolean res;
+
+		group = e_source_group_new(_("WebDAV"), BASE_URI);
+		res = e_source_list_add_group(source_list, group, -1);
+
+		if (res == FALSE) {
+			g_warning("Could not add WebDAV source group!");
+		} else {
+			e_source_list_sync(source_list, NULL);
+		}
+
+		g_object_unref(group);
+	}
+	g_object_unref(source_list);
+}
+
+static void
+remove_webdav_contacts_source_group(void)
+{
+	ESourceList  *source_list;
+	ESourceGroup *group;
+
+	source_list = e_source_list_new_for_gconf_default("/apps/evolution/addressbook/sources");
+
+	if (source_list == NULL) {
+		return;
+	}
+
+	group = e_source_list_peek_group_by_name(source_list, _("WebDAV"));
+
+	if (group) {
+		GSList *sources;
+
+		sources = e_source_group_peek_sources(group);
+
+		if (NULL == sources) {
+			e_source_list_remove_group(source_list, group);
+			e_source_list_sync(source_list, NULL);
+		}
+	}
+	g_object_unref(source_list);
+}
+
+/* stolen from caldav plugin which stole it from calendar-weather eplugin */
+static gchar *
+print_uri_noproto(EUri *uri)
+{
+	gchar *uri_noproto;
+
+	if (uri->port != 0)
+		uri_noproto = g_strdup_printf(
+				"%s%s%s%s%s%s%s:%d%s%s%s",
+				uri->user ? uri->user : "",
+				uri->authmech ? ";auth=" : "",
+				uri->authmech ? uri->authmech : "",
+				uri->passwd ? ":" : "",
+				uri->passwd ? uri->passwd : "",
+				uri->user ? "@" : "",
+				uri->host ? uri->host : "",
+				uri->port,
+				uri->path ? uri->path : "",
+				uri->query ? "?" : "",
+				uri->query ? uri->query : "");
+	else
+		uri_noproto = g_strdup_printf(
+				"%s%s%s%s%s%s%s%s%s%s",
+				uri->user ? uri->user : "",
+				uri->authmech ? ";auth=" : "",
+				uri->authmech ? uri->authmech : "",
+				uri->passwd ? ":" : "",
+				uri->passwd ? uri->passwd : "",
+				uri->user ? "@" : "",
+				uri->host ? uri->host : "",
+				uri->path ? uri->path : "",
+				uri->query ? "?" : "",
+				uri->query ? uri->query : "");
+	return uri_noproto;
+}
+
+static void
+set_ui_from_source(ui_data *data)
+{
+	ESource    *source  = data->source;
+	const char *url     = e_source_get_uri(source);
+	EUri       *uri     = e_uri_new(url);
+	char       *url_ui;
+	const char *property;
+	gboolean    use_ssl;
+	gboolean    avoid_ifmatch;
+
+	property = e_source_get_property(source, "use_ssl");
+	if (property != NULL && strcmp(property, "1") == 0) {
+		use_ssl = TRUE;
+	} else {
+		use_ssl = FALSE;
+	}
+
+	property = e_source_get_property(source, "avoid_ifmatch");
+	if (property != NULL && strcmp(property, "1") == 0) {
+		avoid_ifmatch = TRUE;
+	} else {
+		avoid_ifmatch = FALSE;
+	}
+	gtk_toggle_button_set_active(data->avoid_ifmatch_toggle, avoid_ifmatch);
+
+	/* it's really a http or https protocol */
+	g_free(uri->protocol);
+	uri->protocol = g_strdup(use_ssl ? "https" : "http");
+
+	/* remove user/username and set user field */
+	if (uri->user != NULL) {
+		gtk_entry_set_text(data->username_entry, uri->user);
+		g_free(uri->user);
+		uri->user = NULL;
+	} else {
+		gtk_entry_set_text(data->username_entry, "");
+	}
+
+	url_ui = e_uri_to_string(uri, TRUE);
+	gtk_entry_set_text(data->url_entry, url_ui);
+
+	g_free(url_ui);
+	e_uri_free(uri);
+}
+
+static void
+set_source_from_ui(ui_data *data)
+{
+	ESource    *source        = data->source;
+	gboolean    avoid_ifmatch = gtk_toggle_button_get_active(data->avoid_ifmatch_toggle);
+	const char *url           = gtk_entry_get_text(data->url_entry);
+	EUri       *uri           = e_uri_new(url);
+	char       *url_noprotocol;
+	gboolean    use_ssl;
+
+	e_source_set_property(source, "avoid_ifmatch", avoid_ifmatch ? "1" : "0");
+
+	/* put username into uri */
+	g_free(uri->user);
+	uri->user = g_strdup(gtk_entry_get_text(data->username_entry));
+
+	if (uri->user[0] != '\0') {
+		e_source_set_property(source, "auth", "plain/password");
+		e_source_set_property(source, "username", uri->user);
+	} else {
+		e_source_set_property(source, "auth", NULL);
+		e_source_set_property(source, "username", NULL);
+	}
+
+	/* set use_ssl based on protocol in URL */
+	if (strcmp(uri->protocol, "https") == 0) {
+		use_ssl = TRUE;
+	} else {
+		use_ssl = FALSE;
+	}
+	e_source_set_property(source, "use_ssl", use_ssl ? "1" : "0");
+
+	url_noprotocol = print_uri_noproto(uri);
+	e_source_set_relative_uri(source, url_noprotocol);
+	g_free(url_noprotocol);
+	e_uri_free(uri);
+}
+
+static void
+on_entry_changed(GtkEntry *entry, gpointer user_data)
+{
+	(void) entry;
+	set_source_from_ui(user_data);
+}
+
+static void
+on_toggle_changed(GtkToggleButton *tb, gpointer user_data)
+{
+	(void) tb;
+	set_source_from_ui(user_data);
+}
+
+static void
+destroy_ui_data(gpointer data)
+{
+	ui_data *ui_data = data;
+
+	gtk_widget_destroy(ui_data->box);
+	g_free(ui_data);
+}
+
+GtkWidget *
+plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
+{
+	EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
+	ESource      *source;
+	ESourceGroup *group;
+	const char   *base_uri;
+	GtkWidget    *parent;
+	GtkWidget    *vbox;
+
+	GtkWidget    *section;
+	GtkWidget    *vbox2;
+
+	GtkBox       *hbox;
+	GtkWidget    *spacer;
+	GtkWidget    *label;
+
+	ui_data      *uidata;
+
+	source = t->source;
+	group  = e_source_peek_group (source);
+
+	base_uri = e_source_group_peek_base_uri (group);
+
+	g_object_set_data_full (G_OBJECT (epl), "widget", NULL,
+			(GDestroyNotify)gtk_widget_destroy);
+
+	if (strcmp(base_uri, BASE_URI) != 0) {
+		return NULL;
+	}
+
+	uidata         = g_malloc0(sizeof(uidata[0]));
+	uidata->source = source;
+
+	/* Build up the UI */
+	parent = data->parent;
+	vbox   = gtk_widget_get_ancestor(gtk_widget_get_parent(parent), GTK_TYPE_VBOX);
+
+	vbox2 = gtk_vbox_new(FALSE, 6);
+	gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0);
+
+	section = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(section), _("<b>Server</b>"));
+	gtk_misc_set_alignment(GTK_MISC(section), 0.0, 0.0);
+	gtk_box_pack_start(GTK_BOX(vbox2), section, FALSE, FALSE, 0);
+
+
+	hbox = GTK_BOX(gtk_hbox_new(FALSE, 10));
+	gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0);
+
+	spacer = gtk_label_new("   ");
+	gtk_box_pack_start(hbox, spacer, FALSE, FALSE, 0);
+
+	label = gtk_label_new(_("URL:"));
+	gtk_box_pack_start(hbox, label, FALSE, FALSE, 0);
+
+	uidata->url_entry = GTK_ENTRY(gtk_entry_new());
+	gtk_box_pack_start(hbox, GTK_WIDGET(uidata->url_entry), TRUE, TRUE, 0);
+
+	hbox = GTK_BOX(gtk_hbox_new(FALSE, 10));
+	gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0);
+
+	spacer = gtk_label_new("   ");
+	gtk_box_pack_start(hbox, spacer, FALSE, FALSE, 0);
+
+	label = gtk_label_new_with_mnemonic(_("User_name:"));
+	gtk_box_pack_start(hbox, label, FALSE, FALSE, 0);
+
+	uidata->username_entry = GTK_ENTRY(gtk_entry_new());
+	gtk_box_pack_start(hbox, GTK_WIDGET(uidata->username_entry), TRUE, TRUE, 0);
+
+	
+	hbox = GTK_BOX(gtk_hbox_new(FALSE, 10));
+	gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0);
+
+	spacer = gtk_label_new("   ");
+	gtk_box_pack_start(hbox, spacer, FALSE, FALSE, 0);
+
+	uidata->avoid_ifmatch_toggle = GTK_TOGGLE_BUTTON(
+			gtk_check_button_new_with_mnemonic(
+				_("_Avoid IfMatch (needed on apache < 2.2.8)")));
+	gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle),
+	                   FALSE, FALSE, 0);
+
+	set_ui_from_source(uidata);
+
+	gtk_widget_show_all(vbox2);
+
+	uidata->box = vbox2;
+	g_object_set_data_full(G_OBJECT(epl), "widget", uidata,
+			destroy_ui_data);
+
+	g_signal_connect(G_OBJECT(uidata->username_entry), "changed",
+			G_CALLBACK(on_entry_changed), uidata);
+	g_signal_connect(G_OBJECT(uidata->url_entry), "changed",
+			G_CALLBACK(on_entry_changed), uidata);
+	g_signal_connect(G_OBJECT(uidata->avoid_ifmatch_toggle), "toggled",
+			G_CALLBACK(on_toggle_changed), uidata);
+
+	return NULL;
+}
+
+int
+e_plugin_lib_enable(EPluginLib *ep, int enable)
+{
+	if (enable) {
+		ensure_webdav_contacts_source_group();
+	} else {
+		remove_webdav_contacts_source_group();
+	}
+	return 0;
+}
+
diff --git a/po/ChangeLog b/po/ChangeLog
index 0a5f0951fc..405b8fcc4d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,120 @@
+2008-08-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-06  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Abou Manal.
+
+2008-08-05: Sweta Kothari  <swkothar@redhat.com>
+
+	* gu.po: Committed Gujarati Translation.
+
+2008-08-04  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-03  Leonid Kanter <leon@asplinux.ru>
+
+	 ru.po: Updated Russian translation
+
+2008-08-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-07-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation by Frco. Javier Rial Rodríguez.
+
+2008-07-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-07-29  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2008-07-29  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Abou Manal.
+
+2008-07-27  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Fixed Czech translation.
+
+2008-07-24  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Terminology fixes by Fabrício Godoy.
+
+2008-06-24  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-07-24  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
+
+2008-07-23  Gil Forcada  <gforcada@gnome.org>
+
+	* ps.po: Added Pashto translation by Zabeeh Khan.
+	* LINGUAS: Added ps.
+
+2008-07-23  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Fixed Czech translation, thanks for noticing
+	to Pavel Sefranek.
+
+2008-07-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-07-21  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2008-07-21  Johnny Jacob  <jjohnny@novell.com>
+
+	* POTFILES.in: Fixed a typo.
+
+2008-07-21  J0hnny Jacob <jjohnny@novell.com>
+
+	* POTFILES.in: Updated file lsit.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* POTFILES.in: Updated file list.
+
+2008-07-20  Bharath Acharya  <abharath@novell.com>
+
+	* POTFILES.in:
+	Updated file-list for templates plugin.
+
+	** See bug #200147
+
+2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+
+	* es.po: Updated Spanish translation  
+
+2008-07-19  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
 2008-07-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
diff --git a/po/LINGUAS b/po/LINGUAS
index bc3a9515ad..3e7692ebf5 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -56,6 +56,7 @@ oc
 or
 pa
 pl
+ps
 pt
 pt_BR
 ro
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6f5e114929..c9704dbb75 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -290,6 +290,7 @@ plugins/default-mailer/org-gnome-default-mailer.error.xml
 plugins/default-source/default-source.c
 plugins/default-source/org-gnome-default-source.eplug.xml
 plugins/email-custom-header/email-custom-header.c
+plugins/email-custom-header/email-custom-header.glade
 plugins/email-custom-header/org-gnome-email-custom-header.glade
 plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
 plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
@@ -332,6 +333,7 @@ plugins/face/org-gnome-face.eplug.xml
 plugins/folder-unsubscribe/folder-unsubscribe.c
 plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
 plugins/google-account-setup/google-source.c
+plugins/google-account-setup/google-contacts-source.c
 plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
 plugins/groupwise-account-setup/camel-gw-listener.c
 plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
@@ -415,17 +417,21 @@ plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
 plugins/startup-wizard/startup-wizard.c
 plugins/subject-thread/org-gnome-subject-thread.eplug.xml
 plugins/subject-thread/subject-thread.c
+plugins/templates/apps-evolution-template-placeholders.schemas.in
+plugins/templates/templates.c
+plugins/templates/templates.glade
+plugins/templates/org-gnome-templates.eplug.xml
 plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
+plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
+plugins/webdav-account-setup/webdav-contacts-source.c
 shell/GNOME_Evolution_Shell.server.in.in
 shell/test/GNOME_Evolution_Test.server.in.in
 shell/apps_evolution_shell.schemas.in
 shell/e-active-connection-dialog.glade
 shell/e-component-registry.c
 shell/e-config-upgrade.c
-shell/e-shell-folder-title-bar.c
 shell/e-shell-importer.c
 shell/e-shell-settings-dialog.c
-shell/e-shell-utils.c
 shell/e-shell-view.c
 shell/e-shell-window-commands.c
 shell/e-shell-window.c
@@ -449,15 +455,11 @@ smime/lib/e-pkcs12.c
 tools/killev.c
 ui/evolution-addressbook.xml
 ui/evolution-calendar.xml
-ui/evolution-editor.xml
-ui/evolution-event-editor.xml
 ui/evolution-mail-global.xml
 ui/evolution-mail-list.xml
 ui/evolution-mail-message.xml
 ui/evolution-mail-messagedisplay.xml
-ui/evolution-memo-editor.xml
 ui/evolution-memos.xml
-ui/evolution-task-editor.xml
 ui/evolution-tasks.xml
 ui/evolution.xml
 views/addressbook/galview.xml
@@ -493,6 +495,7 @@ widgets/misc/e-filter-bar.c
 widgets/misc/e-filter-bar.h
 widgets/misc/e-image-chooser.c
 widgets/misc/e-map.c
+widgets/misc/e-online-button.c
 widgets/misc/e-pilot-settings.c
 widgets/misc/e-reflow.c
 widgets/misc/e-search-bar.c
diff --git a/po/ar.po b/po/ar.po
index 2f3322bffb..026b3a6a58 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-11 22:24+0100\n"
+"POT-Creation-Date: 2008-08-06 09:16+0100\n"
 "PO-Revision-Date: 2008-02-23 05:56+0100\n"
 "Last-Translator: Abou Manal <aboumanal@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -105,7 +105,7 @@ msgstr "موعد جديد"
 
 #: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
-msgstr "حدث جديد يستغرق يوماً بأكمله"
+msgstr "حدث جديد يستغرق يومًا بأكمله"
 
 #: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
@@ -166,7 +166,7 @@ msgid "calendar view for one or more days"
 msgstr "مشهد التقويم ليوم أو أكثر"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -177,7 +177,7 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:761
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
@@ -186,9 +186,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -196,10 +196,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -209,7 +209,7 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:787
 #: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
@@ -262,7 +262,7 @@ msgstr "نافذة منبثقة"
 #. action name
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
-msgstr "قم بإظهار تابعاً منبثقاً"
+msgstr "قم بإظهار تابعًا منبثقًا"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
@@ -351,9 +351,10 @@ msgstr "نشّط"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
 "'{0}' مصدر دفتر عناوين مقروء فقط. انتقل إلى مشهد المراسلين واختر دفتر عناوين "
 "يقبل المراسلين. ."
@@ -400,12 +401,13 @@ msgid "Could not remove addressbook."
 msgstr "لم أستطع إزالة دفتر العناوين."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"لا يمكنك النفاذ إلا إلى دفتر عناوين نظام GroupWise حالياً من إيفليوشن. الرجاء "
+"لا يمكنك النفاذ إلا إلى دفتر عناوين نظام GroupWise حاليًا من إيفليوشن. الرجاء "
 "استخدام عميل بريد GroupWise آخر مرة واحدة، للوصول لمراسلي GroupWise "
 "المتكررين ومجلدات مراسلين GroupWise الشخصيين."
 
@@ -524,8 +526,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
 #, fuzzy
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
+msgid "You do not have permission to delete contacts in this address book."
 msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -564,7 +565,7 @@ msgstr "است_خدمه كما هو"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -606,7 +607,7 @@ msgstr "إضبط التكملة التلقائية هنا"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -653,8 +654,9 @@ msgstr "أدر شهادات S/Mime الخاصة بك هنا"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "على هذا الحاسوب"
 
@@ -667,47 +669,36 @@ msgstr "على هذا الحاسوب"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "شخصي"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "على خواديم LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_مراسَل"
-
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
-msgstr "أنشيء مراسَل جديد"
-
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "_قائمة مراسَلين"
+msgstr "أنشئ مراسَل جديد"
 
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
-msgstr "أنشيء قائمة مراسَلين جديدة"
+msgstr "أنشئ قائمة مراسَلين جديدة"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
 #: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "دفتر عناوين جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "_دفتر العناوين"
-
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
-msgstr "أنشيء دفتر عناوين جديد"
+msgstr "أنشئ دفتر عناوين جديد"
 
 #: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
@@ -733,7 +724,7 @@ msgstr "انسخ محتويات الدفتر محليا للتعامل دون ا
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "عام"
@@ -754,12 +745,12 @@ msgstr "التوثق"
 
 #: ../addressbook/gui/component/addressbook-config.c:977
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "تفاصيل"
 
 #: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "يجري البحث"
 
@@ -773,12 +764,12 @@ msgid "Address Book Properties"
 msgstr "خصائص دفتر العناوين"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "يجري الترقية..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "يجري ترقية `%s':"
@@ -830,7 +821,7 @@ msgid ""
 msgstr ""
 "سجل تغير تزامن بالم وملفات الخرائط لإيفُليوشن قد تغيرت.\n"
 "\n"
-"رجاءً كن صابراً ريثما يقوم إيفُليوشن بتهجير بيانات تزامن بايلوت الخاص بك..."
+"رجاءً كن صابرًا ريثما يقوم إيفُليوشن بتهجير بيانات تزامن بايلوت الخاص بك..."
 
 #: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
@@ -858,11 +849,11 @@ msgstr "احفظ كـ vCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1345
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -988,7 +979,7 @@ msgstr "أضف دفتر عناوين"
 #: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:761
 msgid "Always"
-msgstr "دائماً"
+msgstr "دائمًا"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
@@ -1022,7 +1013,7 @@ msgstr "سجّل _دخول:"
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:760
 msgid "Never"
-msgstr "أبداً"
+msgstr "أبدًا"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
@@ -1091,7 +1082,7 @@ msgid ""
 "vulnerable to security exploits."
 msgstr ""
 "إنتقاء هذا الخيار يعني أن خادومك لا يدعم SSL ولا TLS. هذا يعني أن إتّصالك لن "
-"يكون آمناً، وأنّك ستكون معرّضاً لمخاطر أمنيَّة."
+"يكون آمنًا، وأنّك ستكون معرّضًا لمخاطر أمنيَّة."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
@@ -1116,7 +1107,7 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "قاعدة البحث هي الاسم المميّز (DN) للمدخل الذي تبدأ عنده بحوثك. إن تركت هذا "
-"فارغاً، سيبدأ البحث عند جذر شجرة الأدلّة."
+"فارغًا، سيبدأ البحث عند جذر شجرة الأدلّة."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
@@ -1140,7 +1131,7 @@ 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:41
@@ -1179,7 +1170,7 @@ msgstr "باستخدام عنوان البريد الإلكتروني"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
-msgstr "كلّما كان ممكناً"
+msgstr "كلّما كان ممكنًا"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
@@ -1237,7 +1228,7 @@ msgstr "بطاقات"
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "دقائق"
 
@@ -1343,7 +1334,7 @@ msgstr "الهاتف"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "العمل"
 
@@ -1365,9 +1356,9 @@ msgid "_Birthday:"
 msgstr "عيد ال_ميلاد:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "ال_تقويم:"
 
@@ -1470,7 +1461,7 @@ msgstr "العنوان"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2488,6 +2479,7 @@ msgid "Service"
 msgstr "خدمة"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:693
 #: ../plugins/save-calendar/csv-format.c:375
@@ -2779,7 +2771,7 @@ msgstr "اسم ال_قائمة:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "أدخِل عنواناً بريدياً أو إسحب مراسَلاً إلى اللّائحة أدناه:"
+msgstr "أدخِل عنوانًا بريديًا أو إسحب مراسَلًا إلى اللّائحة أدناه:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
@@ -2795,7 +2787,7 @@ msgstr "الأ_عضاء"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "دفتر"
 
@@ -2821,7 +2813,7 @@ msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"الاسم أو العنوان البريدي لهذا المراسَل موجود مسبقاً\n"
+"الاسم أو العنوان البريدي لهذا المراسَل موجود مسبقًا\n"
 "في هذا المجلّد.  هل تودّ إضافته على كل حال؟"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2837,17 +2829,18 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"الاسم أو العنوان البريدي لهذا المراسَل موجود مسبقاً\n"
+"الاسم أو العنوان البريدي لهذا المراسَل موجود مسبقًا\n"
 "في هذا المجلّد.  هل تودّ إضافته على كل حال؟"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "ادمج المراسَل"
-
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
 #: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "ا_دمج"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "ادمج المراسَل"
+
 #: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
@@ -2860,8 +2853,8 @@ msgstr "البريد الإلكتروني"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "أي حقل يحوي"
 
@@ -2871,9 +2864,9 @@ msgid "Email begins with"
 msgstr "يبدأ البريد الإلكتروني بـ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-msgid "Name begins with"
-msgstr "يبدأ الاسم بـ"
+#, fuzzy
+msgid "Name contains"
+msgstr "يحتوي"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2892,7 +2885,7 @@ msgstr[3] "%d مراسَلين"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "استعلم"
 
@@ -2903,7 +2896,7 @@ msgstr "خطأ أثناء الحصول على مشهد الدفتر"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2913,6 +2906,10 @@ msgstr "النّموذج"
 msgid "Error modifying card"
 msgstr "خطأ عند تعديل البطاقة"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "يبدأ الاسم بـ"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "المصدر"
@@ -2931,8 +2928,8 @@ msgid "Save as vCard..."
 msgstr "احفظ كـ vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -2983,19 +2980,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "ان_قل  لدفتر عناوين..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_قص"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2045
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "ا_نسخ"
 
@@ -3047,7 +3043,7 @@ msgstr "هاتف السّيارة"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3192,11 +3188,11 @@ msgstr "موقع الويب"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "العرض"
@@ -3207,11 +3203,11 @@ msgstr "العرض"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "الإرتفاع"
@@ -3241,7 +3237,18 @@ msgstr "الطّول الأقصى لاسم الحقل"
 msgid "Column Width"
 msgstr "عرض العمود"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"ابحث عن المراسَل."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3253,9 +3260,9 @@ msgstr ""
 "\n"
 "ابحث عن المراسَل\n"
 "\n"
-"أو انقر نقراً مزدوجاً هنا لإنشاء مراسَل جديد."
+"أو انقر نقرًا مزدوجًا هنا لإنشاء مراسَل جديد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3267,9 +3274,9 @@ msgstr ""
 "\n"
 "لا توجد أيّة عناصر لعرضها في هذا المشهد.\n"
 "\n"
-"انقر نقراً مزدوجاً هنا لإنشاء مراسَل جديد."
+"انقر نقرًا مزدوجًا هنا لإنشاء مراسَل جديد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3279,7 +3286,7 @@ msgstr ""
 "\n"
 "ابحث عن المراسَل."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3289,7 +3296,7 @@ msgstr ""
 "\n"
 "لا توجد أيّة عناصر لعرضها في هذا المشهد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "محوّل"
 
@@ -3319,7 +3326,7 @@ msgid "_Open Link in Browser"
 msgstr "ا_فتح الوصلة في المتصفّح"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "ا_نسخ موقع الوصلة"
 
@@ -3367,7 +3374,7 @@ msgstr "محادثة بالفيديو"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2376
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -3383,8 +3390,7 @@ msgstr "التقويم"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "متفرّغ/مشغول"
 
@@ -3406,12 +3412,14 @@ msgid "Web Log"
 msgstr "مدوّنة"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "عيد الميلاد"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "الذكرى السنويّة"
 
@@ -3457,7 +3465,7 @@ msgstr "لم يحدد أي مراسَل شخصي"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "رُفض التّصريح"
 
@@ -3472,7 +3480,7 @@ msgstr "لم يوجد المراسَل"
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
-msgstr "هويّة المراسَل موجودة مسبقاً"
+msgstr "هويّة المراسَل موجودة مسبقًا"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
@@ -3482,11 +3490,11 @@ msgstr "البروتوكول غير مدعوم"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "أُلغِيَ"
 
@@ -3551,7 +3559,7 @@ 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:124
@@ -3568,7 +3576,7 @@ 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:154
@@ -3642,17 +3650,17 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
-"فتح مراسَل واحد سيفتح أيضاً نافذ جديدة.\n"
-"هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
+"فتح مراسَل واحد سيفتح أيضًا نافذ جديدة.\n"
+"هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 msgstr[1] ""
-"فتح مراسَليْن سيفتح أيضاً نافذتيْن جديدتيْن.\n"
-"هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
+"فتح مراسَليْن سيفتح أيضًا نافذتيْن جديدتيْن.\n"
+"هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 msgstr[2] ""
-"فتح %d مراسَلين سيفتح أيضاً %d نوافذ جديدة.\n"
-"هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
+"فتح %d مراسَلين سيفتح أيضًا %d نوافذ جديدة.\n"
+"هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 msgstr[3] ""
-"فتح %d مراسَلين سيفتح أيضاً %d نوافذ جديدة.\n"
-"هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
+"فتح %d مراسَلين سيفتح أيضًا %d نوافذ جديدة.\n"
+"هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
@@ -3747,7 +3755,7 @@ msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "هناك مراسَل واحد آخر."
 msgstr[1] "هناك مراسَليْن آخريْن"
-msgstr[2] "هناك %d مراسَلاً آخراً."
+msgstr[2] "هناك %d مراسَلًا آخرًا."
 msgstr[3] "هناك %d مراسَليِن آخرين."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
@@ -3767,7 +3775,7 @@ msgstr "احفظ في دفتر العناوين"
 msgid "Card View"
 msgstr "مشهد البطاقة"
 
-#: ../addressbook/importers/evolution-csv-importer.c:623
+#: ../addressbook/importers/evolution-csv-importer.c:658
 #: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:306
@@ -3775,27 +3783,27 @@ msgstr "مشهد البطاقة"
 msgid "Importing..."
 msgstr "يجري الاستيراد..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:825
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "أوتلوك  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "مستورد أوتلوك CSV و Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:834
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "موزيلا  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "مستورد موزيلا CSV و Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:843
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "إيفُليوشِن  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "مستورد إيفُليوشِن CSV و Tab"
 
@@ -3963,7 +3971,7 @@ msgstr "تظليل"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:985
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4031,7 +4039,7 @@ msgstr "فشلت في فتح الدفتر"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
-msgstr "حدّد ملف الخرْج بدلاً من الخرْج القياسي"
+msgstr "حدّد ملف الخرْج بدلًا من الخرْج القياسي"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
@@ -4077,7 +4085,7 @@ msgstr "لا دعم إلا لتهيئات csv أو vcard."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
-msgstr "في الوضع اللاتزامني، يجب أن يكون الخرْج ملفاً."
+msgstr "في الوضع اللاتزامني، يجب أن يكون الخرْج ملفًا."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
@@ -4089,19 +4097,17 @@ msgstr "خطأ لا يمكن معالجته"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' مصدر تقويم للقرائة فقط. انتقل لمشهد التقويم ثم اختر تقويما يقبل "
-"المواعيد."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
+#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 "'{0}' مصدر تقويم للقرائة فقط. انتقل لمشهد التقويم ثم اختر تقويما يقبل "
 "المواعيد."
@@ -4280,7 +4286,7 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
-"إذا لم ترسل تنبيهاً بالإلغاء، قد لا يعرف المشاركون الآخرون أن الإجتماع قد "
+"إذا لم ترسل تنبيهًا بالإلغاء، قد لا يعرف المشاركون الآخرون أن الإجتماع قد "
 "أُلغِيَ."
 
 #: ../calendar/calendar.error.xml.h:43
@@ -4288,7 +4294,7 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr ""
-"إذا لم ترسل تنبيهاً بالإلغاء، قد لا يعرف المشاركون الآخرون أن المذكرة قد حُذِفت."
+"إذا لم ترسل تنبيهًا بالإلغاء، قد لا يعرف المشاركون الآخرون أن المذكرة قد حُذِفت."
 
 #: ../calendar/calendar.error.xml.h:44
 msgid ""
@@ -4342,7 +4348,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "لم يحدد التقويم للإستخدام بدون اتصال."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "لم تحدد قائمة التذكير للإستخدام بدون اتصال."
 
 #: ../calendar/calendar.error.xml.h:55
@@ -4351,15 +4358,15 @@ msgstr "لم تحدد قائمة المهام للإستخدام بدون اتص
 
 #: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
-msgstr "سيحذف التقويم نهائياً."
+msgstr "سيحذف التقويم نهائيًا."
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
-msgstr "ستحذف قائمة التذكير نهائياً."
+msgstr "ستحذف قائمة التذكير نهائيًا."
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
-msgstr "ستحذف قائمة المهام نهائياً."
+msgstr "ستحذف قائمة المهام نهائيًا."
 
 #: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
@@ -4431,12 +4438,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "لو تتوفّر مهامك حتى يُعاد تشغيل إيفوليوشن."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "أ_همل التغييرات"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "ا_حفظ"
 
@@ -4445,7 +4451,7 @@ msgid "_Save Changes"
 msgstr "ا_حفظ التغييرات"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "أر_سل"
@@ -4501,12 +4507,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "لم يمكن كتابة قالب تطبيقات المهام للحاسوب الكفّي"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "التقويم و المهام"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "التقويمات"
 
@@ -4548,17 +4554,17 @@ msgstr "ال_تذكيرات"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "التذكيرات"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4597,7 +4603,7 @@ msgstr[3] "دقائق"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ساعة واحدة"
@@ -4616,10 +4622,10 @@ msgstr "مواعيد"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "الموقع:"
 
@@ -4628,14 +4634,15 @@ msgid "Snooze _time:"
 msgstr "_وقت الغفوة:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_حرّر"
 
@@ -4647,32 +4654,32 @@ msgstr "غ_فوة"
 msgid "location of appointment"
 msgstr "موقع الموعد"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "لا يوجود ملخّص."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "لا يوجد وصف."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "لا تتوفّر معلومات حول الموقع."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "لديك %d منبّهات"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4684,7 +4691,7 @@ msgstr ""
 "معُدّة لإرسال بريد إلكتروني. سيعرض\n"
 "إيفُليوشِن صندوق حوار مذكّرة عادي عوضا عن ذلك."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4699,9 +4706,9 @@ msgstr ""
 "\n"
 "        %s\n"
 "\n"
-"هل تريد فعلاً تشغيل هذا البرنامج؟"
+"هل تريد فعلًا تشغيل هذا البرنامج؟"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "لا تسألني عن هذا البرنامج ثانيةً."
 
@@ -4713,7 +4720,7 @@ msgstr "لم يمكن بدأ بونوبو"
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
-msgstr "تعذر إنشاء مصنع خدمة تبليغ التنبيهات، ربما هو يعمل الآن أصلاً..."
+msgstr "تعذر إنشاء مصنع خدمة تبليغ التنبيهات، ربما هو يعمل الآن أصلًا..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4984,12 +4991,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "اظهر حقل الحالة في محرّر الحدث/المهمّة/الإجتماع"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "اظهر لوح \"المعاينة\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "اظهر لوح \"المعاينة\"."
 
@@ -5062,7 +5069,7 @@ msgstr "الوحدات للتذكير الافتراضي، \"دقائق\" أو \
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"وقت إخفاء المهام، محسوباً بـ \"الدقائق\"، أو \"الساعات\"، أو \"الأيام\"."
+"وقت إخفاء المهام، محسوبًا بـ \"الدقائق\"، أو \"الساعات\"، أو \"الأيام\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
@@ -5129,7 +5136,7 @@ msgstr "ما إذا سيظهر حقل الحالة في محرّر الحدث/ا
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
-"ما إذا سيظهر الوقت بتهيئة أربع وعشرين ساعة بدلاً من استخدام صباحاً/مساءً (ص/م)."
+"ما إذا سيظهر الوقت بتهيئة أربع وعشرين ساعة بدلًا من استخدام صباحًا/مساءً (ص/م)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -5247,7 +5254,7 @@ msgstr "نظّف الأحداث الأقدم من"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "الأيّام"
@@ -5256,105 +5263,105 @@ msgstr "الأيّام"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "على الويب"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "اعياد الميلاد والسنويّات"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "الطقس"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "ت_قويم جديد"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "ا_نسخ..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2099
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "ال_خصائص"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "فشلت ترقية التقويم."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "لم يمكن فتح التقويم '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "لا يتوفّر تقويم لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "منتقي مصدر التقويم"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "موعد جديد"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_موعد"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
-msgstr "أنشيء موعد جديد"
+msgstr "أنشئ موعد جديد"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "اجتماع جديد"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "ا_جتماع"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
-msgstr "أنشيء طلب إجتماع جديد"
+msgstr "أنشئ طلب إجتماع جديد"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
-msgstr "موعد جديد يستغرق يوماً بكامله"
+msgstr "موعد جديد يستغرق يومًا بكامله"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
-msgstr "_موعد يستغرق يوماً بكامله"
+msgstr "_موعد يستغرق يومًا بكامله"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
-msgstr "أنشيء موعد جديد يستغرق يوماً بكامله"
+msgstr "أنشئ موعد جديد يستغرق يومًا بكامله"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "تقويم جديد"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "الت_قويم"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
-msgstr "أنشيء تقويماً جديداً"
+msgstr "أنشئ تقويمًا جديدًا"
 
 #: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
@@ -5373,15 +5380,235 @@ msgid "Month View"
 msgstr "مشهد الشّهر"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+msgid "Any Field"
+msgstr "الحقل"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "المُرفقات"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "الحاضر"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "فاكس العمل"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Category"
+msgstr "الفئة هي"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "تصنيف"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "تاريخ الإنجاز"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "خصوصي"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "الوصف"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "الوصف يحتوي"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "غير موجود"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "موجود"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+#, fuzzy
+msgid "Favourites"
+msgstr "موريشيوس"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+#, fuzzy
+msgid "Holiday"
+msgstr "اليوم"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+#, fuzzy
+msgid "Hot Contacts"
+msgstr "المراسَلون"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+#, fuzzy
+msgid "Ideas"
+msgstr "الأيّام"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+#, fuzzy
+msgid "International"
+msgstr "تقليدي"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "خصّص"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "إعدادات متنوعة"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+#, fuzzy
+msgid "Next 7 days"
+msgstr "مهمات الأيام السبعة القادمة"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "المنظّم"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "قائمة ال_هاتف"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "خاص"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "عام"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "تكرار"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "الحالة"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+#, fuzzy
+msgid "Strategies"
+msgstr "الفئات"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "الملخّص"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "الملخّص يحتوي"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "الردود"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+#, fuzzy
+msgid "Waiting"
+msgstr "يجري الإنتظار..."
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "يحتوي"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "لا يحتوي"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "هو"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "ليس"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "خطأ أثناء فتح التقويم"
@@ -5398,7 +5625,7 @@ msgstr "رُفض التّصريح بفتح التقويم"
 msgid "Unknown error"
 msgstr "خطأ مجهول"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "حرّر المنبّه"
 
@@ -5447,7 +5674,7 @@ msgstr "شغّل برنامج"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
-msgstr "اختر ملفاً"
+msgstr "اختر ملفًا"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
@@ -5501,7 +5728,10 @@ msgstr "مرّات إضافيّة كل"
 msgid "hour(s)"
 msgstr "ساعات"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "دقائق"
 
@@ -5520,12 +5750,11 @@ msgstr "أ_ضف"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "المنبّهات"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
-#: ../composer/e-composer-actions.c:63
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "ا_قترح عرض تّلقائي للمُرفق"
 
@@ -5597,7 +5826,7 @@ msgid "Display"
 msgstr "العرض"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "الجمعة"
@@ -5613,7 +5842,7 @@ msgstr ""
 "أيام"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "الإثنين"
@@ -5637,9 +5866,9 @@ msgstr ""
 "الأحد"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
-msgstr "انتقي لوناً"
+msgstr "انتقي لونًا"
 
 #. Sunday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
@@ -5647,7 +5876,7 @@ msgid "S_un"
 msgstr "الأ_حد"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "السّبت"
@@ -5665,7 +5894,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "اظهر أر_قام الأسابيع في متصفّح التّواريخ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "الأحد"
@@ -5684,7 +5913,7 @@ msgid "Template:"
 msgstr "قالب:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "الخميس"
@@ -5699,13 +5928,13 @@ msgid "Time format:"
 msgstr "صيغة الوقت:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "الثّلاثاء"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "الأربعاء"
@@ -5721,7 +5950,7 @@ msgstr "أيّام العمل:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_12 hour (AM/PM)"
-msgstr "_12 ساعة (صباحاً/مساءً)"
+msgstr "_12 ساعة (صباحًا/مساءً)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_24 hour"
@@ -5879,40 +6108,40 @@ msgstr "%s  لقد قمت بتغييرات. أتريد تجاهل هذه الت�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، أتريد تحديث المحرّر؟"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "خطأ في التّصديق: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " إلى "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (مُنجز "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "مُنجز "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (مُستحق "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "مُستحق "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "رسالة مُرفقة - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5921,29 +6150,217 @@ msgstr[1] "رسالتان مرفقتان"
 msgstr[2] "%d رسائل مرفقة"
 msgstr[3] "%d رسالة مرفقة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "ا_نقل"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "الغي ال_سحب"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "مُرفق"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "لم يمكن تحديث الكائن"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "حرّر الموعد"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "إجتماع - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "موعد - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "مهمة مُسْندة - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "مهمّة - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "المذكرة - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+#, fuzzy
+msgid "No Summary"
+msgstr "بدون ملخّص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "انقر هنا لغلق النافذة الحالية"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "نسخ النّص المنتقى للحافظة الوسيطة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "قص النّص المنتقى للحافظة الوسيطة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "انقر هنا لعرض المساعدة المتوفرة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "لصق نص من الحافظة الوسيطة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "انقر هنا لحفظ النافذة الحالية"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "إنتقاء كامل النّص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "التّ_صنيف"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_ملف"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_مساعدة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+#, fuzzy
+msgid "_Insert"
+msgstr "أ_درج"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_خيارات"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "ا_عرض"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_مُرفق..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "انقر هنا لإرفاق ملف"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "ال_فئات"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "تحديد ما إذا كنت تريد إظهار الفئات"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "المنطقة ال_زمنية"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "تحديد ما إذا كنت تريد إظهار المنطقة الزمنية"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "_عام"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "تصنيف كعام"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_خاص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+#, fuzzy
+msgid "Classify as private"
+msgstr "تصنيف كخاص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_خصوصي"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "صنف كخصوصي"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "حقل ال_دور"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "تحديد ما إذا كان حقل الدور ظاهرًا"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_تأكيد الحضور"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "تحديد ما إذا كان حقل تأكيد الحضور ظاهرًا"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "حقل ال_حالة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "تحديد ما إذا كان حقل الحالة ظاهرًا"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "حقل ال_نوع"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "تحديد ما إذا كان حقل نوع الحضور ظاهرًا"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent Docu_ments"
+msgstr "نسبة مكملة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "إرفاق"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5952,86 +6369,46 @@ msgstr[1] "<b>مُرفقان</b>"
 msgstr[2] "<b>%d</b> مرفقات"
 msgstr[3] "<b>%d</b> مُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "اخفي _شريط المُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "اظهر _شريط المُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "أ_زل"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "أ_ضف مُرفق..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "اظهر المُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "اضغط مسطرة المسافات لتبديل شريط المُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "حرّر الموعد"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "إجتماع - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "موعد - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "مهمة مُسْندة - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "مهمّة - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "المذكرة - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "بدون ملخّص"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "قد تهمل التّغييرات التي أُجريت لهذا العنصر في حال وصول تحديث"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "لم يمكن استخدام الإصدارة الحاليّة!"
 
@@ -6112,105 +6489,152 @@ msgstr "مُفًّوَض إلى:"
 msgid "Enter Delegate"
 msgstr "أدخل المُفَوَّضْ"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "ال_منبّهات"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "انقر هنا لتعيين أو إزالة المنبهات لهذا الحدث"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "ت_كرار"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "إجعل هذا حدثًا متكررًا"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "خيارات الإرسال"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "أدرج خيارات إرسال متقدمة"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "حدث يستغرق _يومًا بأكمله"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "تغيير ما إذا كان الحدث يستغرق يومًا بأكمله"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "اعرض حالتي كمش_غول في هذا الوقت"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "تحديد ما إذا كنت تريد تغيير حالتك إلى مشغول في هذا الوقت"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_متفرّغ/مشغول"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "الاستعلام عن معلومات متوفر/مشغول للحضور"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "مو_عد"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "تكرار"
-
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "لهذا الحدث منبّهات"
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "ال_منظّم:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_مفوِّضون"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "ال_حضور"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "حدث بدون يوم بدأ"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "حدث بدون يوم انتهاء"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "تاريخ البدء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "تاريخ الإنتهاء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "زمن البدء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "زمن الإنتهاء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
-msgstr "المنظّم المنتقى لم يعد يمتلك حساباً."
+msgstr "المنظّم المنتقى لم يعد يمتلك حسابًا."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "مطلوب منظّم."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "تحتاج إلى حاضرٍ واحد على الأقل."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "أ_ضف"
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "تعذر فتح التقويم '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "أنت تتصرف بالنيابة عن %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "يوم واحد قبل الموعد"
 msgstr[1] "يومان قبل الموعد"
 msgstr[2] "%d أيام قبل الموعد"
-msgstr[3] "%d يوماً قبل الموعد"
+msgstr[3] "%d يومًا قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6219,7 +6643,7 @@ msgstr[1] "ساعتان قبل الموعد"
 msgstr[2] "%d ساعات قبل الموعد"
 msgstr[3] "%d ساعة قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6228,22 +6652,22 @@ msgstr[1] "دقيقتين قبل الموعد"
 msgstr[2] "%d دقائق قبل الموعد"
 msgstr[3] "%d دقيقة قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "خصّص"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:907
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1408
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6318,26 +6742,22 @@ msgstr "غيّ_ر المنظّم"
 msgid "Co_ntacts..."
 msgstr "المُ_راسَلين..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "المنظّم"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "المنظّم:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "تذكير"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "لا يمكن فتح التذكير في '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1559
-#: ../mail/em-format-html.c:1617 ../mail/em-format-html.c:1643
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
@@ -6357,7 +6777,7 @@ msgid "_Description:"
 msgstr "ال_وصف:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "م_جموعة:"
@@ -6398,17 +6818,17 @@ msgstr "هذه الحالة و الحالات القادمة"
 msgid "All Instances"
 msgstr "كل الحالات"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "يحتوي هذا الموعد متكرّرات لا يستطيع إيفُليوشِن أن يعدّلها."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "تاريخ التّكرار غير صحيح"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "يعمل"
 
@@ -6416,7 +6836,7 @@ msgstr "يعمل"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "الأوّل"
 
@@ -6425,7 +6845,7 @@ msgstr "الأوّل"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "الثّاني"
 
@@ -6433,7 +6853,7 @@ msgstr "الثّاني"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "الثّالث"
 
@@ -6441,7 +6861,7 @@ msgstr "الثّالث"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "الرّابع"
 
@@ -6449,13 +6869,13 @@ msgstr "الرّابع"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "الأخير"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "تاريخ آخر"
 
@@ -6463,7 +6883,7 @@ msgstr "تاريخ آخر"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "الأول للعاشر"
 
@@ -6471,7 +6891,7 @@ msgstr "الأول للعاشر"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "الحادي عشر للعشرين"
 
@@ -6479,45 +6899,45 @@ msgstr "الحادي عشر للعشرين"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "الواحد والعشرين للواحد والثلاثين"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "اليوم"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "عند"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "حدوثات"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "أضِف إستثناء"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "لم أجد منتقى لتعديله."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "عدّل الإستثناء"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "لم أجد منتقى لحذفِه."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "التّاريخ/الوقت"
 
@@ -6568,12 +6988,12 @@ msgstr "أسابيع"
 msgid "year(s)"
 msgstr "سنين"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "تاريخ الإنجاز خاطئ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "صفحة الويب"
 
@@ -6588,51 +7008,55 @@ 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:252
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "مُنجز"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "مرتفع"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "في تقدّم"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1061
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "منخفض"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "عادي"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "لم يبدأ"
 
@@ -6645,7 +7069,7 @@ msgid "Stat_us:"
 msgstr "الحا_لة:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "غير معرّف"
 
@@ -6662,25 +7086,38 @@ msgstr "الأ_ولويّة:"
 msgid "_Web Page:"
 msgstr "_صفحة الويب:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "تفاصيل ال_حالة"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "انقر غيِّر / اعرض تفاصيل حالة المهمة"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "خيارات الإر_سال"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_مهمّة"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "تفاصيل المهمّة"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "المن_ظّم:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "تاريخ الإستحقاق خاطئ"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "لا يمكن فتح المهمّة في '%s'."
@@ -6713,7 +7150,7 @@ msgid_plural "%d days"
 msgstr[0] "يوم واحد"
 msgstr[1] "يومين"
 msgstr[2] "%d أيام"
-msgstr[3] "%d يوماً"
+msgstr[3] "%d يومًا"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:398
@@ -6723,7 +7160,7 @@ msgid_plural "%d weeks"
 msgstr[0] "أسبوع واحد"
 msgstr[1] "أسبوعين"
 msgstr[2] "%d أسابيع"
-msgstr[3] "%d أسبوعاً"
+msgstr[3] "%d أسبوعًا"
 
 #: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
@@ -6785,75 +7222,59 @@ msgstr "%s عند الساعة %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s لنوعيّة محفّز مجهولة"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "انقر لفتح %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:820
-#: ../shell/e-shell-folder-title-bar.c:586
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "بدون عنوان"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "تاريخ البدء:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
 #: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "الوصف:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "صفحة الويب:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:210
 #: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "ملخّص:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "تاريخ الإستحقاق:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "الحالة:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "الأولويّة:"
 
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "عام"
-
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "خاص"
-
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "خصوصي"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "تاريخ الإنتهاء"
@@ -6863,20 +7284,13 @@ msgstr "تاريخ الإنتهاء"
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Summary"
-msgstr "الملخّص"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "متفرّغ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "مشغول"
@@ -6913,12 +7327,12 @@ msgstr "لا"
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
-#: ../plugins/plugin-manager/plugin-manager.c:69
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "مجهول"
@@ -6944,9 +7358,9 @@ msgstr "اختر مجلّد لحِفظ المُرفق المحدّد..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "ا_حفظ كـ..."
 
@@ -6964,126 +7378,155 @@ msgstr "ا_حفِظ المنتقى"
 msgid "Open in %s..."
 msgstr "افتح في %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+#, fuzzy
+msgid "* No Summary *"
+msgstr "بدون ملخّص"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "المنظّم: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "المنظّم: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+#, fuzzy
+msgid "Start: "
+msgstr "إبدأ"
+
+#: ../calendar/gui/e-calendar-table.c:420
+#, fuzzy
+msgid "Due: "
+msgstr "مُستحق "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:879
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "يجري حذف الكائنات المنتقاة"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1163
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "يجري تحديث الكائِنات"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1348
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "احفظ كـ..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1571
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "_مهمّة جديدة"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "افتح _صفحة الويب"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1577
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "ا_طبع..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_قص"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1583
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ا_لصق"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_كلّف بالمهمّة"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_مرّر كـ iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_علّم كمكتمل"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_علّم المهام المنتقاة كمكتملة"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_علّم كغير مكتمل"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_علّم المهام المنتقاة كغير مكتملة"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "ا_حذف المهام المنتقاة"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "انقر لإضافة مهمّة"
@@ -7106,6 +7549,7 @@ msgid "Due date"
 msgstr "تاريخ الإستحقاق"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "الأولويّة"
@@ -7114,13 +7558,6 @@ msgstr "الأولويّة"
 msgid "Start date"
 msgstr "تاريخ البدء"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "الحالة"
-
 #: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "نقل العناصر"
@@ -7135,7 +7572,7 @@ msgstr "_موعد جديد..."
 
 #: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
-msgstr "_حدث جديد يستغرق يوماً بأكمله"
+msgstr "_حدث جديد يستغرق يومًا بأكمله"
 
 #: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
@@ -7152,7 +7589,7 @@ msgstr "انتقِ اليوم ال_حالي"
 
 #: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
-msgstr "ا_نتقِ تاريخاً..."
+msgstr "ا_نتقِ تاريخًا..."
 
 #: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
@@ -7182,7 +7619,7 @@ msgstr "_مرّر كـiCalendar..."
 msgid "_Reply"
 msgstr "_رد"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1335
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7200,26 +7637,14 @@ msgstr "احذف هذا ال_حدوث"
 msgid "Delete _All Occurrences"
 msgstr "احذف _كل الحدوثات"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "المنظّم: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "المنظّم: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "الوقت: %s %s"
@@ -7259,19 +7684,19 @@ msgstr "أقسام بـ %02i دقيقة"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "ص"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "م"
 
@@ -7286,7 +7711,7 @@ msgid_plural "Every %d days"
 msgstr[0] "كل يوم"
 msgstr[1] "كل يومين"
 msgstr[2] "كل %d أيام"
-msgstr[3] "كل %d يوماً"
+msgstr[3] "كل %d يومًا"
 
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
@@ -7304,7 +7729,7 @@ msgid_plural "Every %d weeks on "
 msgstr[0] "كل أسبوع في"
 msgstr[1] "كل أسبوعين في"
 msgstr[2] "كل %d أسابيع في"
-msgstr[3] "كل %d أسبوعاً في"
+msgstr[3] "كل %d أسبوعًا في"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
 #: ../calendar/gui/e-itip-control.c:813
@@ -7328,7 +7753,7 @@ msgid_plural "every %d months"
 msgstr[0] "كل شهر"
 msgstr[1] "كل شهرين"
 msgstr[2] "كل %d أشهر"
-msgstr[3] "كل %d شهراً"
+msgstr[3] "كل %d شهرًا"
 
 #: ../calendar/gui/e-itip-control.c:861
 #, c-format
@@ -7399,20 +7824,20 @@ msgstr "<br> رجاء راجِع المعلومات التّالية ثم اخت
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "مقبول"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
-msgstr "مقبول مبدئيّاً"
+msgstr "مقبول مبدئيًّا"
 
 #: ../calendar/gui/e-itip-control.c:1199
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "مرفوض"
 
@@ -7631,7 +8056,7 @@ msgstr "تم تحديث حالة الحاضر\n"
 #: ../calendar/gui/e-itip-control.c:2080
 #: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "لا يمكن تحديث حالة الحاضر لأنّ العنصر لم يعد موجوداً"
+msgstr "لا يمكن تحديث حالة الحاضر لأنّ العنصر لم يعد موجودًا"
 
 #: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
@@ -7656,7 +8081,7 @@ msgstr "تقبّل"
 
 #: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
-msgstr "تقبّل مبدئيّاً"
+msgstr "تقبّل مبدئيًّا"
 
 #: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
@@ -7726,49 +8151,49 @@ msgstr "الحضور"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "فرد"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "مجموعة"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "المورد"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "الغرفة"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "الكرسي"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "مشارك ضروري"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "مشارك إختياري"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "غير مشارك"
 
@@ -7787,7 +8212,7 @@ msgstr "مبدئي"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "مفوّض"
 
@@ -7850,7 +8275,7 @@ msgstr "اظهر ساعات العمل _فقط"
 
 #: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
-msgstr "أظهر م_صغراً"
+msgstr "أظهر م_صغرًا"
 
 #: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
@@ -7862,7 +8287,7 @@ msgstr "_<<"
 
 #: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
-msgstr "ا_ختر تلقائياً"
+msgstr "ا_ختر تلقائيًا"
 
 #: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
@@ -7892,10 +8317,6 @@ msgstr "زمن ال_بدء:"
 msgid "_End time:"
 msgstr "زمن الإ_نتهاء:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "الحاضر"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "أُنقر هنا لإضافة حاضر"
@@ -7975,7 +8396,7 @@ 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/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8065,7 +8486,7 @@ msgstr "أكتوبر"
 
 #: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
-msgstr "انتقِ تاريخاً"
+msgstr "انتقِ تاريخًا"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
@@ -8127,13 +8548,13 @@ msgstr "معلومات iCalendar"
 
 #: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
-msgstr "يجب أن تكون حاضراً للحدث."
+msgstr "يجب أن تكون حاضرًا للحدث."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "قائمة تذكيرات _جديدة"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8142,7 +8563,7 @@ msgstr[1] "تذكيرتين"
 msgstr[2] "%d تذكيرات"
 msgstr[3] "%d تذكيرة"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8151,63 +8572,56 @@ msgstr[1] "، اثنان مُنتقيان"
 msgstr[2] "، %d منتقاة"
 msgstr[3] "، %d منتقَى"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "فشل ترقية التذكيرات."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "لم يمكن فتح قائمة التذكيرات '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "لا يتوفّر تقويم لإنشاء التذكيرات"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "منتقي مصدر التذكيرات"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "تذكير جديد"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "ت_ذكير"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
-msgstr "انشيء تذكير جديد"
+msgstr "أنشئ تذكير جديد"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "تذكير جديد مُشارَك"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "تذكيرات _مشاركة"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
-msgstr "انشيء تذكير مُشارَك جديد"
+msgstr "أنشئ تذكير مُشارَك جديد"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "قائمة تذكيرات جديدة"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "قائ_مة التذكيرات"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
-msgstr "انشيء قائمة تذكيرات جديدة"
+msgstr "أنشئ قائمة تذكيرات جديدة"
 
 #: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "اطبع التذكيرات"
 
+#: ../calendar/gui/memotypes.xml.h:25
+#, fuzzy
+msgid "Next 7 Days"
+msgstr "مهمات الأيام السبعة القادمة"
+
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8408,62 +8822,62 @@ msgstr "جمعة"
 msgid "Sa"
 msgstr "سّبت"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "موعد"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "مهمَّة"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "الملخّص: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "الحضور:"
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "الحالة: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "الأولوية: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "النّسبة المُنجزة: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "العنوان: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "الفئات: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "المراسَلون: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "المواعيد القادمة"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "قائمة مهام _جديدة"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8472,54 +8886,46 @@ msgstr[1] "مهمّتين"
 msgstr[2] "%d مهمّات"
 msgstr[3] "%d مهمّة"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "فشلت في ترقية المهام."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "لم يمكن فتح قائمة المهام '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "لا يتوفّر تقويم لإنشاء المهام"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "منتقي مصدر المهام"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "مهمّة جديدة"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
-msgstr "أنشيء مهمّةً جديدة"
+msgstr "أنشئ مهمّةً جديدة"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "مهمّة مُسندة جديدة"
 
-#: ../calendar/gui/tasks-component.c:1333
-msgid "Assigne_d Task"
-msgstr "مهمّة _مسندة"
-
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
-msgstr "أنشيء مهمّة مُسندة جديدة"
+msgstr "أنشئ مهمّة مُسندة جديدة"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "قائمة مهام جديدة"
 
-#: ../calendar/gui/tasks-component.c:1341
-msgid "Tas_k list"
-msgstr "قائمة م_هام"
-
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
-msgstr "انشيء قائمة مهام جديدة"
+msgstr "أنشئ قائمة مهام جديدة"
 
 #: ../calendar/gui/tasks-control.c:452
 msgid ""
@@ -8531,9 +8937,9 @@ msgstr ""
 "هذه العمليّة ستمحو بشكل دائم كل المهام المعلّمة على أنّها منجزة. إذا تابعت، لن "
 "تتمكّن من إستعادة هذه المهام.\n"
 "\n"
-"أترغب فعلاً في حذف هذه المهام؟"
+"أترغب فعلًا في حذف هذه المهام؟"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1131
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "لا تسألني ثانيةً."
 
@@ -8541,6 +8947,29 @@ msgstr "لا تسألني ثانيةً."
 msgid "Print Tasks"
 msgstr "اطبع المهام"
 
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "% منجز"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+#, fuzzy
+msgid "Cancelled"
+msgstr "أُلغِيَ"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+#, fuzzy
+msgid "In progress"
+msgstr "في تقدّم"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "أكبر من"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "أصغر من"
+
 #: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "المواعيد والإجتماعات"
@@ -10118,203 +10547,201 @@ msgstr "لم يمكن فتح ملف"
 msgid "Unable to retrieve message from editor"
 msgstr "لا يمكن جلب الرّسالة من المحرّر"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
-msgstr "أدرج مُرفقاً"
+msgstr "أدرج مُرفقًا"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "أ_رفِق"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "رسالة بدون عنوان"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_مُرفق..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "إرفاق ملف"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_غلق"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "غلق الملف الحالي"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1342
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ا_طبع..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_معاينة قبل الطّباعة"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "احفظ الملف الحالي"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "احفظ _كـ..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "احفظ الملف الحالي باسم مغاير"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "احفظ _مسودّة"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "احفظ _كمسودة"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "أر_سِل"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "أرسِل هذه الرسالة"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "خيارات الإر_سال"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "أدرج خيارات الإرسال"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+#, fuzzy
+msgid "New _Message"
+msgstr "_رسالة"
+
+#: ../composer/e-composer-actions.c:537
+#, fuzzy
+msgid "Open New Message window"
+msgstr "ار_سل رسالة جديدة إلى..."
+
+#: ../composer/e-composer-actions.c:544
 #, fuzzy
 msgid "Character _Encoding"
 msgstr "ترميز المحارف"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "أ_من"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "_شفّر باستعمال PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "تشفير هذه الرسالة باستخدام PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "و_قّع باستعمال PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "توقيع الرسالة بمفتاح PGP الخاص بك"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "إعطاء أول_وية للرسالة"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "عين أهمية الرسالة إلى عالي"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:585
 #, fuzzy
 msgid "Re_quest Read Receipt"
-msgstr "اطلب إخ_طاراً بالوصول"
+msgstr "اطلب إخ_طارًا بالوصول"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
-msgstr "استقبل إخطاراً بالوصول عندما تتم قراءة رسالتك"
+msgstr "استقبل إخطارًا بالوصول عندما تتم قراءة رسالتك"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "_شفّر باستعمال S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "تشفير هذه الرسالة بشهادة تشفير S/MIME الخاصة بك"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "و_قّع باستعمال S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "توقيع الرسالة بتوقيع شهادة S/MIME خاصة بك"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "حقل النّسخة الكربونيّة ال_مخفيّة"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
-msgstr "تحديد ما إذا كان حقل \"ن.ك.م\" ظاهراً"
+msgstr "تحديد ما إذا كان حقل \"ن.ك.م\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "حقل ال_نسخة الكربونية"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
-msgstr "تحديد ما إذا كان حقل \"ن.ك\" ظاهراً"
+msgstr "تحديد ما إذا كان حقل \"ن.ك\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "حقل _مِن"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
-msgstr "تحديد ما إذا كان مختار حقل \"مِن\" ظاهراً"
+msgstr "تحديد ما إذا كان مختار حقل \"مِن\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "حقل ا_نشر إلى"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
-msgstr "تحديد ما إذا كان حقل \"نشر إلى\" ظاهراً"
+msgstr "تحديد ما إذا كان حقل \"نشر إلى\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "حقل ال_رّد إلى"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "تحديد ما إذا كان حقل \"رد إلى\" ظاهراً"
+msgstr "تحديد ما إذا كان حقل \"رد إلى\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 #, fuzzy
 msgid "_Subject Field"
 msgstr "حقل ال_نسخة الكربونية"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 #, fuzzy
 msgid "Toggles whether the Subject field is displayed"
-msgstr "تحديد ما إذا كان حقل الحالة ظاهراً"
+msgstr "تحديد ما إذا كان حقل الحالة ظاهرًا"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "حقل إ_لى"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
-msgstr "تحديد ما إذا كان حقل \"إلى\" ظاهراً"
-
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "إرفاق"
+msgstr "تحديد ما إذا كان حقل \"إلى\" ظاهرًا"
 
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
@@ -10415,11 +10842,11 @@ msgstr[3] "مُرفق"
 msgid "Hide _Attachment Bar"
 msgstr "اخفي شريط ال_مرفقات"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "اكتب رسالة"
 
-#: ../composer/e-msg-composer.c:4009
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10523,7 +10950,7 @@ 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 ""
-"لإرفاق محتويات هذا الدليل، إما أرفقهم ملفا ملفاً أو انشيئ محفوظة من الديل "
+"لإرفاق محتويات هذا الدليل، إما أرفقهم ملفا ملفًا أو انشيئ محفوظة من الديل "
 "وأرفقها."
 
 #: ../composer/mail-composer.error.xml.h:21
@@ -10555,25 +10982,30 @@ msgstr "لا يمكنك إرفاق الملف `{0}' بهِذه الرسالة."
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
-msgstr "يجب أن تُعدّ حساباً قبل أن تتمكّن من كتابة بريد."
+msgstr "يجب أن تُعدّ حسابًا قبل أن تتمكّن من كتابة بريد."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "تابع الت_حرير"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_لا تستعِد"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "ا_ستعِد"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "احف_ظ الرّسالة"
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "_Save Draft"
+msgstr "احفظ _مسودّة"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "بريد و تقويم إيفُليوشِن"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "حِزمة Groupware"
 
@@ -10622,7 +11054,7 @@ msgstr ""
 
 #: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:316
+#: ../plugins/plugin-manager/plugin-manager.c:339
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "مفعّل"
@@ -10630,17 +11062,17 @@ msgstr "مفعّل"
 #: ../e-util/e-plugin.c:309
 #, fuzzy
 msgid "Whether the plugin is enabled"
-msgstr "ما إن كان الموسع موسعاً أم لا"
+msgstr "ما إن كان الموسع موسعًا أم لا"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "حدث خطأ أثناء الطباعة"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "أبلغ نظام الطباعة عن تفاصيل الخطأ الآتية:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "لم يبلغ نظام الطباعة عن أي تفاصيل إضافية عن الخطأ."
@@ -10699,7 +11131,7 @@ msgstr "للق_يام به"
 #. blue
 #: ../e-util/e-util-labels.c:41
 msgid "_Later"
-msgstr "لا_حقاً"
+msgstr "لا_حقًا"
 
 #: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
@@ -10803,7 +11235,7 @@ msgid_plural "%d days in the future"
 msgstr[0] "بعد يوم واحد"
 msgstr[1] "بعد يومين"
 msgstr[2] "بعد %d أيام"
-msgstr[3] "بعد %d يوماً"
+msgstr[3] "بعد %d يومًا"
 
 #: ../filter/filter-datespec.c:84
 #, c-format
@@ -10821,7 +11253,7 @@ msgid_plural "%d weeks in the future"
 msgstr[0] "بعد أسبوع واحد"
 msgstr[1] "بعد أسبوعين"
 msgstr[2] "بعد %d أسابيع"
-msgstr[3] "بعد %d أسبوعاً"
+msgstr[3] "بعد %d أسبوعًا"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
@@ -10830,7 +11262,7 @@ msgid_plural "%d months ago"
 msgstr[0] "منذ شهر واحد"
 msgstr[1] "منذ شهرين"
 msgstr[2] "منذ %d أشهر"
-msgstr[3] "منذ %d شهراً"
+msgstr[3] "منذ %d شهرًا"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
@@ -10839,7 +11271,7 @@ msgid_plural "%d months in the future"
 msgstr[0] "بعد شهر واحد"
 msgstr[1] "بعد شهرين"
 msgstr[2] "بعد %d شهور"
-msgstr[3] "بعد %d شهراً"
+msgstr[3] "بعد %d شهرًا"
 
 #: ../filter/filter-datespec.c:86
 #, c-format
@@ -10857,7 +11289,7 @@ msgid_plural "%d years in the future"
 msgstr[0] "بعد عام واحد"
 msgstr[1] "بعد عامين"
 msgstr[2] "بعد %d أعوام"
-msgstr[3] "بعد %d عاماً"
+msgstr[3] "بعد %d عامًا"
 
 #: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
@@ -10886,56 +11318,56 @@ msgstr "اختر ملف"
 msgid "Test"
 msgstr "إختبر"
 
-#: ../filter/filter-rule.c:815
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "اسم الق_اعدة:"
 
-#: ../filter/filter-rule.c:843
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "اعثر على العناصر التي تفي بالمعايير التالية"
 
-#: ../filter/filter-rule.c:877
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "أضِ_ف معيار المُرشِح"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "إذا قوبلت جميع المعايير"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "إذا قوبل أي معيار"
 
-#: ../filter/filter-rule.c:885
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_جِدْ عناصر:"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "كل المتعلّق"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "الردود"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "الردود والأصول"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "لا رد ولا أصل"
 
-#: ../filter/filter-rule.c:909
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "ضمّن المناق_شات"
 
-#: ../filter/filter-rule.c:1005 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "القادمة"
 
-#: ../filter/filter-rule.c:1005 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "الخارجة"
 
@@ -10949,7 +11381,7 @@ msgstr "لا يمكن تجميع التعابير النمطيّة &quot;{1}&quo
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "الملف &quot;{0}&quot; غير موجود أو أنّه ليس ملفّاً اعتياديّاً."
+msgstr "الملف &quot;{0}&quot; غير موجود أو أنّه ليس ملفًّا اعتياديًّا."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -10973,7 +11405,7 @@ msgstr "رجاء اختر اسما آخر."
 
 #: ../filter/filter.error.xml.h:9
 msgid "You must choose a date."
-msgstr "يجب أن تختار تاريخاً."
+msgstr "يجب أن تختار تاريخًا."
 
 #: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
@@ -11001,7 +11433,7 @@ msgid ""
 "12:00am of the date specified."
 msgstr ""
 "سيقارن تاريخ الرّسالة مع\n"
-"السّاعة 12:00 صباحاً من التّاريخ المحدّد."
+"السّاعة 12:00 صباحًا من التّاريخ المحدّد."
 
 #: ../filter/filter.glade.h:7
 msgid ""
@@ -11049,7 +11481,7 @@ msgstr "الوقت الذي تحدّده أنت"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "أسابيع"
 
@@ -11120,10 +11552,10 @@ msgstr "تحكّم تفضيلات بريد إيفُليوشِن"
 msgid "Evolution Network configuration control"
 msgstr "تحكّم إعداد تقويم إيفُليوشِن"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:610
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "البريد"
@@ -11168,61 +11600,61 @@ msgstr ""
 #: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
-msgstr "انتقي مجلّداً"
+msgstr "انتقي مجلّدًا"
 
 #: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
 #: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
-msgstr "مولّد آليّاً"
+msgstr "مولّد آليًّا"
 
 #: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "اسأل لكل رسالة"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "الهويّة"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "إستقبال بريد"
 
-#: ../mail/em-account-editor.c:2040
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "تحقق من الرسائل ال_جديدة كلَّ"
 
-#: ../mail/em-account-editor.c:2048
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "دقائ_ق"
 
-#: ../mail/em-account-editor.c:2222 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "إرسال بريد"
 
-#: ../mail/em-account-editor.c:2281 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "الإفتراضيّات"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2347 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "أمن"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2384 ../mail/em-account-editor.c:2475
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "خيارات التلقي"
 
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "جار الفحص للبحث عن رسائل جديدة"
 
-#: ../mail/em-account-editor.c:2827 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "محرّر الحسابات"
 
-#: ../mail/em-account-editor.c:2827 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "مساعد حسابات إيفُليوشِن"
 
@@ -11240,7 +11672,7 @@ msgid "Protocol"
 msgstr "البرتوكول"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1157 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "غير مسمّى"
 
@@ -11256,18 +11688,18 @@ msgstr "أضِف برنامج توقيع نصي"
 msgid "Signature(s)"
 msgstr "التّوقيع (التّواقيع)"
 
-#: ../mail/em-composer-utils.c:1008 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- رسالة ممرّرة -------- "
 
-#: ../mail/em-composer-utils.c:1820
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 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:1867
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11275,7 +11707,7 @@ msgstr ""
 "في ${AbbrevWeekdayName}، ${Day}-${Month}-${Year} عند ${24Hour}:${Minute} "
 "${TimeZone} ، كتب ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2010
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- الرسالة الأصلية -------- "
 
@@ -11296,10 +11728,6 @@ msgstr "عيّن لون"
 msgid "Assign Score"
 msgstr "عيّن نتيجة"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "المُرفقات"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11316,10 +11744,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "اكتمل في"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "يحتوي"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "انسخ للمجلّد"
@@ -11344,10 +11768,6 @@ msgstr "احذف"
 msgid "Deleted"
 msgstr "حُذف"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "لا يحتوي"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "لا ينتهي بـ"
@@ -11368,10 +11788,6 @@ msgstr "لا يبدو كـ"
 msgid "does not start with"
 msgstr "لا يبدء بـ"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "غير موجود"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "مسوّدة"
@@ -11380,10 +11796,6 @@ msgstr "مسوّدة"
 msgid "ends with"
 msgstr "ينتهي بـ"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "موجود"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "موجود"
@@ -11396,14 +11808,10 @@ msgstr "تعبير"
 msgid "Follow Up"
 msgstr "متابعة"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "مهم"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "هو"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "يقع بعد"
@@ -11416,18 +11824,6 @@ msgstr "يقع قبل"
 msgid "is Flagged"
 msgstr "عليه علم"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "أكبر من"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "أصغر من"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ليس"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ليس عليه علم"
@@ -11576,13 +11972,13 @@ msgid "Unset Status"
 msgstr "ألغ ضبط الحالة"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "ثمّ"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
-msgstr "أضِف إجراءاً"
+msgstr "أضِف إجراءًا"
 
 #: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
@@ -11624,11 +12020,11 @@ msgstr "الرسائل المهمّة"
 msgid "Messages Not Junk"
 msgstr "رسائل ليست نفاية"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "بحث الحسابات"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "بحث في كل الحسابات"
 
@@ -11656,7 +12052,16 @@ msgstr[3] "مجموع الرسائل:"
 msgid "Quota usage"
 msgstr "مجموع الرسائل:"
 
-#: ../mail/em-folder-properties.c:385
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "صندوق الدّاخل"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "خصائص المجلّد"
@@ -11673,8 +12078,9 @@ msgstr "أن_شئ"
 msgid "Folder _name:"
 msgstr "ا_سم المجلّد:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "مجلدات البحث"
 
@@ -11683,124 +12089,89 @@ msgstr "مجلدات البحث"
 msgid "UNMATCHED"
 msgstr "غير مطابق"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "مسوّدات"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "صندوق الدّاخل"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "صندوق الصّادر"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "أرسِل"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "يجري التّحميل..."
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
-#. *
-#. * Most languages should translate this as "%s (%u)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:371
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
-
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "شجرة مجلّد البريد"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "نقل المجلد %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "نسخ المجلد %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "نقل الرسائل إلى المجلّد %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "نسخ الرسائل إلى المجلّد %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "غير قادر على سحب الرسالة/الرسائل إلى مستوى التخزين العلوي"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "ان_سخ للمجلّد"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "ا_نقل للمجلّد"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "مسح الرسائل في \"%s\""
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "ا_عرض"
-
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "افتح في نافذة _جديدة"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "مجلّد _جديد..."
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "ا_نقل..."
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "أ_عِد التسمية..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "أعِد الت_حميل"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "ان_شر صندوق الصادِر"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "أ_فرٍغ المهملات"
 
@@ -11809,13 +12180,13 @@ msgstr "أ_فرٍغ المهملات"
 msgid "Copying `%s' to `%s'"
 msgstr "نسخ `%s' إلى `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
-#: ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "انتقي مجلّد"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "ان_سخ"
 
@@ -11829,7 +12200,7 @@ msgstr "إنشاء المجلّد `%s'"
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
-msgstr "أنشيء مجلّد"
+msgstr "أنشئ مجلّد"
 
 #: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:168
@@ -11837,168 +12208,168 @@ msgstr "أنشيء مجلّد"
 msgid "Specify where to create the folder:"
 msgstr "حدّد أين سيتم إنشاء المجلّد:"
 
-#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "فشل حذف البريد"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
 
-#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_رد على المرسِل"
 
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_مرّر"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1340 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_حرّر كرسالةٍ جديدة..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "ترا_جع عن الحذف"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "ا_نقل للمجلّد..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "ان_سخ للمجلّد..."
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "علّم ك _مقروءة"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "_علّم ك_غير مقروء"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "_علّم على أنها _مهمّة"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "علّم على أنها غ_ير مهمّة"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "علّم ك_نفاية"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "علّم كليس _نفاية"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "علّم للمتاب_عة..."
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "ت_سمية"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "لا _شيء"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "لصيقة ج_ديدة"
 
-#: ../mail/em-folder-view.c:1367
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "تم ال_علم"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "ا_مسح العلم"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
-msgstr "أنشيء قاعدة من الرّسالة"
+msgstr "أنشئ قاعدة من الرّسالة"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "مجلد بحث باعتبار الموضوع"
 
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "مجلد بحث باعتبار المر_سل"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "مجلد بحث باعتبار المست_لمين"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "مجلد بحث باعتبار القائمة البريدية"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "رشّح باعتبار المو_ضوع"
 
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "رشّح باعتبار المر_سِل"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "رشّح باعتبار المست_لمين"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "رشّح باعتبار ال_قائمة البريديّة"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "الإفتراض"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "لم أستطِع جلب الرسالة"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "يجري سحب الرسالة..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "م_كالمة إلى..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
-msgstr "انشيء مجلّد _بحث"
+msgstr "أنشئ مجلّد _بحث"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_من هذا العنوان"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "إ_لى هذا العنوان"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "انقر لمراسلة %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "انقر للاتصال بـ %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "انقر لإخفاء/إظهار العناوين"
 
@@ -12025,7 +12396,7 @@ msgstr "ال_تّالي"
 msgid "M_atch case"
 msgstr "_طابِق حالة الأحرف"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "غير موقّعة"
 
@@ -12035,7 +12406,7 @@ msgid ""
 "authentic."
 msgstr "هذه الرّسالة غير موقّعة. لا ضمان بأن هذه الرسالة أصليّة."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "توقيع سليم"
 
@@ -12045,7 +12416,7 @@ msgid ""
 "message is authentic."
 msgstr "هذه الرّسالة موقّعة و سليمة مما يعني أنها في الغالب أصليّة."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "توقيع غير صالح"
 
@@ -12055,7 +12426,7 @@ msgid ""
 "in transit."
 msgstr "لا يمكن التّحقّق من توقيع هذه الرّسالة، ربّما غُيّرت أثناء النّقل."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "توقيع صالح لكن تعذر التّحقّق من المرسِل"
 
@@ -12065,17 +12436,17 @@ msgid ""
 "cannot be verified."
 msgstr "هذه الرّسالة موقّعة بتوقيعٍ سليم، و لكن تعذر التّحقّق من مرسِل الرّسالة."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
-msgstr "التوقيع موجود ولكنه يحتاج مفتاحاً عاماً"
+msgstr "التوقيع موجود ولكنه يحتاج مفتاحًا عامًا"
 
 #: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
-msgstr "هذه الرّسالة موقّعة بتوقيع، ولكن لا مفتاح عام مرتبطاً بالتوقيع."
+msgstr "هذه الرّسالة موقّعة بتوقيع، ولكن لا مفتاح عام مرتبطًا بالتوقيع."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "غير مشفّرة"
 
@@ -12086,7 +12457,7 @@ msgid ""
 msgstr ""
 "هذه الرّسالة ليست مشفّرة. من الممكن مشاهدة محتواها أثناء نقلها عبر الإنترنت."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "مشفّرة، ضعيفة"
 
@@ -12099,7 +12470,7 @@ msgstr ""
 "هذه الرّسالة مشفّرة، و لكن بخوارزمية تشفير ضعيفة. سيصعب و لكن لن يستحيل على "
 "شخص خارجي مشاهدة محتوى هذه الرّسالة ضمن فترةٍ زمنيّة معقولة."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "مشفّرة"
 
@@ -12109,7 +12480,7 @@ msgid ""
 "the content of this message."
 msgstr "هذه الرّسالة مشفّرة. من الصعب على شخص خارجي مشاهدة محتواها."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "مشفّرة، بقوّة"
 
@@ -12119,7 +12490,7 @@ msgid ""
 "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:1064 ../smime/gui/smime-ui.glade.h:48
@@ -12164,7 +12535,7 @@ msgstr "احفظ المرفق كـ"
 
 #: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
-msgstr "اختر مجلداً لحفظ كل المرفقات"
+msgstr "اختر مجلدًا لحفظ كل المرفقات"
 
 #: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
@@ -12218,84 +12589,84 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "الصّفحة %d من %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "يجري سحب `%s'"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "جزء المتن الخارجي غير معروف.."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "جزء المتن الخارجي مشوّه."
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "مؤشّر لموقع FTP (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "مؤشّر لملفٍّ محلّي (%s) صحيح في الموقع \"%s\""
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "مؤشّر لملف محلّي (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "مؤشّر لبيانات بعيدة (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "مؤشّر لبيانات خارجيّة مجهولة (فئة \"%s\")"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "يجري تهيئة الرسالة"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "يجري تهيئة الرسالة..."
 
-#: ../mail/em-format-html.c:1560 ../mail/em-format-html.c:1624
-#: ../mail/em-format-html.c:1646 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "ن.ك"
 
-#: ../mail/em-format-html.c:1561 ../mail/em-format-html.c:1630
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "ن.ك.م"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1741 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "ساعي البريد"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1768
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1773
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1904
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "أرسل <b>%s</b> هذه الرسالة بالنيابة عن <b>%s</b>"
@@ -12326,43 +12697,43 @@ msgstr "مجموعات أخبار"
 msgid "%s attachment"
 msgstr "مُرفق %s"
 
-#: ../mail/em-format.c:1197
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "لم يمكن تحليل رسالة S/MIME: خطأ مجهول"
 
-#: ../mail/em-format.c:1334 ../mail/em-format.c:1490
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "لم يمكن تحليل رسالة MIME. ستُعرض كمصدر."
 
-#: ../mail/em-format.c:1342
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "نوع تشفير غير مدعوم لعديد الأجزاء/مشفّر"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "تعذر تحليل رسالة PGP/MIME"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "تعذر تحليل رسالة PGP/MIME: خطأ مجهول"
 
-#: ../mail/em-format.c:1509
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "صيغة توقيع غير مدعومة"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "خطأ أثناء التّحقق من التّوقيع"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1579 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "خطأ مجهول أثناء التّحقّق من التّوقيع"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "تعذر تحليل رسالة PGP"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "تعذر تحليل رسالة PGP: خطأ مجهول"
 
@@ -12424,67 +12795,84 @@ msgid "No Junk plugin available"
 msgstr "لا يوجد ملحق بريد مهمل متاح."
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "للقيام به"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
-msgstr "لاحقاً"
+msgstr "لاحقًا"
 
-#: ../mail/em-migrate.c:1210
-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 ""
-"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
-"\n"
-"رجاء كن صبوراً حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "يجري ترقية `%s':"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "تعذر إنشاء المجلّد الجديد `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "تعذر نسخ المجلد `%s' إلى `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "تعذر المسح بحثا عن صناديق بريد في `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+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 ""
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"رجاء كن صبورًا حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "تعذر فتح بيانات POP keep-on-server قديمة `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "تعذر إنشاء دليل بيانات POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "تعذر نسخ بيانات POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "تعذر إنشاء مخزن بريد محلّي `%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"رجاء كن صبورًا حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "تعذر إنشاء مجلّدات البريد المحلّية في `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12521,7 +12909,7 @@ msgstr "مجلّد"
 #. FIXME: This is just to get the shadow, is there a better way?
 #: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
-msgstr "رجاء اختر خادوماً."
+msgstr "رجاء اختر خادومًا."
 
 #: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
@@ -12583,7 +12971,7 @@ msgstr "السماح لإيفُليوشن بعرض جزء نصي بحجم محد
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
-msgstr "أطلب دائما إخطاراً بالقراءة لهذه الرسالة"
+msgstr "أطلب دائما إخطارًا بالقراءة لهذه الرسالة"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
@@ -12632,11 +13020,17 @@ msgid ""
 msgstr "اضغط عرض العناوين في إلى/ن.ك/ن.ك.م إلى الرقم المحدد في address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
 #, fuzzy
 msgid "Custom headers to use while checking for junk."
 msgstr "تحدد الترويسة للتأكد من البريد النفاية."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:19
 #, fuzzy
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
@@ -12644,70 +13038,70 @@ msgid ""
 msgstr ""
 "تحدد الترويسة للتأكد من البريد النفاية. النسق هو headername=value في gconf."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "الترميز الافتراضي لكتابة الرسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "الترميز الافتراضي لكتابة الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "الترميز الافتراضي لعرض الرسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "الترميز الافتراضي لعرض الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "أسلوب التمرير الإفتراضي"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "العلو الإفتراضي لنافذة المؤلّف. "
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "الارتفاع الإفتراضي لنافذة الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "الإرتفاع الافتراضي لمربع حوار الاشتراك."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "أسلوب الرّد الإفتراضي"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "القيمة الافتراضية لحالة توسيع المناقشة"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "العرض الإفتراضي لنافذة المؤلّف. "
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "العرض الإفتراضي لنافذة الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "العرض الافتراضي لمربع حوار الاشتراك."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 #, fuzzy
 msgid ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
 msgstr "يحدد فيما إذا سيَبحث في دفتر العناوين عن البريد الكتروني للمرسِل"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "يحدد فيما إذا سيَبحث في دفتر العناوين عن البريد الكتروني للمرسِل"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12718,11 +13112,11 @@ msgstr ""
 "يجب أن يكون سخاما. سيبحث في الدفاتر المُعلَّمة للاتمام التلقائي. قد يكون بطيئا، "
 "إذا تم تعليم دفاتر العناوين البعيدة (مثل ldap) للاتمام التلقائي."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "يحدد ما إذا سيستخدم ترويسات مُخصصة للتأكد من البريد النفاية "
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12731,7 +13125,7 @@ msgstr ""
 "يحدد ما إذا سيستخدم ترويسات مُخصصة للتأكد من البريد النفاية. إذا تم تمكين هذا "
 "الخيار وتم ذكر الترويسات، فسيتم تحسين سرعة التأكد من البريد النفاية."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12739,59 +13133,59 @@ msgstr ""
 "يحدد ما إذا سيستخدم نفس الخطوط لكل من خطي \"من\" و\"الموضوع\" في عمود "
 "\"الرسائل\" داخل المشهد العمودي."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "دليل حفظ/إرفاق ملفات للمؤلِّف."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "دليل حفظ ملفات محتوى البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ارسم مؤشّرات لأخطاء التّهجئة على الكلمات بينما تكتب أنت."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "أفرغ مجلّدات البريد المهمل عند الخروج"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "أفرغ مجلّدات المهملات عند الخروج"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "أفرغ جميع مجلّدات البريد المهمل عند الخروج من إيفُليوشِن."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "أفرغ جميع مجلّدات المهملات عند الخروج من إيفُليوشِن."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "فعل طور المؤشّر، حتّى يمكنك رؤية مؤشّر عند قراءة البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "فعّل أو عطل مفتاح الفراغ السحري"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "فعّل أو عطل ميزة البحث أثناء الكتابة"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "فعِّل مجلدات البحث"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "فعِّل مجلّدات البحث عند بداية التشغيل."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12800,9 +13194,9 @@ msgid ""
 msgstr ""
 "تفعيل ميزة بحث الشريط الجانبي لكي تستطيع أن تبدأ البحث التفاعلي عن طريق "
 "كتابة النص. يستخدم هذا لإيجاد مجلد في الشريط الجانبي عن طريق مجرد كتابة اسم "
-"المجلد، وسيتم انتقاؤه آلياً."
+"المجلد، وسيتم انتقاؤه آليًا."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12810,27 +13204,27 @@ msgstr ""
 "مَكِّن هذا لاستخدام مفتاح الفراغ للتنقل في معاينة الرسالة و لائحة الرسائل "
 "والمجلدات. "
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "فعِّل لرسم الجزء النصي من الرسالة ذا الحجم المحدود."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "فعّل/عطّل طور المؤشّر"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "ارتفاع لوح قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "ارتفاع لوح قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "يخفي المعاينة حسب المجلد ويزيل التحديد"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12838,14 +13232,14 @@ msgstr ""
 "اذا حاول مستخدم فتح اكثر من 10 رسائل أو أكثر في وقت واحد اسأل المستخدم اذا "
 "كان حقا يريد ذلك."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr ""
-"عرض لوح المعاينة إذا كان مفعلا جنباً إلى جنب مع قائمة الرسائل بدلا من تحتها."
+"عرض لوح المعاينة إذا كان مفعلا جنبًا إلى جنب مع قائمة الرسائل بدلا من تحتها."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 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 "
@@ -12855,13 +13249,13 @@ msgstr ""
 "مايم يظهر في هذه القائمة يربط مع عارض مكون بونوبو في قاعدة بيانات مايم "
 "التابعة لجنوم لعرض المحتوى."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12870,24 +13264,24 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "لتفعيل أو تعطيل المحث أثناء وضع علامات على عدة رسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
 msgstr ""
 "يعطّل الميزة حيث تظهر محثات متكررة للسؤال إن كانت المزامنة دون اتصال مطلوبة."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12896,31 +13290,31 @@ msgstr ""
 "تعطل/تمكن الحَثَّ المتكرر من التحذير على أن حذف الرسائل من مجلد البحث يقوم فعلا "
 "بالحذف النهائي للرسالة، وليس فقط إزالتها من نتائج البحث."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "آخر مرة أفرغت فيها البريد المهمل"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "آخر مرة أفرغت فيها سلة المهملات"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "المستوى الذي إذا تم تجاوزه يَتَوجب تسجيل الرسالة."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "قائمة بالتسميات والألوان المرتبطة بها"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "قائمة بالتراخيص المقبولة"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "قائمة بالحسابات"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12928,15 +13322,15 @@ msgstr ""
 "قائمة  بالحسابات المعروفة لمكون البريد في إيفُليوشن. تحتوي القائمة على أسامي "
 "مجلدات بالنسبة إلى /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "قائمة بالترويسات المخصّصة وما إذا كانت مفعّلة أم لا."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 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."
@@ -12944,125 +13338,126 @@ msgstr ""
 "قائمة بالتسميات المعروفة لمكون البريد في إيفُليوشن. تحتوي القائمة على سطور "
 "بها الاسم:اللون واللون يكتب بترميز HTML ستي."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "قائمة أنواع mime للتفقدها من أجل عارضات مكوّنات بونوبو"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "قائمة بأسماء البروتوكولات التي قُبِلت تراخيصُها."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "حمّل صور رسائل HTML عبر http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
 "حمِّل الصور لرسائل HTML عبر http(s). القيم الممكنة هي: 0 - لا تحمِّل الصور عبر "
 "انترنت 1 - حمِّل الصور في البريد من المراسَلين 2 - حمِّل الصور دوما من انترنتً."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "سجّل إجراءات المرشِّح"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "سجّل إجراءات المرشِّح على ملف السّجل المحدّد."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "ملف السّجل لتسجيل إجراءات المرشِّح"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "ملف السّجل لتسجيل إجراءات المرشِّح."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "علّم كمُراجَع بعد المهلة المحدّدة"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "علّم كمُراجَع بعد المهلة المحدّدة."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "علّم الاقتباسات في \"معاينة\" الرّسالة"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "علّم الاقتباسات في \"معاينة\" الرّسالة."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "ارتفاع نافِذة الرسائل الإفتراضي"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "العرض الافتراضي لنافذة الرسالة"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "أسلوب عرض الرسائل (\"عادي\", \"ترويسات كاملة\", \"المصدر\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "الفترة الدنيا بالأيام لإفراغ البريد المهمل عند الخروج"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "الحد الأدنى بالأيام بين مرات إفراغ سلة المهملات عند الخروج"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "الوقت الأدني بين مرات إفراغ سلة المهملات عند الخروج، بالأيام."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "الوقت الأدني بين مرات إفراغ سلة المهملات عند الخروج، بالأيام."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "عدد العناوين التي يتم إظهارها في الحقول من ون.ك ون.ك.م"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "المساءلة عن موضوع خالي"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "مساءلة المستخدم عندما يحاول محو مجلّد."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "مساءلة المستخدم عندما يحاول إرسال رسالةٍ دون موضوع."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "المساءلة للتحقق إن كان المستخدم يريد الذهاب إلى نمط دون اتصال فوراً"
+msgstr "المساءلة للتحقق إن كان المستخدم يريد الذهاب إلى نمط دون اتصال فورًا"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "السؤال عند حذف رسائل من مجلد البحث"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "المساءلة حين يقوم المستخدم بالمحو"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "المساءلة حين لا يملأ المستخدم سوى حقل النّسخة الكربونيّة المخفيّة"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "السؤال عند محاولة المستخدم فتح ١٠ رسائل أو أكثر دفعة واحدة"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13070,141 +13465,147 @@ msgstr ""
 "المساءلة حين يحاول المستخدم إرسال بريد HTML إلى مستلمين قد لا يرغبون باستلام "
 "بريد HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "المساءلة حين يحاول المستخدم إرسال رسالةٍ دون مستلمي \"إلى\" أو \"نسخة كربونيّة"
 "\"."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "المساءلة حين يحاول المستخدم إرسال HTML غير مرغوبٍ فيه"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "السؤال عند تعليم رسائل متعددة"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "تعرّف آليا على التعابير الرسومية في النّص و استبدلها بالصّور."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "التّعرّف على الوصلات في النّص و الاستبدال بها."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "تنفيذ اختبار النفاية على البريد الوارد."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "دليل الحفظ"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "البحث عن صورة المرسل في دفاتر العناوين المحلية"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
-msgstr "أرسِل بريد HTML افتراضياً"
+msgstr "أرسِل بريد HTML افتراضيًا"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
-msgstr "أرسِل بريد HTML افتراضياً."
+msgstr "أرسِل بريد HTML افتراضيًا."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "أظهر عمود عنوان بريد المرسل في قائمة الرسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "خيارات ال_مزامنة..."
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "أظهر الرّسوم المتحرّكة"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "اظهر الصّور المتحرّكة كرسوم متحرّكة."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "اظهر الرّسائل المحذوفة (بخطٍّ يشطبها) في قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "اظهر الرّسائل المحذوفة في قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "أظهر صورة المُرسِل"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "اظهر البريد الإلكتروني للمرسل في عمود منفصل على قائمة الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "أظهر صورة المرسل في لوح قراءة الرسالة."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "فحص تهجئة ضمن السّياق"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 #, fuzzy
 msgid "Spell checking color"
 msgstr "التثبت من التهجئة"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 #, fuzzy
 msgid "Spell checking languages"
 msgstr "فحص تهجئة ضمن السّياق"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "الإرتفاع الافتراضي لمربع حوار الاشتراك"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "العرض الافتراضي لمربع حوار الاشتراك"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "خط الشاشة الطرفيّة"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "حد الجزء النصي من الرسالة"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "الملحق الإضافي لموضع إضافة البريد المهمل في الروتين"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "آخر مرة تم فيها إفراغ البريد المهمل، محسوبة بالأيام منذ تاريخ بدء الحساب."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "آخر مرة تم فيها إفراغ سلة المهملات، محسوبة بالأيام منذ تاريخ بدء الحساب."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "خط الشاشة الطرفيّة لعرض البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "الخط المتغيّر العرض لعرض البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr "هناك ثلاث قيم ممكنة. 0 للأخطاء. 1 للتحذيرات. 2 لرسائل التنقيح."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13212,46 +13613,47 @@ msgstr ""
 "هذا يحدد الحجم الأقصى للجزء النصي الذي يمكن تهيئته في إيفُليوشن. القيمة "
 "الافتراضية هي ٤ ميجابايت / ٤٠٩٦ كيلوبايت ويتم تحديده بالكيلوبايت."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
 "هذا هو ملحق البريد المهمل الافتراضي، رغم أن هناك عدة ملحقات مفعّلة. إذا عُطّل "
-"الملحق المسرود افتراضياً، فلن يتم التراجع إلى الملحقات الأخرى المتاحة."
+"الملحق المسرود افتراضيًا، فلن يتم التراجع إلى الملحقات الأخرى المتاحة."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 "المفتاح يُقرأ مرة واحدة ويعاد ضبطه إلى خطأ بعد القراءة. هذا سوف يلغي تحديد "
 "البريد في القائمة وسوف يزيل معاينة ذلك المجلد."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 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 ""
-"هذا المفتاح يتضمن قائمة بكل بنيات XML محدداً الترويسات المخصصة، وما إذا كان "
+"هذا المفتاح يتضمن قائمة بكل بنيات XML محددًا الترويسات المخصصة، وما إذا كان "
 "يجب إظهارها. هيئة بنية XML هي &lt;header enabled&gt; - عينها إلى مُفعَّل إن كان "
 "يجب عرض الترويسة في مشهد البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "هذا الخيار سيساعد في تحسين سرعة الجلب."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13259,15 +13661,15 @@ msgstr ""
 "هذا يعين عدد العناوين التي يتم إظهارها في مشهد قائمة الرسائل الافتراضي، "
 "والذي إذا زادت عنه يتم إظهار '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 "هذا الإعداد يحدد ما إذا كانت المناقشات ستكون في حالة التوسيع أو الطيّ "
-"افتراضياً. سيحتاج إيفوليوشن أن تعيد تشغيله."
+"افتراضيًا. سيحتاج إيفوليوشن أن تعيد تشغيله."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13276,28 +13678,18 @@ msgstr ""
 "هذا الإعداد يحدد ما إذا كانت المناقشات ستُفرز بناء على آخر رسالة في كل نقاش "
 "بدل الفرز بتاريخ الرسالة. سيحتاج إيفوليوشن أن تعيد تشغيله."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "تشعيب قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "تشعيب قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "تشعيب قائمة الرّسائل حسب الموضوع"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "مهلة قبل تعليم الرسالة كمقروءة"
@@ -13400,7 +13792,7 @@ msgid ""
 "not contain In-Reply-To or References headers."
 msgstr ""
 "ما إن كان يجب الاعتماد على التخييط حسب الموضوع عندما لا تحتوي الرسائل على "
-"الترويسات \"رداً على\" أو \"مراجع\"."
+"الترويسات \"ردًا على\" أو \"مراجع\"."
 
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
@@ -13432,7 +13824,7 @@ msgstr "المجلد الوجهة:"
 
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
-msgstr "انتقاء مجلداً للاستيراد إليه"
+msgstr "انتقاء مجلدًا للاستيراد إليه"
 
 #: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
@@ -13492,7 +13884,14 @@ msgstr "قائمة %s البريديّة"
 msgid "Add Filter Rule"
 msgstr "أضِف قاعدة مرشحة"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "قالب:"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13501,7 +13900,7 @@ msgstr[1] "اثنان مُنتقيان، "
 msgstr[2] "%d منتقاة، "
 msgstr[3] "%d منتقاة، "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13510,7 +13909,7 @@ msgstr[1] "%d حُذف"
 msgstr[2] "%d حُذف"
 msgstr[3] "%d حُذف"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13519,7 +13918,7 @@ msgstr[1] "%d نفاية"
 msgstr[2] "%d نفاية"
 msgstr[3] "%d نفاية"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13528,7 +13927,7 @@ msgstr[1] "%d مسوّدة"
 msgstr[2] "%d مسوّدة"
 msgstr[3] "%d مسوّدة"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13537,7 +13936,7 @@ msgstr[1] "%d أُرسِل"
 msgstr[2] "%d أُرسِل"
 msgstr[3] "%d أُرسِل"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13546,7 +13945,7 @@ msgstr[1] "%d غير مُرسَل"
 msgstr[2] "%d غير مُرسَل"
 msgstr[3] "%d غير مُرسَل"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13555,96 +13954,88 @@ msgstr[1] "%d غير مقروء"
 msgstr[2] "%d غير مقروء"
 msgstr[3] "%d غير مقروء"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
-msgstr[0] "%d إجمالياً"
-msgstr[1] "%d إجمالياً"
-msgstr[2] "%d إجمالياً"
-msgstr[3] "%d إجمالياً"
+msgstr[0] "%d إجماليًا"
+msgstr[1] "%d إجماليًا"
+msgstr[2] "%d إجماليًا"
+msgstr[3] "%d إجماليًا"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "رسالة بريديّة جديدة"
 
-#: ../mail/mail-component.c:914
-msgid "_Mail Message"
-msgstr "_رسالة بريديّة"
-
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "تأليف رسالة بريديّة جديدة"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "مجلد بريد جديد"
 
-#: ../mail/mail-component.c:922
-msgid "Mail _Folder"
-msgstr "م_جلد بريد"
-
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
-msgstr "انشيء مجلد بريد جديد"
+msgstr "أنشئ مجلد بريد جديد"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "فشل تحديث إعدادات أو مجلدات البريد"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "خطأ"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "أخطاء"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "أخطاء و تنبيهات"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "نقّح"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "خطأ، تحذيرات ورسائل التنقيح"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "نقِّح السجلات"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "أظهر الأ_خطاء في شريط المعلومات من أجل"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1745
 #, fuzzy
 msgid "second(s)."
 msgstr "ثوان."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "رسائل السجل:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "مستوى الولوج"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "الوقت"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2386
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "رسائل"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "غلق هذه النافذة"
@@ -13660,7 +14051,7 @@ msgstr "(ملاحظة: يتطلب إعادة تشغيل التطبيق)"
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr ""
-"<b>الاتصال الآمن بواسطة SSL ليس مدعوماً بواسطة هذه النسخة من إيفُليوشن</b>"
+"<b>الاتصال الآمن بواسطة SSL ليس مدعومًا بواسطة هذه النسخة من إيفُليوشن</b>"
 
 #: ../mail/mail-config.glade.h:5
 #, fuzzy
@@ -13779,27 +14170,27 @@ msgstr "إدارة الحسابات"
 
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "أضِف تو_قيعاً جديداً..."
+msgstr "أضِف تو_قيعًا جديدًا..."
 
 #: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
-msgstr "أضِف _برنامجاً نصياً"
+msgstr "أضِف _برنامجًا نصيًا"
 
 #: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr "وقع الرسائل دائماً عند استخدام هذا الحساب"
+msgstr "وقع الرسائل دائمًا عند استخدام هذا الحساب"
 
 #: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "شفر أيضاً لل_نّفس عند إرسال بريد مشفر"
+msgstr "شفر أيضًا لل_نّفس عند إرسال بريد مشفر"
 
 #: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "أرسل نسخة كربونية (ن.ك) دوماً إلى:"
+msgstr "أرسل نسخة كربونية (ن.ك) دومًا إلى:"
 
 #: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "أرسل نسخة كربونية مخفية (ن.ك.م) دوماً إلى:"
+msgstr "أرسل نسخة كربونية مخفية (ن.ك.م) دومًا إلى:"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
@@ -13815,7 +14206,7 @@ msgstr "اطلب دائما إخطارا بالقراءة"
 
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
-msgstr "أدرج التعابير المرسومة آلياً"
+msgstr "أدرج التعابير المرسومة آليًا"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -13836,11 +14227,11 @@ msgstr "فح_ص الأنواع المدعومة"
 #: ../mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Check cu_stom headers for junk"
-msgstr "ف_حص الترويسات المخصصة بحثاً عن النفايات"
+msgstr "ف_حص الترويسات المخصصة بحثًا عن النفايات"
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
-msgstr "فحص الرسائل ال_واردة بحثاً عن النفايات"
+msgstr "فحص الرسائل ال_واردة بحثًا عن النفايات"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -13878,7 +14269,7 @@ msgstr ""
 "تهانينا، لقد تمّ إعداد بريدك.\n"
 "\n"
 "إنّك جاهزٌ الآن لإرسال و تلقي البريد الإلكتروني \n"
-"مستعملاً افُليوشِن.\n"
+"مستعملًا افُليوشِن.\n"
 "\n"
 "الرجاء نقر \"طبق\" لحفظ إعداداتك."
 
@@ -13896,10 +14287,11 @@ msgstr "احذف رسائل البريد النفاية عند ال_خروج"
 
 #: ../mail/mail-config.glade.h:70
 msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "توقي_ع الرسائل الصادرة رقمياً (إفتراضياً)"
+msgstr "توقي_ع الرسائل الصادرة رقميًا (إفتراضيًا)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
 msgstr "لا تهيئ محتويات النص في الرسائل إن تجاوز ح_جم النص"
 
 #: ../mail/mail-config.glade.h:72
@@ -13946,7 +14338,7 @@ msgstr "شهادة الت_شفير:"
 
 #: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
-msgstr "تشفير الرسائل ال_صادرة (إفتراضياً)"
+msgstr "تشفير الرسائل ال_صادرة (إفتراضيًا)"
 
 #: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
@@ -14038,35 +14430,40 @@ msgid ""
 msgstr "ملاحظة: لن تسأل عن كلمة السر حتى تتصل لأوّل مرّة"
 
 #: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "سيُتجاوز هذا الخيار إذا ما وُجد تطابق مع ترويسات مخصصة لبريد نفاية. "
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "ال_منظّمة:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "هوية _مفتاح PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Pass_word:"
 msgstr "_كلمة السر:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"رجاء أدخل اسماً لوصف هذا الحساب في المساحة أدناه.\n"
+"رجاء أدخل اسمًا لوصف هذا الحساب في المساحة أدناه.\n"
 "سيتم استعمال هذا الاسم لأغراض العرض فقط."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 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.glade.h:116
+#: ../mail/mail-config.glade.h:117
 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 "
@@ -14075,122 +14472,122 @@ msgstr ""
 "رجاءً أدخل اسمك وبريدك الإلكتروني أدناه. أنت غير ملزم بملء الحقول \"الاختيارية"
 "\" أدناه، إلا إذا كنت ترغب في تضمين هذه المعلومات في الريد الذي ترسله."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "الرجاء الانتقاء من الخيارات التالية"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Port:"
 msgstr "ال_منْفذ:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "السؤال عند إرسال الرسائل مع تحديد لمتلقّي النسخ الكربونيّة المخفيّة فقط"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "مقتبس"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "ت_ذكر كلمة السر"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "رد على:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "تذكر _كلمة السر"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "ابح_ث عن صورة المرسل فقط في دفاتر العناوين المحلية"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "انت_قاء..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "أرسل إخطارات الو_صول:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "الخط القيا_سي:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "انتقاء خط HTML الثّابت العرض"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "إنتقاء خط HTML الثّابت العرض للطّباعة"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "إنتقاء خط HTML المتغيّر العرض"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "إنتقاء خط HTML المتغيّر العرض للطّباعة"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "يجري إرسال البريد"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "مجلد الرسا_ئل المرسلة:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "يتطلب ال_خادوم التوثّق"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_نوع الخادوم:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "شهادة التّو_قيع:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "التّو_قيع:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "توقيعات"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "جدول التوقيعات"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "التثبت من التهجئة"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "النو_ع "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "قائمة اللغات الموجودة هنا لا تعكس إلا اللغات التي يوجد لها قاموس مركب."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14200,11 +14597,6 @@ msgstr ""
 "كتوقيع لك. الاسم الذي تحدده سيتم استخدامه\n"
 "لأغراض العرض فقط."
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr "سيُتجاوز هذا الخيار إذا ما وُجد تطابق مع ترويسات مخصصة لبريد نفاية. "
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14224,7 +14616,8 @@ msgid "Use Authe_ntication"
 msgstr "التوثق"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "ا_سم المستخدم:"
 
@@ -14248,7 +14641,7 @@ msgstr "أضِف توقيع"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
-msgstr "حمل الصور من إنترنت دائماً"
+msgstr "حمل الصور من إنترنت دائمًا"
 
 #: ../mail/mail-config.glade.h:163
 #, fuzzy
@@ -14299,14 +14692,15 @@ msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
 #: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
-msgstr "لا تحمل صورأ من إنترنت أبداً"
+msgstr "لا تحمل صورأ من إنترنت أبدًا"
 
 #: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "ال_مسار:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "السؤال عند إرسال رسائل HTML للمراسَلين الذي لا يريدونها"
 
 #: ../mail/mail-config.glade.h:179
@@ -14403,43 +14797,43 @@ msgstr "حساس ل_حالة الأحرف"
 msgid "Co_mpleted"
 msgstr "مُنج_ز"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "اي_جاد:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "أوجد في الرسالة"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "علم للمتابعة"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "إشتراكات المجلّدات"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "اتفاقية الترخيص"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "لا شيء منتقى"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "النّا_دل:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "معلومات الأمن"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "مجلدات محددة"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14447,19 +14841,19 @@ msgstr ""
 "الرسائل التي انتقيتها للمتابعة موجودة أدناه.\n"
 "رجاء انتق إجراء متابعة من قائمة \"علم\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "إ_قبل الترخيص"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "تاريخ الاستحقا_ق:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "ال_علم:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "علم هذا لقبول اتفاقية الترخيص"
 
@@ -14489,7 +14883,7 @@ msgid ""
 "Appending to local `Sent' folder instead."
 msgstr ""
 "فشل الإلحاق إلى %s: %s\n"
-"سيتم الإلحاق إلى مجلد `أُرسل' المحلي بدلاً منه."
+"سيتم الإلحاق إلى مجلد `أُرسل' المحلي بدلًا منه."
 
 #: ../mail/mail-ops.c:618
 #, c-format
@@ -14603,9 +14997,9 @@ msgstr[2] "يجري سحب %d رسالة"
 msgstr[3] "يجري سحب %d رسالة"
 
 #: ../mail/mail-ops.c:1978
-#, c-format
+#, fuzzy, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "يجري حفظ %d رسالة"
 msgstr[1] "يجري حفظ %d رسالة"
 msgstr[2] "يجري حفظ %d رسالة"
@@ -14710,11 +15104,6 @@ msgstr "عملية ألغاها المستخدم."
 msgid "_Save and Close"
 msgstr "احفظ و أغلق"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_ملف"
-
 #: ../mail/mail-signature-editor.c:355
 #, fuzzy
 msgid "Edit Signature"
@@ -14764,23 +15153,23 @@ msgstr "يجري تحديث مجلدات البحث لـ'%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "يجري تحديث مجلدات البحث لـ'%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "تحرير مجلد البحث"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "مجلد بحث جديد"
 
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقاً. رجاء حدد اسماً مختلفاً."
+msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
 
 #: ../mail/mail.error.xml.h:2
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقاً. رجاء حدد اسماً مختلفاً."
+msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
 
 #: ../mail/mail.error.xml.h:3
 #, fuzzy
@@ -14790,7 +15179,7 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"يوجد مجلد غير فارغ في &quot;{1}&quot; مسبقاً.\n"
+"يوجد مجلد غير فارغ في &quot;{1}&quot; مسبقًا.\n"
 "\n"
 "يمكنك أن تختار إما تجاهل هذا المجلد أو الكتابة فوقه أو الإلحاق إلى محتوياته "
 "أو الإنهاء."
@@ -14807,7 +15196,7 @@ msgstr "تم طلب إخطار الوصول لـ&quot;{1}&quot;. إرسال إخ
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "توقيع بالاسم &quot;{0}&quot; موجود مسبقاً. رجاءً حدد اسماً آخر."
+msgstr "توقيع بالاسم &quot;{0}&quot; موجود مسبقًا. رجاءً حدد اسمًا آخر."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14838,7 +15227,7 @@ msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
-"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائياً؟"
+"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائيًا؟"
 
 #: ../mail/mail.error.xml.h:14
 #, fuzzy
@@ -14846,7 +15235,7 @@ msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
-"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائياً؟"
+"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائيًا؟"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14975,7 +15364,7 @@ msgstr "غير قادر على تعيين البرنامج النصي للتوق
 #: ../mail/mail.error.xml.h:41
 #, fuzzy
 msgid "Check Junk Failed"
-msgstr "فحص بحثاً عن النفاية"
+msgstr "فحص بحثًا عن النفاية"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15027,7 +15416,7 @@ msgstr "لا تعطل"
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
-msgstr "هل تريد أن تزامن محلياً المجلدات المؤشرة للاستخدام دون اتصال؟"
+msgstr "هل تريد أن تزامن محليًا المجلدات المؤشرة للاستخدام دون اتصال؟"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15059,7 +15448,7 @@ msgstr "الملف موجود لكن الكتابة فوقه غير ممكنة."
 
 #: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
-msgstr "الملف موجود لكنه ليس ملفاً عادياً."
+msgstr "الملف موجود لكنه ليس ملفًا عاديًا."
 
 #: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
@@ -15105,7 +15494,7 @@ msgstr "توثق غير صالح"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
-msgstr "تم تحديث مرشحات البريد تلقائياً."
+msgstr "تم تحديث مرشحات البريد تلقائيًا."
 
 #: ../mail/mail.error.xml.h:72
 msgid ""
@@ -15116,7 +15505,7 @@ msgid ""
 msgstr ""
 "تضيف كثير من أنظمة البريد ترويسة Apparently-To إلى الرسائل التي يتم إرسالها "
 "إلى مستقبلي النسخة الكربونية المخفية فقط. إذا تمت إضافة هذه الترويسة، "
-"فستحتوي على قائمة بكل مستقبلي رسالتك. لتفادي هذا، يجب أن تضيف مستقبلاً واحداً "
+"فستحتوي على قائمة بكل مستقبلي رسالتك. لتفادي هذا، يجب أن تضيف مستقبلًا واحدًا "
 "على الأقل في خانة إلى: أو ن.ك:."
 
 #: ../mail/mail.error.xml.h:73
@@ -15133,7 +15522,7 @@ msgstr "لم يتم انتقاء مصدر."
 
 #: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
-msgstr "فتح عدد كبير من الرسائل دفعة واحدة قد يستغرق وقتاً كبيراً."
+msgstr "فتح عدد كبير من الرسائل دفعة واحدة قد يستغرق وقتًا كبيرًا."
 
 #: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
@@ -15162,7 +15551,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
-msgstr "رجاءً قدم اسماً فريداً لتعريف هذا التوقيع."
+msgstr "رجاءً قدم اسمًا فريدًا لتعريف هذا التوقيع."
 
 #: ../mail/mail.error.xml.h:84
 msgid "Please wait."
@@ -15188,7 +15577,7 @@ msgstr "تم طلب إخطار قراءة."
 #: ../mail/mail.error.xml.h:89
 #, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "هل تريد فعلاً حذف المجلد &quot;{0}&quot; وكل مجلداته الفرعية؟"
+msgstr "هل تريد فعلًا حذف المجلد &quot;{0}&quot; وكل مجلداته الفرعية؟"
 
 #: ../mail/mail.error.xml.h:90
 #, fuzzy
@@ -15201,7 +15590,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
-msgstr "تم تحديث مجلدات البحث تلقائياً."
+msgstr "تم تحديث مجلدات البحث تلقائيًا."
 
 #: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
@@ -15209,7 +15598,7 @@ msgstr "أرسِل إخطار الوصول"
 
 #: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
-msgstr "التوقيع موجود مسبقاً."
+msgstr "التوقيع موجود مسبقًا."
 
 #: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
@@ -15217,7 +15606,7 @@ msgstr "زامن"
 
 #: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
-msgstr "أتريد مزامنة المجلدات محلياً للاستخدام بدون اتصال؟"
+msgstr "أتريد مزامنة المجلدات محليًا للاستخدام بدون اتصال؟"
 
 #: ../mail/mail.error.xml.h:97
 msgid ""
@@ -15240,7 +15629,7 @@ msgstr ""
 "\n"
 "تضيف كثير من أنظمة البريد ترويسة Apparently-To إلى الرسائل التي يتم إرسالها "
 "إلى مستقبلي النسخة الكربونية المخفية فقط. إذا تمت إضافة هذه الترويسة، "
-"فستحتوي على قائمة بكل مستقبلي رسالتك. لتفادي هذا، يجب أن تضيف مستقبلاً واحداً "
+"فستحتوي على قائمة بكل مستقبلي رسالتك. لتفادي هذا، يجب أن تضيف مستقبلًا واحدًا "
 "على الأقل في خانة إلى: أو ن.ك:."
 
 #: ../mail/mail.error.xml.h:101
@@ -15275,21 +15664,21 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
-msgstr "يجب أن يكون ملف البرنامج النصي موجوداً وقابلاً للتنفيذ."
+msgstr "يجب أن يكون ملف البرنامج النصي موجودًا وقابلًا للتنفيذ."
 
 #: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"يمكن أن يكون هذا المجلد قد تمت إضافته ضمنياً\n"
+"يمكن أن يكون هذا المجلد قد تمت إضافته ضمنيًا\n"
 "إن أردت، يمكنك الذهاب إلى محرر مجلدات البحث لإضافته صراحةً."
 
 #: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "لا يمكن إرسال هذه الرسالة لأن الحساب الذي اخترت الإرسال به ليس مفعلاً"
+msgstr "لا يمكن إرسال هذه الرسالة لأن الحساب الذي اخترت الإرسال به ليس مفعلًا"
 
 #: ../mail/mail.error.xml.h:115
 msgid ""
@@ -15300,7 +15689,7 @@ msgstr "لا يمكن إرسال هذه الرسالة لأنك لم تحدد أ
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "هذا الخادوم لا يدعم هذا النوع من التوثق وقد لا يدعم التوثق أساساً."
+msgstr "هذا الخادوم لا يدعم هذا النوع من التوثق وقد لا يدعم التوثق أساسًا."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
@@ -15323,7 +15712,7 @@ msgid ""
 "folder instead?"
 msgstr ""
 "غير قادر على فتح مجلد المسودات لهذا الحساب. هل تريد استخدام مجلد مسودات "
-"النظام بدلاً منه؟"
+"النظام بدلًا منه؟"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -15353,7 +15742,7 @@ msgstr "لم تكتب جميع المعلومات المطلوبة."
 
 #: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "توجد لديك رسائل غير مرسلة، هل ترغب في الإنهاء أياً كان؟"
+msgstr "توجد لديك رسائل غير مرسلة، هل ترغب في الإنهاء أيًا كان؟"
 
 #: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
@@ -15373,7 +15762,7 @@ msgid ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
-"عليك تحديد مجلداً واحداً على الأقل كمصدر.\n"
+"عليك تحديد مجلدًا واحدًا على الأقل كمصدر.\n"
 "إما بانتقاء المجلدات بصورة فردية، و/أو بانتقاء كل المجلدات المحلية، أو كل "
 "المجلدات البعيدة، أو النوعين."
 
@@ -15402,85 +15791,86 @@ msgstr "_شطب"
 msgid "_Open Messages"
 msgstr "افت_ح الرسائل"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "غير مراجع"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "روجع"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "مجاب"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 #, fuzzy
 msgid "Forwarded"
 msgstr "مرر"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "رسائل غير مراجعة متعدّد"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "رسائل متعدّدة"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "الأدنى"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "أدنى"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "أعلى"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "الأعلى"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "؟"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "اليوم %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "الأمس %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3818
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3888 ../mail/message-list.c:4324
 msgid "Generating message list"
 msgstr "يجري إنشاء قائمة الرسائل"
 
-#: ../mail/message-list.c:4093
+#: ../mail/message-list.c:4179
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4095
+#: ../mail/message-list.c:4181
 #, fuzzy
 msgid "There are no messages in this folder."
 msgstr "أرسِل رد على رسالة في مجلّد عمومي"
@@ -15595,6 +15985,7 @@ msgid ""
 msgstr "قائمة الدلالات التي سيبحث عنها ملحق مُذَكِّر المرفقات في متن الرسالة."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "الكلمات الأساسية"
 
@@ -15608,14 +15999,14 @@ msgid ""
 "Looks for clues in a message for mention of attachments and warns if the "
 "attachment is missing"
 msgstr ""
-"ابحث عن الدلالات في رسالة للتنبه للمرفقات والتحذير إن كان المرفق مفقوداً"
+"ابحث عن الدلالات في رسالة للتنبه للمرفقات والتحذير إن كان المرفق مفقودًا"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
-"وجد إيفوليوشن بعض الكلمات الأساسية التي تقترح أن هذه الرسالة تحتوي مرفقاً، "
+"وجد إيفوليوشن بعض الكلمات الأساسية التي تقترح أن هذه الرسالة تحتوي مرفقًا، "
 "ولكنه لم يجد هذا المرفق."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
@@ -15641,7 +16032,7 @@ msgstr "ملحق المرفقات الصوتية"
 
 #: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
-msgstr "انتق اسماً لملف أرشيف إيفُليوشن"
+msgstr "انتق اسمًا لملف أرشيف إيفُليوشن"
 
 #: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
@@ -15649,7 +16040,7 @@ msgstr "أ_عد تشغيل إيفُليوشن بعد النسخ الاحتياط
 
 #: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
-msgstr "انتق اسماً لملف أرشيف إيفُليوشن لاسترجاعه"
+msgstr "انتق اسمًا لملف أرشيف إيفُليوشن لاسترجاعه"
 
 #: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
@@ -15667,7 +16058,7 @@ msgid ""
 msgstr ""
 "يمكنك استرجاع إيفوليوشن من نسختك الاحتياطية. يمكن استرجاع كل البريد "
 "والتقويمات والمهمات والمذكرات والمراسَلين. \n"
-"إنه يسترجع أيضاً إعداداتك الشخصية ومرشحات البريد، إلخ."
+"إنه يسترجع أيضًا إعداداتك الشخصية ومرشحات البريد، إلخ."
 
 #: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
@@ -15679,90 +16070,116 @@ msgstr "انتق أرشيف إيفُليوشن لاسترجاعه:"
 
 #: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
-msgstr "اختر ملفاً لاسترجاعه"
+msgstr "اختر ملفًا لاسترجاعه"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
-msgstr "انسخ دليل إيفُليوشن إحتياطياً"
+msgstr "انسخ دليل إيفُليوشن إحتياطيًا"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "استعد دليل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "تحقق من نسخ إيفُليوشِن الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "أعد تشغيل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "مع واجهة المستخدم الرسومية"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "يجري إطفاء إيفوليوشن"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "يجري النسخ الاحتياطي لحسابات وإعدادات إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "جارٍ النسخ الاحتياطي لبيانات إيفوليوشن (البريد، المراسَلون، التقويم، المهمات، "
 "المذكرات)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "اكتمل النسخ الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "جارٍ إعادة تشغيل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
-msgstr "انسخ بيانات إيفُليوشن الحالية احتياطياً"
+msgstr "انسخ بيانات إيفُليوشن الحالية احتياطيًا"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "جارٍ استخراج الملفات من النسخة الاحتياطية"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "جارٍ تحميل إعدادات إيفُليوشِن"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "جارٍ إزالة ملفات النسخ الاحتياطي المؤقتة"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "جارٍ النسخ الاحتياطي إلى المجلد %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "يجري الاسترجاع من المجلد %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "نسخ إيفُليوشِن الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "استرجاع إيفُليوشِن"
 
+#: ../plugins/backup-restore/backup.c:494
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "انسخ بيانات إيفُليوشن الحالية احتياطيًا"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "جارٍ إعادة تشغيل إيفُليوشن"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "ملحق لنسخ إعدادات وبيانات إيفُليوشن احتياطياً واستعادتها."
+msgstr "ملحق لنسخ إعدادات وبيانات إيفُليوشن احتياطيًا واستعادتها."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
@@ -15785,9 +16202,9 @@ msgid ""
 "you want Evolution to restart automatically after backup, please enable the "
 "toggle button."
 msgstr ""
-"نسخ إبفوليوشن الاحتياطي يمكن أن يبدأ فقط عندما لا يكون إيفوليوشن مشغلاً. رجاءً "
+"نسخ إبفوليوشن الاحتياطي يمكن أن يبدأ فقط عندما لا يكون إيفوليوشن مشغلًا. رجاءً "
 "تأكد أنك حفظت وأغلقت كل النوافذ غير المحفوظة قبل المتابعة. إن كنت تريد من "
-"إيفوليوشن أن يبدأ تلقائياً بعد النسخ الاحتياطي، رجاءً فعّل مفتاح التبديل."
+"إيفوليوشن أن يبدأ تلقائيًا بعد النسخ الاحتياطي، رجاءً فعّل مفتاح التبديل."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 #, fuzzy
@@ -15804,8 +16221,8 @@ msgstr "رجاءً انتق ملف نسخ احتياطي صالح في إيفُ�
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 #, fuzzy
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
+msgid "The selected folder is not writable."
+msgstr "نسخ المجلد المُنتقى إلى داخل مجلد آخر"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -15817,8 +16234,8 @@ msgid ""
 msgstr ""
 "هذا سوف يحذف كل بيانات إيفوليوشن الحالية والإعدادات ويسترجعها من نسختك "
 "الاحتياطية. استرجاع إبفوليوشن يمكن أن يبدأ فقط عندما لا يكون إيفوليوشن "
-"مشغلاً. رجاءً تأكد أنك حفظت وأغلقت كل النوافذ غير المحفوظة قبل المتابعة. إن "
-"كنت تريد من إيفوليوشن أن يبدأ تلقائياً بعد الاسترجاع، رجاءً فعّل مفتاح التبديل."
+"مشغلًا. رجاءً تأكد أنك حفظت وأغلقت كل النوافذ غير المحفوظة قبل المتابعة. إن "
+"كنت تريد من إيفوليوشن أن يبدأ تلقائيًا بعد الاسترجاع، رجاءً فعّل مفتاح التبديل."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -15839,9 +16256,9 @@ msgstr "المراسَلون التلقائيون"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr "أنشيء تل_قائياً مداخل في دفتر العناوين عند الرد على الرسائل"
+#, fuzzy
+msgid "_Auto-create addressbook entries when replying to messages"
+msgstr "أنشئ تل_قائيًا مداخل في دفتر العناوين عند الرد على الرسائل"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15853,10 +16270,9 @@ msgstr "مراسَلو المراسلة الفورية"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr "زامِن معلومات المراسَلين وصورهم دورياً مع قائمة أصدقاء Pidgin"
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "زامِن معلومات المراسَلين وصورهم دوريًا مع قائمة أصدقاء Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -15874,7 +16290,7 @@ msgid ""
 "lists."
 msgstr ""
 "لملء دفتر عناوينك بالأسماء وعناوين البريد الإلكتروني عند ردك على الرسائل. "
-"ولملئه أيضاً بمعلومات الاتصال عن طريق المراسلة الفورية بمن هم في قائمة "
+"ولملئه أيضًا بمعلومات الاتصال عن طريق المراسلة الفورية بمن هم في قائمة "
 "أصدقائك."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
@@ -15941,7 +16357,7 @@ msgid "_URL:"
 msgstr "ع_نوان:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "استخدم _SSL"
 
@@ -15963,7 +16379,7 @@ msgstr "يوفر الوظائف الأساسية للتقويمات المحلي
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:381
 #, fuzzy
 msgid "Re_fresh:"
 msgstr "أعِد الت_حميل"
@@ -15995,7 +16411,7 @@ msgstr "حالة الطقس: ضباب"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr "حالة الطقس: غائم جزئياً"
+msgstr "حالة الطقس: غائم جزئيًا"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
@@ -16015,7 +16431,7 @@ msgstr "حالة الطقس: عواصف رعدية"
 
 #: ../plugins/calendar-weather/calendar-weather.c:267
 msgid "Select a location"
-msgstr "انتق موقعاً"
+msgstr "انتق موقعًا"
 
 #: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
@@ -16042,7 +16458,7 @@ msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
 msgstr ""
-"ملحق اختباري يظهر مثالاً لملحق يعرض قائمة منبثقة تسمح لك بنسخ أشياء للحافظة."
+"ملحق اختباري يظهر مثالًا لملحق يعرض قائمة منبثقة تسمح لك بنسخ أشياء للحافظة."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16055,7 +16471,7 @@ msgstr "إفحص ما إذا كان إيفُليوشن هو مرسل البري�
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "تأكد دائماً من أن إيفُليوشن هو عميل البريد الافتراضي عند فتحه."
+msgstr "تأكد دائمًا من أن إيفُليوشن هو عميل البريد الافتراضي عند فتحه."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
@@ -16067,7 +16483,7 @@ msgstr "عميل البريد الافتراضي"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "هل تريد جعل إيفُليوشن عميلاً افتراضياً لبريدك؟"
+msgstr "هل تريد جعل إيفُليوشن عميلًا افتراضيًا لبريدك؟"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
 #: ../shell/main.c:679
@@ -16106,11 +16522,28 @@ msgstr ""
 "يوفر امكانية وضع علامة لتقويم أو دفتر عناوين لجعله التقويم أو دفتر العناوين "
 "الافتراضي."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 #, fuzzy
 msgid "_Custom Header"
 msgstr "ترويسات مخصصة"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+#, fuzzy
+msgid "Key"
+msgstr "كينيا"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 #, fuzzy
 msgid "Email Custom Header"
@@ -16128,7 +16561,7 @@ msgstr "ترويسات مخصصة"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 #, fuzzy
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "ترويسات مخصصة"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16188,8 +16621,8 @@ msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
-"الرسالة المحددة أدناه سيتم إرسالها تلقائياً إلى \n"
-"كل شخص يرسل لك بريداً وأنت خارج المكتب."
+"الرسالة المحددة أدناه سيتم إرسالها تلقائيًا إلى \n"
+"كل شخص يرسل لك بريدًا وأنت خارج المكتب."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:274
 #: ../plugins/exchange-operations/exchange-account-setup.c:279
@@ -16239,29 +16672,34 @@ msgstr "حجم المحلدات"
 msgid "Exchange Settings"
 msgstr "إعدادات إكستشينج"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:623
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "عنوان _وصول آتولوك من ويب:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:649
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "و_ثِّق"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_بريد"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "نوع التوثق"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:866
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "فح_ص الأنواع المدعومة"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:978
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s ك.بايت"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16351,7 +16789,7 @@ msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
 msgstr ""
-"هذه الرسالة أُرسلت تلقائياً من قبل إيفوليوشن لإعلامك أنك الآن مندوب عني. يمكنك "
+"هذه الرسالة أُرسلت تلقائيًا من قبل إيفوليوشن لإعلامك أنك الآن مندوب عني. يمكنك "
 "الآن إرسال الرسائل باسمي."
 
 #. To translators: Another chunk of the same message.
@@ -16365,14 +16803,14 @@ msgstr "لقد أُعطيتَ الأذونات التالية على مجلدا�
 #.
 #: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
-msgstr "يُسمح لك أيضاً برؤية عناصري الخاصة."
+msgstr "يُسمح لك أيضًا برؤية عناصري الخاصة."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
 #: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
-msgstr "على أي حال، ليس مسموحاً لك برؤية عناصري الخاصة."
+msgstr "على أي حال، ليس مسموحًا لك برؤية عناصري الخاصة."
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
@@ -16482,7 +16920,7 @@ msgstr "حجم المجلّد"
 msgid "User"
 msgstr "_مستخدم"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "الاشتراك في مجلد مستخدم آخر"
@@ -16501,7 +16939,7 @@ msgstr "ألغاء الإشتراك في المجلّد..."
 #: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "هل تريد فعلاً إلغاء الاشتراك في المجلد \"%s\"؟"
+msgstr "هل تريد فعلًا إلغاء الاشتراك في المجلد \"%s\"؟"
 
 #: ../plugins/exchange-operations/exchange-folder.c:476
 #: ../plugins/exchange-operations/exchange-folder.c:531
@@ -16515,7 +16953,7 @@ msgid ""
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 msgstr ""
-"<b>حاليّاً، حالتك هي \"خارج المكتب\". </b>\n"
+"<b>حاليًّا، حالتك هي \"خارج المكتب\". </b>\n"
 "\n"
 "أتريد تغييرها إلى \"في المكتب\"؟ "
 
@@ -16533,16 +16971,16 @@ msgid ""
 "who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>الرّسالة المحدّدة أدناه سترسل تلقائيّاً لكل شخص يرسل\n"
-"لك بريداً حين تكون خارج المكتب.</small>"
+"<small>الرّسالة المحدّدة أدناه سترسل تلقائيًّا لكل شخص يرسل\n"
+"لك بريدًا حين تكون خارج المكتب.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
-msgstr "أنا في المكتب حاليّاً"
+msgstr "أنا في المكتب حاليًّا"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
-msgstr "أنا خارج المكتب حاليّاً"
+msgstr "أنا خارج المكتب حاليًّا"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
@@ -16679,11 +17117,11 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:12
 msgid "Request a _delivery receipt for this message"
-msgstr "أطلب إخطاراً بالوصول لهذه الرسالة"
+msgstr "أطلب إخطارًا بالوصول لهذه الرسالة"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:13
 msgid "Request a _read receipt for this message"
-msgstr "أطلب إخطاراً بالقراءة لهذه الرسالة"
+msgstr "أطلب إخطارًا بالقراءة لهذه الرسالة"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
 msgid "Send as Delegate"
@@ -16787,7 +17225,7 @@ msgstr "غير قادر على تحديد موقع الخادوم {0}."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not make {0} a delegate"
-msgstr "غير قادر على تعيين {0} مُفَوَّضاً"
+msgstr "غير قادر على تعيين {0} مُفَوَّضًا"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions"
@@ -16810,10 +17248,14 @@ msgid "Could not update out-of-office state"
 msgstr "غير قادر على تحديث حالة خارج المكتب"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "حساب إكستشينج غير متصل."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16830,7 +17272,7 @@ msgid ""
 msgstr ""
 "متصل إكستشينج يتطلب الوصول لبعض\n"
 "وظائف خادوم إكستشينج التي يبدو أنها\n"
-"معطلة أو ممنوعة. (يحدث هذا غالباً\n"
+"معطلة أو ممنوعة. (يحدث هذا غالبًا\n"
 "دون قصد.) يجب على مدير إكستشينج \n"
 "تفعيل هذه الوظائف حتى تستطيع \n"
 "استخدام متصل إكستشينج الخاص بإيفُليوشن.\n"
@@ -16841,32 +17283,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "فشل تحديث المُفَوَّضِين:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
-msgstr "المجلّد موجود مسبقاً"
+msgstr "المجلّد موجود مسبقًا"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
-msgstr "المجلّد ليس موجوداً"
+msgstr "المجلّد ليس موجودًا"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "المجلّد غير متصل"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "خطأ عام"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "لا يمكن الوصول لخادوم المسرد العالمي"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16874,71 +17316,71 @@ msgstr ""
 "إن كان برنامج وصول آوتلوك من ويب يعمل على مسار مختلف، يجب أن تحدد هذا المسار "
 "في مربع حوار تكوين الحساب."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
-msgstr "صندوق البريد لـ{0} ليس موجوداً على هذا الخادوم."
+msgstr "صندوق البريد لـ{0} ليس موجودًا على هذا الخادوم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "تأكد من صحة العنوان وحاول مرة أخرى."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "تأكد من صحة كتابة اسم الخادوم وحاول مرة أخرى."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "تأكد من صحة اسم المستخدم وكلمة السر وحاول مرة أخرى."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "لم يتم تعيين خادوم مسرد عالمي لهذا الحساب."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "لا يوجد صندوق بريد للمستخدم {0} على {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "لا يوجد مستخدم بالاسم {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "تم تغيير كلمة السر بنجاح."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "رجاءً أدخل معرّف المندوب أو أزل التأشير عن خيار الإرسال كمندوب."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "رجاءً تأكد من أن اسم خادوم المسرد العالمي مكتوب بصورة صحيحة."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "رجاء أعد تشغيل إيفُليوشن لكي يظهر أثر التغييرات"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "الرجاء انتقاء مستخدم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
-msgstr "رفض الخادوم كلمة السر لأنها ضعيفة جداً."
+msgstr "رفض الخادوم كلمة السر لأنها ضعيفة جدًا."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "سيتم تعطيل حساب إكستشينج عندما تنهي إيفُليوشن"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "ستتم إزالة حساب إكستشينج عندما تنهي إيفُليوشن"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "خادوم إكستشينج غير متوافق مع متصل إكستشينج."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16946,7 +17388,7 @@ msgstr ""
 "الخادوم يقوم بتشغيل إكستشينج ٥.٥. متصل إكستشينج لا يدعم سوى مايكروسوفت "
 "إكستشينج ٢٠٠٠ و ٢٠٠٣ فقط."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16954,78 +17396,78 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
-"يعني هذا غالباً أن خادومك يتطلب \n"
+"يعني هذا غالبًا أن خادومك يتطلب \n"
 "تحديد اسم نطاق ويندوز \n"
 "كجزء من اسم المستخدم (مثل: &quot;نطاق\\مستخدم&quot;).\n"
 "\n"
 "أو من الممكن أن تكون قد أخطأت في كتابة كلمة السر."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "حاول مرة أخرى بكلمة سر مختلفة."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "غير قادر على إضافة المستخدم لقائمة التحكم بالنفاذ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "غير قادر على تحرير المُفَوَّضِين."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "حدث خطأ أثناء محاولة العثور على {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "خطأ مجهول."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "نوع مجهول"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "عمليّة غير مدعومة"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "لقد قاربت على استخدام كل المساحة المخصصة لتخزين البريد على هذا الخادوم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "يُسمح لك بإرسال رسالة باسم منتدب واحد في نفس الوقت."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "لا يمكنك انتداب نفسك"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "لقد تخطيت المساحة المخصصة لك لتخزين البريد على هذا الخادوم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "لا يمكن لك إلا أن تشكل حساب إكيتشينج واحد فقط."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
-"استخدامك الحالي هو: {0} كب. حاول إفراغ جزءاً من المساحة عن طريق حذف بعض "
+"استخدامك الحالي هو: {0} كب. حاول إفراغ جزءًا من المساحة عن طريق حذف بعض "
 "البريد."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "استخدامك الحالي هو: {0} كب. لن تستطيع إرسال أو تلقي البريد الآن."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17033,21 +17475,21 @@ msgstr ""
 "استخدامك الحالي هو: {0} كب. لن تستطيع إرسال أو تلقي البريد حتى تفرغ بعض "
 "المساحة عن طريق حذف بعض البريد."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "نفدت صلاحية كلمة سرك."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} لا يمكن إضافته إلى قائمة تحكم بالنفاذ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
-msgstr "{0} مندوب مسبقاً"
+msgstr "{0} مندوب مسبقًا"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
-msgstr "{0} موجود في القائمة مسبقاً"
+msgstr "{0} موجود في القائمة مسبقًا"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
@@ -17099,7 +17541,8 @@ msgid ""
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
+#, fuzzy
+msgid "Compose in _External Editor"
 msgstr "اكتبْ في محرر خارجي"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
@@ -17136,7 +17579,7 @@ msgid ""
 msgstr ""
 "أرفق ترويسة صورة الوجه مع البريد الصادر. يحتاج المستخدم في المرة الأولى إلى "
 "إعداد صورة png 48*48. ستـُرمّز بترميز base64 وتـُخزّن في ~/.evolution/faces . "
-"سيُستخدم ذلك في رسائل البريد التي ستـُرسل من الآن وصاعداً."
+"سيُستخدم ذلك في رسائل البريد التي ستـُرسل من الآن وصاعدًا."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
@@ -17160,13 +17603,35 @@ msgstr "ألغاء الإشتراك في المجلّدات"
 msgid "_Unsubscribe"
 msgstr "إل_غاء الإشتراك"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "جوجل"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>أعضاء</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+#, fuzzy
+msgid "Username:"
+msgstr "ا_سم المستخدم:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+#, fuzzy
+msgid "Update every"
+msgstr "تحديث الإستفسار"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "ملحق لإعداد تقويم جوجل."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17253,10 +17718,21 @@ msgid "_Junk List"
 msgstr "قائمة ال_نفايات"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "حالة الرسالة"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "تم سحب الرسالة بنجاح"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "سحب بريد"
 
@@ -17264,12 +17740,6 @@ msgstr "سحب بريد"
 msgid "Add Send Options to groupwise messages"
 msgstr "أضِف خيارات الإرسال لرسائل جروبوايز"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "خيارات الإرسال"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "ملحق لمزايا حسابات جروبوايز."
@@ -17318,35 +17788,41 @@ msgstr ""
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 #, fuzzy
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقاً. رجاء حدد اسماً مختلفاً."
+msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
 #, fuzzy
 msgid "Account Already Exists"
-msgstr "التوقيع موجود مسبقاً."
+msgstr "التوقيع موجود مسبقًا."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
-msgstr ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 #, fuzzy
 msgid "This is a recurring meeting"
-msgstr "إجعل هذا حدثاً متكرراً"
+msgstr "إجعل هذا حدثًا متكررًا"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
 #, fuzzy
-msgid "What would you like to {0}?"
+msgid "Would you like to accept it?"
 msgstr "أترغب في حفظ تغييراتك؟"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
+msgid "Would you like to decline it?"
+msgstr "أترغب في حفظ تغييراتك؟"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "لم أستطع الحفظ إلى ملف الحفظ الآلي &quot;{0}&quot;."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr ""
 
@@ -17465,11 +17941,11 @@ msgstr "ولوج بالو_كالة..."
 
 #: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب متصلاً."
+msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب متصلًا."
 
 #: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب مفعلاً."
+msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب مفعلًا."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
 #: ../plugins/groupwise-features/share-folder.c:750
@@ -17663,7 +18139,7 @@ msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 msgstr ""
-"خدمة \"hald\" مطلوبة ولكنها غير مشغلة حالياً. رجاءً فعّل هذه الخدمة وأعد تشغيل "
+"خدمة \"hald\" مطلوبة ولكنها غير مشغلة حاليًا. رجاءً فعّل هذه الخدمة وأعد تشغيل "
 "هذا البرنامج، أو اتصل بمدير نظامك."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
@@ -17820,7 +18296,7 @@ msgstr "التقويم المرفق غير صالح"
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "تدعي الرسالة أنها تحتوي تقويماً، لكن التقويم ليس بهيئة iCalendar صالحة."
+msgstr "تدعي الرسالة أنها تحتوي تقويمًا، لكن التقويم ليس بهيئة iCalendar صالحة."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1418
 #: ../plugins/itip-formatter/itip-formatter.c:1436
@@ -17848,31 +18324,31 @@ msgid ""
 "imported"
 msgstr "لمعالجة كل هذه العناصر، يجب حفظ الملف واستيراد التقويم."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "هذا الموعد متكرّر"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "هذه المهمة متكرّرة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "هذه المذكرة متكرّرة"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "احذف الرسالة بعد الت_عامل معها"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "بحث عن تضارب"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "انتق تقويمات للبحث في عن تضاربات المواعيد"
 
@@ -18298,42 +18774,42 @@ msgid "_Update"
 msgstr "_تحديث"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "زمن ال_بدء:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "زمن الإ_نتهاء:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "تعليق:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "رُ_دّ على المرسِل"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "أرسِل تحدي_ثات للحضور"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "_طبق على كل الحالات"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "أظهر الوقت كمُتفرِّغ"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "ال_مهام :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "تذكيرات :"
 
@@ -18395,8 +18871,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "توليد رسالة D-BUS عند وصول رسائل بريد جديدة."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#, fuzzy
 msgid ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr "إن كان صحيحا، فصَفِّرْ وإلاَّ فشغل ملف صوت عند وصول رسائل جديدة."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -18439,12 +18917,22 @@ msgstr "ما إن كان على الأيقونة أن تومِض أم لا."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "فيما يجب التبليغ عن الرسائل الجديدة في مجلد الداخل فقط."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "توليد _رسالة D-BUS"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "تنبيه بريدي"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "تنبيه بريدي"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18457,7 +18945,7 @@ msgstr[1] "لقد استلمت رسالتان (%d) في %s."
 msgstr[2] "لقد استلمت (%d) رسائل في %s."
 msgstr[3] "لقد استلمت (%d) رسالة  في %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18466,48 +18954,48 @@ msgstr[1] "لقد استلمت رسالتان جديدتان (%Id)."
 msgstr[2] "لقد استلمت %Id رسائل جديدة."
 msgstr[3] "لقد استلمت %Id رسالة جديدة."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "بريد جديد"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "اظهر الأيقونة في م_ساحة التبليغ"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "وم_يض الأيقونة في منطقة التبليغ"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "اجعل ال_رسالة تنبثق مع الأيقونة"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "إعزف الصوت عند وصول رسائل جديدة"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "_صافرة"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "شَغِّل ملف صوت"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "تحديد اسم _ملف:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "انتقاء ملف صوت"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "اق_ر ء"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "بَلِّغ عن الرسائل الجديدة للبريد الوافد فقط"
 
@@ -18621,7 +19109,7 @@ msgid ""
 "has been sent."
 msgstr ""
 "سيتم إرسال رسالة بريد إلكتروني للعنوان \"{0}\". يمكنك إما أن ترسل الرسالة "
-"آلياً، أو أن تراها وتغيرها أولاً.\n"
+"آليًا، أو أن تراها وتغيرها أولًا.\n"
 "\n"
 "ستستقبل إجابة من القائمة البريدية بعد إرسال الرسالة بفترة قصيرة."
 
@@ -18779,7 +19267,7 @@ msgstr "وضع علامة التقويم المنتقى لعرضه في وضع �
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make available for offline use"
-msgstr "_لا تجعل هذا التقويم متوفراً للاستخدام دون اتصال"
+msgstr "_لا تجعل هذا التقويم متوفرًا للاستخدام دون اتصال"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 msgid "_Make available for offline use"
@@ -18799,7 +19287,7 @@ msgstr "ملحق لإدارة ما إذا كانت الملحقات مفعلة �
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "مدير الملحقات"
 
@@ -18815,29 +19303,20 @@ msgstr "ملح_قات"
 msgid "Author(s)"
 msgstr "المؤلف(ون)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "الوصف"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "إعدادات "
 
-#: ../plugins/plugin-manager/plugin-manager.c:223
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ملحوظة: بعض التغييرات لن تأخذ مجراها إلا بعد إعادة التشغيل"
 
-#: ../plugins/plugin-manager/plugin-manager.c:245
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "نظرة عامة "
 
-#: ../plugins/plugin-manager/plugin-manager.c:246
-msgid "Configuration"
-msgstr "إعدادات "
-
-#: ../plugins/plugin-manager/plugin-manager.c:262
-msgid "There is no configuration option for this plugin."
-msgstr "لا يوجد خيار تشكيل لهذا الملحق."
-
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/plugin-manager/plugin-manager.c:385
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "ملحق"
 
@@ -18848,7 +19327,7 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"ملحق اختباري يعرض مثالاً لملحق للتهيئة يسمح لك بتعطيل رسائل HTML.\n"
+"ملحق اختباري يعرض مثالًا لملحق للتهيئة يسمح لك بتعطيل رسائل HTML.\n"
 "\n"
 "هذا الملحق ليس سوى مثال وهو غير مدعوم.\n"
 
@@ -18863,7 +19342,7 @@ msgstr "افضل نصا عاديا"
 
 #: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
-msgstr "اظهر HTML إن كان موجوداً"
+msgstr "اظهر HTML إن كان موجودًا"
 
 #: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
@@ -18883,7 +19362,7 @@ msgstr "مخصص إيفُليوشن"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Writes a log of profiling data events."
-msgstr "يكتب سجلاً بأحداث تخصيص البيانات."
+msgstr "يكتب سجلًا بأحداث تخصيص البيانات."
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
@@ -18919,9 +19398,9 @@ msgid ""
 "Weekly\n"
 "Manual (via Actions menu)"
 msgstr ""
-"يومياً\n"
-"أسبوعياً\n"
-"يدوياً (عبر قائمة إجراءات)"
+"يوميًا\n"
+"أسبوعيًا\n"
+"يدويًا (عبر قائمة إجراءات)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
@@ -18989,6 +19468,32 @@ msgstr ""
 "iCal\n"
 "متوفر/مشغول"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "هاتف المنزل"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#, fuzzy
+msgid "Python Loader"
+msgstr "محمل مونو"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "قاتل البريد المزعج (مضمّن)"
@@ -19046,7 +19551,7 @@ msgid ""
 "to be installed."
 msgstr ""
 "لترشيح البريد المهمل باستخدام قاتل البريد المزعج. هذا الملحق يتطلب وجود قاتل "
-"البريد المزعج مثبتاً."
+"البريد المزعج مثبتًا."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "SpamAssassin junk plugin"
@@ -19083,7 +19588,6 @@ msgid "MIME Type"
 msgstr "نوع MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "احفظ"
 
@@ -19198,7 +19702,7 @@ msgstr "انتق ملفّ الوجهة"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
-msgstr "انتق مصدراً واحداً"
+msgstr "انتق مصدرًا واحدًا"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 msgid "Selects a single calendar or task source for viewing."
@@ -19217,13 +19721,13 @@ msgid "Show _only this Task List"
 msgstr "لا تعرض _سوى قائمة المهام هذه"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin that manages the Startup wizard."
-msgstr "ملحق يدير مساعد بدء التشغيل."
+msgid "Guides you through your initial account setup."
+msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "مساعد بدء التشغيل"
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "المساعد"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -19240,7 +19744,7 @@ msgid ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"مرحباً بك في إيفُليوشن. ستسمح لك الشاشات التالية بالاتصال بحسابات بريدك، "
+"مرحبًا بك في إيفُليوشن. ستسمح لك الشاشات التالية بالاتصال بحسابات بريدك، "
 "واستيراد ملفات من تطبيقات أخرى. \n"
 "\n"
 "رجاءً اضغط زر \"أمام\" للمتابعة. "
@@ -19288,6 +19792,32 @@ msgstr "رسائل المناقشات حسب الموضوع"
 msgid "F_all back to threading messages by subject"
 msgstr "التراجع إلى رسائل المناقشة حسب المو_ضوع"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "قائمة الدلالات التي سيبحث عنها ملحق مُذَكِّر المرفقات في متن الرسالة."
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "المسمّى الوظيفي"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "احفظ _كمسودة"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "احفظ _كمسودة"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "ملحق بسيط يستخدم ytnef لفك ترميز مرفقات tnef."
@@ -19296,6 +19826,31 @@ msgstr "ملحق بسيط يستخدم ytnef لفك ترميز مرفقات tnef
 msgid "TNEF Attachment decoder"
 msgstr "فاكّ ترميز مرفقات TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup WebDAV contacts."
+msgstr "ملحق لإعداد تقويم جوجل."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "لا مراسَلين"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#, fuzzy
+msgid "URL:"
+msgstr "ع_نوان:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "قشرة إفُليوشِن"
@@ -19313,116 +19868,113 @@ msgid "Evolution Test component"
 msgstr "مكوّن إختبار إيفُليوشِن"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "وصف مَقطعي لإعدادات الطابعة الحالية."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
 msgid "Automatic proxy configuration URL"
 msgstr "تعرّف آلي على الإبتسامات"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "إصدار التشكيل"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "يقرر ما إن كان يجب تشغيل اكتشاف الانهيار أم لا."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "العرض الافتراضي للشريط الجانبي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "إرتفاع النّافذة الإفتراضي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "الحالة الافتراضية للنافذة"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "عرض النّافذة الإفتراضي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "أدخل كلمة سِر"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "الهوية "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "آخر إصدار تشكيل تمت الترقية إليه"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "قائمة مسارات المجلدات المخطط تزامنها للقرص من أجل الاستخدام في وضع عدم "
 "الاتصال"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 #, fuzzy
 msgid "Proxy configuration mode"
 msgstr "إعدادات "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19430,27 +19982,27 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "الشريط الجانبي مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "تخطّي مربع حوار التحذير من استخدام إصدار التطوير"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "تخطّي مربع حوار التحذير عند الاسترجاع"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "بدأ دون اتصال بالإنترنت"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "شريط الحالة مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19458,19 +20010,19 @@ msgstr ""
 "إصدار تشكيل إيفُليوشن، مع مستوى التشكيل الأكبر/الأصغر (\"2.6.0\" على سبيل "
 "المثال)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "الارتفاع الافتراضي للنافذة الرئيسية، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "العرض الافتراضي للنافذة الرئيسية، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "العرض الافتراضي للشريط الجانبي، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19478,37 +20030,37 @@ msgstr ""
 "آخر إصدار تشكيل تمت الترقية إليه،  مع مستوى التشكيل الأكبر/الأصغر (\"2.6.0\" "
 "على سبيل المثال)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19518,7 +20070,7 @@ msgstr ""
 "\"مثل نوتيلس\". إن تم انتقاء \"مثل نوتيلس\" سيتم تحديد أسلوب عرض الأزرار حسب "
 "طريقة عرضها في جنوم."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19526,66 +20078,66 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "شريط الأدوات مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "آخر إصدار تشكيل تمت الترقية إليه"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
-"ما إن كان إيفُليوشن سيبدأ التشغيل في وضع عدم الاتصال بدلاً من وضع الاتصال."
+"ما إن كان إيفُليوشن سيبدأ التشغيل في وضع عدم الاتصال بدلًا من وضع الاتصال."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "ما إن كان يجب القيام باكتشاف الانهيار أم لا"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "فيما إذا "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "ما إن كان يجب إظهار الشريط الجانبي."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "ما إن كان يجب إظهار شريط الحالة."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
-msgstr "ما إن كان شريط الأدوات مرئياً."
+msgstr "ما إن كان شريط الأدوات مرئيًا."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ما إن كان سيتم تخطي مربع حوار التحذير في إصدارات التطوير من إيفُليوشن."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "ما إن كان سيتم تخطي مربع حوار التحذير عند استرجاع إيفُليوشن."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "ما إن كانت أزرار النافذة يجب أن تكون مرئية."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "أسلوب زر النافذة"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "أزرار النافذة ظاهرة"
 
@@ -19657,29 +20209,9 @@ msgstr "إستيراد ملف _وحيد"
 msgid "Evolution Preferences"
 msgstr "تفضيلات إيفُليوشِن"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "لم يحدَّد اسم مجلّد."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "لا يمكن أن يحتوي اسم المجلّد رمز الأرجاع."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' و '..' أسماء مجلّدات محجوزة."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s -إيفُليوشن"
@@ -19695,7 +20227,7 @@ msgstr "خطأ تنفيذ %s."
 
 #: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
-msgstr "باك بدي ليس مثبّتاً"
+msgstr "باك بدي ليس مثبّتًا"
 
 #: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
@@ -19704,7 +20236,7 @@ msgstr "لم يمكن تشغيل فتى العلات."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Djihed Afifi جهاد عفيفي (djihed@gmail.com)\n"
@@ -19712,41 +20244,47 @@ msgstr ""
 "Ahmad Farghal أحمد فرغل (ahmad.farghal@gmail.com)\n"
 "Anas Husseini أنس الحسيني (linux.anas@gmail.com)"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "موقع إيفُليوشِن"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "حدث خطأ أثناء فتح صفحة الأسئلة الشائعة."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
-msgstr "ا_عمل متصلاً"
+msgstr "ا_عمل متصلًا"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ا_عمل دون اتّصال"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "اعمل دون اتّصال"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "إيفُليوشن متصل بالانترنت حاليا.  انقر هذا الزر للعمل دون اتصال بالإنترنت."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
-msgstr "يقوم إيفُليوشن حالياً بالتحول لوضع عدم الاتصال."
+msgstr "يقوم إيفُليوشن حاليًا بالتحول لوضع عدم الاتصال."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"إيفُليوشن غير متصل بالانترنت حالياً.  انقر هذا الزر للعمل على اتصال بالإنترنت."
+"إيفُليوشن غير متصل بالانترنت حاليًا.  انقر هذا الزر للعمل على اتصال بالإنترنت."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "تبديل إلى %s"
@@ -19776,9 +20314,9 @@ msgstr "لم يمكن تسجيل OAF"
 msgid "Configuration Database not found"
 msgstr "لم يعثر على قاعدة بيانات الإعداد"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "جديد"
 
@@ -19786,13 +20324,9 @@ msgstr "جديد"
 msgid "New Test"
 msgstr "إختبار جديد"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "اخ_تبار"
-
 #: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
-msgstr "أنشيء عنصر اختبار جديد"
+msgstr "أنشئ عنصر اختبار جديد"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -19828,7 +20362,7 @@ msgid ""
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
-"مرحباً بك في مساعد الاستيراد لإيفُليوشن.\n"
+"مرحبًا بك في مساعد الاستيراد لإيفُليوشن.\n"
 "سيرشدك هذا المساعد خلال عملية\n"
 "استيراد ملفات خارجية إلى إيفُليوشن."
 
@@ -19852,16 +20386,16 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"مرحباً. شكراً على تنزيل هذا إصدار المعاينة هذا\n"
+"مرحبًا. شكرًا على تنزيل هذا إصدار المعاينة هذا\n"
 "من حزمة إيفُليوشن.\n"
 "\n"
-"هذا الإصدار من إيفُليوشن ليس مكتملاً بعد. فبعض المزايا\n"
+"هذا الإصدار من إيفُليوشن ليس مكتملًا بعد. فبعض المزايا\n"
 "غير مكتملة أو لا تعمل بصورة صحيحة.\n"
 "\n"
-"إن أردت إصداراً ثابتاً من إيفُليوشن، ننصحك بإزالة تثبيت هذا\n"
-"الإصدار، وتثبيت الإصدار %s بدلاً منه.\n"
+"إن أردت إصدارًا ثابتًا من إيفُليوشن، ننصحك بإزالة تثبيت هذا\n"
+"الإصدار، وتثبيت الإصدار %s بدلًا منه.\n"
 ".\n"
-"إن وجدت عللاً، رجاءً بلغنا بوجودها عند bugzilla.gnome.org.\n"
+"إن وجدت عللًا، رجاءً بلغنا بوجودها عند bugzilla.gnome.org.\n"
 "لا يأتي هذا البرنامج مع أي ضمانات وهو غير موجه للأشخاصnالذين لا يستطيعون "
 "التحكم في غضبهم.\n"
 "\n"
@@ -19974,7 +20508,7 @@ msgstr "لا توجد مساحة كافية للترقية."
 
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
-msgstr "حذف البيانات القديمة فعلاً؟"
+msgstr "حذف البيانات القديمة فعلًا؟"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
@@ -20023,7 +20557,7 @@ msgid ""
 "can continue."
 msgstr ""
 "ترقية بياناتك وإعداداتك ستحتاج إلى ما يصل إلى {0} من مساحة القرص، لكنك لا "
-"تملك سوى {1} متوفراً.\n"
+"تملك سوى {1} متوفرًا.\n"
 "\n"
 "ستحتاج إلى إفراغ بعض المساحة في دليلك المنزلي قبل المتابعة."
 
@@ -20061,7 +20595,7 @@ msgstr "إحتف_ظ بالبيانات"
 
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
-msgstr "_ذكرني لاحقاً"
+msgstr "_ذكرني لاحقًا"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -20072,7 +20606,7 @@ msgid ""
 msgstr ""
 "{1}\n"
 "\n"
-"إن اخترت المتابعة، قد لا تصبح قادراً على النفاذ لبعض بياناتك القديمة.\n"
+"إن اخترت المتابعة، قد لا تصبح قادرًا على النفاذ لبعض بياناتك القديمة.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -20377,7 +20911,7 @@ msgstr "_حرر مدى الثقة في سلطة إصدار الشهادة"
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
-msgstr "الشّهادة موجودة أصلاً"
+msgstr "الشّهادة موجودة أصلًا"
 
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
@@ -20690,7 +21224,7 @@ msgstr "احف_ظ مراسَلي المجلد المنتقى كفيكارد"
 msgid "Select All"
 msgstr "إنتق الكل"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "إنتقاء ال_كل"
 
@@ -20759,7 +21293,7 @@ msgstr "ن_قل المراسَل إلى..."
 msgid "_Move Folder Contacts To"
 msgstr "ان_قل مراسَلي المجلد إلى"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_جديد"
 
@@ -20897,192 +21431,6 @@ msgstr "أسبوع عمل"
 msgid "_Open Appointment"
 msgstr "افت_ح موعد"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "انقر هنا لإرفاق ملف"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "انقر هنا لغلق النافذة الحالية"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "انقر هنا لحفظ النافذة الحالية"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "انقر هنا لعرض المساعدة المتوفرة"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "غلق"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "نسخ النّص المنتقى للحافظة الوسيطة"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "قص النّص المنتقى للحافظة الوسيطة"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "أ_درج"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "لصق نص من الحافظة الوسيطة"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "إنتقاء كامل النّص"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_مساعدة"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_خيارات"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "حدث يستغرق يوماً بأكمله"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "حدث يستغرق _يوماً بأكمله"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "صنف كخصوصي"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "تصنيف كخاص"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "تصنيف كعام"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "انقر هنا لتعيين أو إزالة المنبهات لهذا الحدث"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "أدرج خيارات إرسال متقدمة"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "إجعل هذا حدثاً متكرراً"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "_عام"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "الاستعلام عن معلومات متوفر/مشغول للحضور"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "حقل ال_دور"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_خيارات الإرسال"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "اعرض حالتي كمش_غول في هذا الوقت"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "المنطقة ال_زمنية"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "تحديد ما إذا كان حقل نوع الحضور ظاهراً"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "تحديد ما إذا كان حقل تأكيد الحضور ظاهراً"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "تحديد ما إذا كان حقل الدور ظاهراً"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "تحديد ما إذا كان حقل الحالة ظاهراً"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "تحديد ما إذا كنت تريد إظهار المنطقة الزمنية"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "تحديد ما إذا كنت تريد إظهار الفئات"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "تغيير ما إذا كان الحدث يستغرق يوماً بأكمله"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "تحديد ما إذا كنت تريد تغيير حالتك إلى مشغول في هذا الوقت"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "ال_منبّهات"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "ال_فئات"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "التّ_صنيف"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_خصوصي"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_متفرّغ/مشغول"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_خاص"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_تأكيد الحضور"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "ت_كرار"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "حقل ال_حالة"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "حقل ال_نوع"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "إلغاء عمليّة البريد الحاليّة"
@@ -21093,15 +21441,15 @@ msgstr "نسخ المجلد المُنتقى إلى داخل مجلد آخر"
 
 #: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
-msgstr "أنشيء مجلداً جديداً لتخزين البريد"
+msgstr "أنشئ مجلدًا جديدًا لتخزين البريد"
 
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
-msgstr "أنشيء أو حرر تعريفات مجلّد البحث"
+msgstr "أنشئ أو حرر تعريفات مجلّد البحث"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
-msgstr "أنشيء أو حرر قواعد ترشيح البريد الجديد"
+msgstr "أنشئ أو حرر قواعد ترشيح البريد الجديد"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
@@ -21122,7 +21470,7 @@ msgstr "نقل المجلد المُنتقى إلى مجلد آخر"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "إزالة جميع الرّسائل المحذوفة من كل المجلّدات نهائيّاً"
+msgstr "إزالة جميع الرّسائل المحذوفة من كل المجلّدات نهائيًّا"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
@@ -21138,7 +21486,7 @@ msgstr "اظهر معاينة الرسالة تحت قائمة الرسائل"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
-msgstr "اظهر معاينة الرسالة وقائمة الرسائل جنباً إلى جنب"
+msgstr "اظهر معاينة الرسالة وقائمة الرسائل جنبًا إلى جنب"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
@@ -21247,7 +21595,7 @@ msgstr "أخفي الرّسائل المقر_وءة"
 #: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "أخفي الرّسائل المحذوفة عوضاً عن إظهارها بخطٍّ يشطبها"
+msgstr "أخفي الرّسائل المحذوفة عوضًا عن إظهارها بخطٍّ يشطبها"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
@@ -21263,7 +21611,7 @@ msgstr "لصق رسالة (أو رسائل) من الحافظة"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "إزالة جميع الرّسائل المحذوفة من هذا المجلّد نهائيّاً"
+msgstr "إزالة جميع الرّسائل المحذوفة من هذا المجلّد نهائيًّا"
 
 #: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
@@ -21291,7 +21639,7 @@ msgstr "انتق _كل الرسائل"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr "إنتقاء جميع الرّسائل غير المنتقاة حاليّاً و تلك الرّسائل فقط"
+msgstr "إنتقاء جميع الرّسائل غير المنتقاة حاليًّا و تلك الرّسائل فقط"
 
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
@@ -21311,15 +21659,15 @@ msgstr "أظهر الرسائل الم_خفية"
 
 #: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
-msgstr "اظهر الرّسائل المخفيّة مؤقّتاً"
+msgstr "اظهر الرّسائل المخفيّة مؤقّتًا"
 
 #: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
-msgstr "إخفاء جميع الرّسائل المقروءة مؤقّتاً"
+msgstr "إخفاء جميع الرّسائل المقروءة مؤقّتًا"
 
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
-msgstr "أخفي الرّسائل المنتقاة مؤقتاً"
+msgstr "أخفي الرّسائل المنتقاة مؤقتًا"
 
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
@@ -21357,7 +21705,7 @@ msgstr "تطبيق قواعد الترشيح على الرسائل المنتق�
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr "فحص بحثاً عن النفاية"
+msgstr "فحص بحثًا عن النفاية"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -21385,39 +21733,39 @@ msgstr "نسخ الرسائل المنتقاة إلى الحافظة"
 
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
-msgstr "أنشيء _قاعدة"
+msgstr "أنشئ _قاعدة"
 
 #: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
-msgstr "أنشيء مجلّد بحث لهؤلاء المرسَل إليهم"
+msgstr "أنشئ مجلّد بحث لهؤلاء المرسَل إليهم"
 
 #: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
-msgstr "أنشيء مجلّد بحث للقائمة البريدية هذه"
+msgstr "أنشئ مجلّد بحث للقائمة البريدية هذه"
 
 #: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
-msgstr "أنشيء مجلّد بحث لهذا المرسِل"
+msgstr "أنشئ مجلّد بحث لهذا المرسِل"
 
 #: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
-msgstr "أنشيء مجلّد بحث لهذا الموضوع"
+msgstr "أنشئ مجلّد بحث لهذا الموضوع"
 
 #: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
-msgstr "أنشيء قانون لترشيح الرّسائل من هذا المرسِل"
+msgstr "أنشئ قانون لترشيح الرّسائل من هذا المرسِل"
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
-msgstr "أنشيء قانون لترشيح الرّسائل إلى هؤلاء المرسَل إليهم"
+msgstr "أنشئ قانون لترشيح الرّسائل إلى هؤلاء المرسَل إليهم"
 
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "أنشيء قانون لترشيح الرّسائل إلى هذه القائمة البريدية"
+msgstr "أنشئ قانون لترشيح الرّسائل إلى هذه القائمة البريدية"
 
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
-msgstr "أنشيء قانون لترشيح الرّسائل التي لها هذا العنوان"
+msgstr "أنشئ قانون لترشيح الرّسائل التي لها هذا العنوان"
 
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
@@ -21477,7 +21825,7 @@ msgstr "تصَفية بناءً على ال_موضوع..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "رشح الرسائل المنتقاه بحثاً عن البريد النفاية"
+msgstr "رشح الرسائل المنتقاه بحثًا عن البريد النفاية"
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
@@ -21784,6 +22132,10 @@ msgstr "تح_جيم"
 msgid "_Zoom In"
 msgstr "ت_كبير"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "غلق"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "شريط الأدوات الرّئيسي"
@@ -21820,22 +22172,6 @@ msgstr "اعرض التذكير المنتقى"
 msgid "_Open Memo"
 msgstr "ا_فتح تذكير"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "انقر غيِّر / اعرض تفاصيل حالة المهمة"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "تفاصيل الحالة"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "منطقة زمنية"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "تفاصيل ال_حالة"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "انسخ المهام المنتقاه"
@@ -22029,50 +22365,55 @@ msgid "View/Hide the Status Bar"
 msgstr "اعرض/إخفِ شريط الحالة"
 
 #: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "اعمل دون اتّصال"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_حوْل"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "ا_غلق النّافذة"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "انس كلمات ال_سر"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
-msgstr "الأسئلة الأكثر _شيوعاً"
+msgstr "الأسئلة الأكثر _شيوعًا"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "ا_خفِ الأزرار"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "أي_قونات فقط"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "مرجع _سريع"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "إ_نهِ"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "مظهر المُ_بدّل"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "خيارات ال_مزامنة..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_نص فقط"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_نافذة"
 
@@ -22220,7 +22561,7 @@ msgstr "احفظ المشهد الحالي"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
-msgstr "انشيء مش_هد جديد"
+msgstr "أنشئ مش_هد جديد"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
@@ -22248,7 +22589,7 @@ msgstr "الم_شهد الحالي"
 #: ../widgets/menus/gal-view-menus.c:315
 #, c-format
 msgid "Select View: %s"
-msgstr "انتقِ مشهداً: %s"
+msgstr "انتقِ مشهدًا: %s"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Current view is a customized view"
@@ -22264,7 +22605,7 @@ msgstr "احفظ المشهد المخصص الحالي"
 
 #: ../widgets/menus/gal-view-menus.c:383
 msgid "Create or edit views"
-msgstr "انشيء أو حرّر مَشَاهِد"
+msgstr "أنشئ أو حرّر مَشَاهِد"
 
 #: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
@@ -22286,39 +22627,10 @@ msgstr "نوع المشهد"
 msgid "Type of view:"
 msgstr "نوع المشهد:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, fuzzy, c-format
-msgid "%.1f KB"
-msgstr "%s ك.بايت"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, fuzzy, c-format
-msgid "%.1f MB"
-msgstr "%.0fم"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, fuzzy, c-format
-msgid "%.1f GB"
-msgstr "%.0fج"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "شريط المرفقات"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "نسبة مكملة"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22328,7 +22640,7 @@ msgstr "لا يمكن إرفاق الملف %s: %s"
 #: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
-msgstr "لا يمكن إرفاق الملف %s: ليس ملفّاً اعتياديّاً"
+msgstr "لا يمكن إرفاق الملف %s: ليس ملفًّا اعتياديًّا"
 
 #: ../widgets/misc/e-attachment.glade.h:1
 msgid "Attachment Properties"
@@ -22397,16 +22709,16 @@ msgid "Y2"
 msgstr "ص2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "أدنى عرض"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "أدنى عرض"
 
@@ -22562,7 +22874,7 @@ msgstr "موسع"
 
 #: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
-msgstr "ما إن كان الموسع موسعاً أم لا"
+msgstr "ما إن كان الموسع موسعًا أم لا"
 
 #: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
@@ -22590,7 +22902,7 @@ msgstr "قطعة التسمية"
 
 #: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
-msgstr "القطعة التي سيتم عرضها عوضاً عن شارة الموسع الاعتيادية"
+msgstr "القطعة التي سيتم عرضها عوضًا عن شارة الموسع الاعتيادية"
 
 #: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
@@ -22670,7 +22982,16 @@ msgid ""
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "خريطة تفاعلية تعتمد على الماوس لتحديد المنطقة الزمنية. مستخدموا لوحة "
-"المفاتيح عليهم انتقاء المنطقة الزمنية من مربع التحرير والسرد عوضاً عن هذا."
+"المفاتيح عليهم انتقاء المنطقة الزمنية من مربع التحرير والسرد عوضًا عن هذا."
+
+#: ../widgets/misc/e-online-button.c:112
+#, fuzzy
+msgid "Online"
+msgstr "ضمن السّياق"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr ""
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22696,61 +23017,61 @@ msgstr "طراز الانسياب"
 msgid "Column width"
 msgstr "عرض العمود"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "ابحث"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "انقر هنا لتغيير نوع البحث"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "ا_بحث"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "ا_بحث الآن"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "ا_مسح"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "هوية العنصر"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "نص"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "أ_ظهر:"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "ابح_ث :"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " ف_ي"
 
-#: ../widgets/misc/e-selection-model-array.c:574
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "صف المؤشّر"
 
-#: ../widgets/misc/e-selection-model-array.c:581
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "عمود المؤشّر"
@@ -22791,13 +23112,9 @@ msgstr "<b>تعقب الحالة</b>"
 msgid "A_uto-delete sent item"
 msgstr "حذف تل_قائي للعنصر المرسل"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "تصنيف"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
-msgstr "انش_يء عنصراً مرسلاً لتتبع المعلومات"
+msgstr "انش_يء عنصرًا مرسلًا لتتبع المعلومات"
 
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
@@ -22901,14 +23218,14 @@ msgid "_When opened:"
 msgstr "_عند الفتح:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% تام)"
@@ -23117,7 +23434,7 @@ msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (عنصر واحد)"
 msgstr[1] "%s : %s (عنصرين)"
 msgstr[2] "%s : %s (%d عناصر)"
-msgstr[3] "%s : %s (%d عنصراً)"
+msgstr[3] "%s : %s (%d عنصرًا)"
 
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
@@ -23126,83 +23443,83 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (عنصر واحد)"
 msgstr[1] "%s (عنصرين)"
 msgstr[2] "%s (%d عناصر)"
-msgstr[3] "%s (%d عنصراً)"
+msgstr[3] "%s (%d عنصرًا)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "ألوان صفوف متناوبة"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "شبكة رسم أفقيّة"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "شبكة رسم عموديّة"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "تركيز الرّسم"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "نمط المؤشّر"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "نموذج الانتقاء"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "عتبة الطّول"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "ارتفاع صفوف منتظم"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "مجمّد"
 
@@ -23212,11 +23529,11 @@ msgstr "خصّص المشهد الحالي"
 
 #: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
-msgstr "رتّب ت_صاعدياً"
+msgstr "رتّب ت_صاعديًا"
 
 #: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
-msgstr "رتّب ت_نازلياً"
+msgstr "رتّب ت_نازليًا"
 
 #: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
@@ -23278,24 +23595,24 @@ msgstr "معلومات التّرتيب"
 msgid "Tree"
 msgstr "شجرة"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "ترويسة الجدول"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "طراز الجدول"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "صف المؤشر"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
-msgstr "ابحث دائماً"
+msgstr "ابحث دائمًا"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "استخدم النّقر للإضافة"
 
@@ -23415,6 +23732,110 @@ msgstr "سياق مراسِل فوري"
 msgid "Handle Popup"
 msgstr "معالجة القافزة"
 
+#~ msgid "_Contact"
+#~ msgstr "_مراسَل"
+
+#~ msgid "Contact _List"
+#~ msgstr "_قائمة مراسَلين"
+
+#~ msgid "Address _Book"
+#~ msgstr "_دفتر العناوين"
+
+#~ msgid "Mem_o"
+#~ msgstr "ت_ذكير"
+
+#~ msgid "_Shared memo"
+#~ msgstr "تذكيرات _مشاركة"
+
+#~ msgid "Memo li_st"
+#~ msgstr "قائ_مة التذكيرات"
+
+#~ msgid "Assigne_d Task"
+#~ msgstr "مهمّة _مسندة"
+
+#~ msgid "Tas_k list"
+#~ msgstr "قائمة م_هام"
+
+#~ msgid "_Save Message"
+#~ msgstr "احف_ظ الرّسالة"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "_Mail Message"
+#~ msgstr "_رسالة بريديّة"
+
+#~ msgid "Mail _Folder"
+#~ msgstr "م_جلد بريد"
+
+#, fuzzy
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
+
+#, fuzzy
+#~ msgid "A plugin that manages the Startup wizard."
+#~ msgstr "ملحق يدير مساعد بدء التشغيل."
+
+#~ msgid "Startup wizard"
+#~ msgstr "مساعد بدء التشغيل"
+
+#~ msgid "_Test"
+#~ msgstr "اخ_تبار"
+
+#, fuzzy
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "'{0}' مصدر تقويم للقرائة فقط. انتقل لمشهد التقويم ثم اختر تقويما يقبل "
+#~ "المواعيد."
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "لا يوجد خيار تشكيل لهذا الملحق."
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "وصف مَقطعي لإعدادات الطابعة الحالية."
+
+#~ msgid "No folder name specified."
+#~ msgstr "لم يحدَّد اسم مجلّد."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "لا يمكن أن يحتوي اسم المجلّد رمز الأرجاع."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' و '..' أسماء مجلّدات محجوزة."
+
+#~ msgid "All Day Event"
+#~ msgstr "حدث يستغرق يومًا بأكمله"
+
+#~ msgid "Send _Options"
+#~ msgstr "_خيارات الإرسال"
+
+#~ msgid "Status Details"
+#~ msgstr "تفاصيل الحالة"
+
+#~ msgid "Time Zone"
+#~ msgstr "منطقة زمنية"
+
+#, fuzzy
+#~ msgid "%.1f KB"
+#~ msgstr "%s ك.بايت"
+
+#, fuzzy
+#~ msgid "%.1f MB"
+#~ msgstr "%.0fم"
+
+#, fuzzy
+#~ msgid "%.1f GB"
+#~ msgstr "%.0fج"
+
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "فعّل ملحق مذكّر المرفقات"
 
@@ -23504,7 +23925,7 @@ msgstr "معالجة القافزة"
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr ""
 #~ "هل أنت متأكد أنك تريد إزالة كل الرسائل المحذوفة في المجلد &quot;{0}&quot; "
-#~ "نهائياً؟"
+#~ "نهائيًا؟"
 
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "حذف &quot;{0}&quot;؟"
@@ -23515,9 +23936,6 @@ msgstr "معالجة القافزة"
 #~ msgid "Only on _Current Folder"
 #~ msgstr "فقط في الم_جلد الحالي"
 
-#~ msgid "_Continue Editing"
-#~ msgstr "تابع الت_حرير"
-
 #~ msgid "_Refresh:"
 #~ msgstr "أ_نعِش:"
 
@@ -23563,9 +23981,6 @@ msgstr "معالجة القافزة"
 #~ msgid "Save As"
 #~ msgstr "احفظ كـ"
 
-#~ msgid "Save Draft"
-#~ msgstr "احفظ _مسودّة"
-
 #~ msgid "Save in folder..."
 #~ msgstr "احفظ في المجلّد..."
 
@@ -23603,7 +24018,7 @@ msgstr "معالجة القافزة"
 
 #, fuzzy
 #~ msgid "Select color for label..."
-#~ msgstr "ا_نتقِ تاريخاً..."
+#~ msgstr "ا_نتقِ تاريخًا..."
 
 #~ msgid "<span weight=\"bold\">Labels and Colors</span>"
 #~ msgstr "<span weight=\"bold\">التسميات و الألوان</span>"
@@ -23713,9 +24128,6 @@ msgstr "معالجة القافزة"
 #~ msgid "Mail Remote"
 #~ msgstr "بريد عن بعد"
 
-#~ msgid "_Phone List"
-#~ msgstr "قائمة ال_هاتف"
-
 #~ msgid "Emulate label resize"
 #~ msgstr "حاكِ تحجيم العنوان"
 
@@ -23750,7 +24162,7 @@ msgstr "معالجة القافزة"
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
-#~ "العنوان البريدي أو الاسم لهذا المراسَل موجود مسبقاً\n"
+#~ "العنوان البريدي أو الاسم لهذا المراسَل موجود مسبقًا\n"
 #~ "في هذا المجلّد.  هل تودّ إضافته على كل حال؟"
 
 #~ msgid "Valid signature, cannot verify sender"
@@ -23945,7 +24357,7 @@ msgstr "معالجة القافزة"
 #~ msgstr "إسألني فيما إذا كنتُ أريد إرسال وصل قراءة"
 
 #~ msgid "Never send back a read receipt"
-#~ msgstr "عدم إرسال وصل قراءة أبداً"
+#~ msgstr "عدم إرسال وصل قراءة أبدًا"
 
 #~ msgid "Read Receipts"
 #~ msgstr "إخطار بالقراءة"
@@ -23955,13 +24367,13 @@ msgstr "معالجة القافزة"
 
 #~ msgid ""
 #~ "Unless the message is sent to a mailing list, and not to me personally"
-#~ msgstr "إلّا إذا كانت هذه الرّسالة مرسلةً إلى قائمة بريديّة، و ليس لي شخصيّاً"
+#~ msgstr "إلّا إذا كانت هذه الرّسالة مرسلةً إلى قائمة بريديّة، و ليس لي شخصيًّا"
 
 #~ msgid ""
 #~ "When you receive an email with a read receipt request, what should "
 #~ "Evolution do?"
 #~ msgstr ""
-#~ "عندما تستلم بريداً إلكترونيّاً مع طلبٍ لوصل إفادةٍ بالقراءة، ما الذي يفترض "
+#~ "عندما تستلم بريدًا إلكترونيًّا مع طلبٍ لوصل إفادةٍ بالقراءة، ما الذي يفترض "
 #~ "إيفُليوشِن فعله؟"
 
 #~ msgid "The orientation of the tray."
@@ -23995,13 +24407,13 @@ msgstr "معالجة القافزة"
 #~ msgstr ""
 #~ "بعض مرشحات نتسكيب للبريد الإلكتروني الخاصة بك مبنية\n"
 #~ "على أولويات البريد، والتي لا يستخدمها إيفُليوشن.\n"
-#~ "عوضاً عن هذا، يوفر إيفُليوشن تقييمات في المدى\n"
+#~ "عوضًا عن هذا، يوفر إيفُليوشن تقييمات في المدى\n"
 #~ "بين -٣ و ٣ يمكن تعيينها لرسائل البريد الإلكتروني\n"
 #~ "وفلترتها على هذا الأساس.\n"
 #~ "\n"
 #~ "كحل بديل، تمت إضافة مجموعة من المرشحات\n"
 #~ "تسمى \"مرشح الأولوية\" لتحويل أولويات نتسكيب للبريد الإلكتروني\n"
-#~ "إلى تقييمات إيفُليوشن، وتستخدم المرشحات المعنية التقييمات بدلاً\n"
+#~ "إلى تقييمات إيفُليوشن، وتستخدم المرشحات المعنية التقييمات بدلًا\n"
 #~ "من الأولويات. افحص المرشحات المستوردة للتأكد من أن كل شئ\n"
 #~ "يعمل كما هو مفترض."
 
@@ -24026,7 +24438,7 @@ msgstr "معالجة القافزة"
 #~ "بعض مرشحات نتسكيب للبريد الإلكتروني تفحص\n"
 #~ "متن الرسائل لمقارنة جملها بجملة محددة،\n"
 #~ "وهذه الميزة لا يدعمها إيفُليوشن. تم تعديل هذه\n"
-#~ "المرشحات لفحص المتن بحثاً عن هذه الجملة\n"
+#~ "المرشحات لفحص المتن بحثًا عن هذه الجملة\n"
 #~ "والتأكد من وجودها أو عدم وجودها في المتن."
 
 #~ msgid "Evolution is importing your old Netscape data"
diff --git a/po/cs.po b/po/cs.po
index 51c53abac2..a82887a1d5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 15:51+0200\n"
-"PO-Revision-Date: 2008-06-21 15:41+0100\n"
+"POT-Creation-Date: 2008-07-27 20:54+0200\n"
+"PO-Revision-Date: 2008-07-27 20:49+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -161,7 +161,7 @@ msgid "calendar view for one or more days"
 msgstr "pohled na kalendář pro jeden nebo více dnů"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%a %d. %b %Y"
 
@@ -172,7 +172,7 @@ msgstr "%a %d. %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:761
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
@@ -181,9 +181,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d. %b %Y"
 
@@ -191,10 +191,10 @@ msgstr "%a %d. %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -204,7 +204,7 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:787
 #: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
@@ -346,9 +346,10 @@ msgstr "aktivovat"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
 "'{0}' je zdroj adresáře pouze pro čtení. Přepněte na náhled kontaktů a "
 "zvýrazněte adresář, který může kontakty přijmout."
@@ -396,10 +397,11 @@ msgid "Could not remove addressbook."
 msgstr "Nemohu odstranit adresář."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Nyní můžete z Evolution přistupovat pouze k adresáři GroupWise. Použijte "
 "prosím některého jiného poštovního klienta GroupWise k vytvoření složek "
@@ -525,8 +527,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
 #, fuzzy
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
+msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nemáte dostatečná oprávnění pro smazání této pošty."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -567,7 +568,7 @@ msgstr "Po_užít jak je"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -609,7 +610,7 @@ msgstr "Zde nastavte automatické dokončování"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -656,8 +657,9 @@ msgstr "Zde spravujte své certifikáty S/MIME"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "V tomto počítači"
 
@@ -670,15 +672,16 @@ msgstr "V tomto počítači"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Osobní"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Na serverech LDAP"
@@ -736,7 +739,7 @@ msgstr "_Zkopírovat obsah adresáře lokálně pro práci při odpojení"
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Obecné"
@@ -762,7 +765,7 @@ msgid "Details"
 msgstr "Podrobnosti"
 
 #: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Vyhledávání"
 
@@ -776,12 +779,12 @@ msgid "Address Book Properties"
 msgstr "Vlastnosti adresáře"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Převádím..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Převádím `%s':"
@@ -862,11 +865,11 @@ msgstr "Uložit jako Vcard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1588
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1346
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -1252,7 +1255,7 @@ msgstr "karty"
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "minut"
 
@@ -1358,7 +1361,7 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Pracovní"
 
@@ -1380,7 +1383,7 @@ msgid "_Birthday:"
 msgstr "Na_rozeniny:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1848
 msgid "_Calendar:"
@@ -1485,7 +1488,7 @@ msgstr "Adresa"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2503,6 +2506,7 @@ msgid "Service"
 msgstr "Služba"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:693
 #: ../plugins/save-calendar/csv-format.c:375
@@ -2810,7 +2814,7 @@ msgstr "Č_lenové"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Kniha"
 
@@ -2875,8 +2879,8 @@ msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Jakékoliv políčko obsahuje"
 
@@ -2906,7 +2910,7 @@ msgstr[2] "%d kontaktů"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Dotaz"
 
@@ -2917,7 +2921,7 @@ msgstr "Chyba při získávání zobrazení knihy"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2949,8 +2953,8 @@ msgid "Save as vCard..."
 msgstr "Uložit jako VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -3001,19 +3005,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "Př_esunout do adresáře..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
 #: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopírovat"
 
@@ -3065,7 +3068,7 @@ msgstr "Telefon do auta"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3210,11 +3213,11 @@ msgstr "WWW stránka"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Šířka"
@@ -3225,11 +3228,11 @@ msgstr "Šířka"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Výška"
@@ -3259,7 +3262,18 @@ msgstr "Maximální délka názvu pole"
 msgid "Column Width"
 msgstr "Šířka sloupce"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Hledat kontakt."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3273,7 +3287,7 @@ msgstr ""
 "\n"
 "nebo dvakrát klikněte sem k vytvoření nového kontaktu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3287,7 +3301,7 @@ msgstr ""
 "\n"
 "K vytvoření nového kontaktu dvakrát klikněte sem."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3297,7 +3311,7 @@ msgstr ""
 "\n"
 "Hledat kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3307,7 +3321,7 @@ msgstr ""
 "\n"
 "V tomto zobrazení nejsou viditelné žádné položky."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptér"
 
@@ -3337,7 +3351,7 @@ msgid "_Open Link in Browser"
 msgstr "_Otevřít odkaz v prohlížeči"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Kopírovat umístění odkazu"
 
@@ -3385,7 +3399,7 @@ msgstr "Video chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2376
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -3401,8 +3415,7 @@ msgstr "Kalendář"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Volno/obsazeno"
 
@@ -3424,12 +3437,14 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Narozeniny"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Výročí"
 
@@ -3475,7 +3490,7 @@ msgstr "Kontakt Já nedefinován"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Přístup zamítnut"
 
@@ -3497,11 +3512,11 @@ msgstr "Protokol není podporován"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Zrušeno"
 
@@ -3780,7 +3795,7 @@ msgstr "Uložit do adresáře"
 msgid "Card View"
 msgstr "Zobrazení karty"
 
-#: ../addressbook/importers/evolution-csv-importer.c:623
+#: ../addressbook/importers/evolution-csv-importer.c:658
 #: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:306
@@ -3788,27 +3803,27 @@ msgstr "Zobrazení karty"
 msgid "Importing..."
 msgstr "Importuji..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:825
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importér Outlook CSV a Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:834
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importér Mozilla CSV a Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:843
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importér Evolution CVS a Tab"
 
@@ -4103,19 +4118,17 @@ msgstr "Neobsloužená chyba"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' je zdroj kalendáře pouze pro čtení. Přepněte na náhled kalendáře a "
-"zvýrazněte kalendář, který může přijmout události."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
+#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 "'{0}' je zdroj kalendáře pouze pro čtení. Přepněte na náhled kalendáře a "
 "zvýrazněte kalendář, který může přijmout události."
@@ -4382,7 +4395,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Kalendář nebyl označen pro práci off-line."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "Tento seznam poznámek nebyl označen pro používání off-line"
 
 #: ../calendar/calendar.error.xml.h:55
@@ -4478,8 +4492,7 @@ msgstr "Vaše úkoly nebudou k dispozici, dokud nebude Evolution znovu spuštěn
 msgid "_Discard Changes"
 msgstr "Za_hodit změny"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Uložit"
 
@@ -4544,12 +4557,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Nemohu zapsat blok aplikace ToDo pilota"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Kalendář a úkoly"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Kalendáře"
 
@@ -4591,17 +4604,17 @@ msgstr "P_oznámky"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Poznámky"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
 #: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4639,7 +4652,7 @@ msgstr[2] "minut"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hodina"
@@ -4657,8 +4670,8 @@ msgstr "Události"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1002
 msgid "Location:"
@@ -4669,14 +4682,15 @@ msgid "Snooze _time:"
 msgstr "_Doba odložení:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Upravit"
 
@@ -4689,7 +4703,7 @@ msgid "location of appointment"
 msgstr "umístění události"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Souhrn není k dispozici."
 
@@ -4707,13 +4721,13 @@ msgstr "Informace o místě nejsou k dispozici."
 msgid "You have %d alarms"
 msgstr "Máte %d alarmů"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "Varování"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4725,7 +4739,7 @@ msgstr ""
 "vytvořena k poslání e-mailu. Evolution namísto toho\n"
 "zobrazí dialogové okno pro běžnou připomínku."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4742,7 +4756,7 @@ msgstr ""
 "\n"
 "Opravdu chcete spustit tento program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "Příště se neptat na tento program."
 
@@ -5297,7 +5311,7 @@ msgstr "Vyčistit události starší než"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dnů"
@@ -5306,103 +5320,103 @@ msgstr "dnů"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "Na WWW"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Narozeniny a výročí"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Počasí"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Nový kalendář"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
 #: ../mail/em-folder-tree.c:2090
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
 #: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Nemohu aktualizovat kalendáře."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nemohu otevřít kalendář '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Není k dispozici kalendář pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Výběr zdroje kalendáře"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nová událost"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_Událost"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Vytvořit novou událost"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nová schůzka"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "_Schůzka"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Vytvořit požadavek na novou schůzku"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nová celodenní událost"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "_Celodenní událost"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Vytvořit novou celodenní událost"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Nový kalendář"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "_Kalendář"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Vytvořit nový kalendář"
 
@@ -5423,15 +5437,235 @@ msgid "Month View"
 msgstr "Zobrazení měsíce"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+msgid "Any Field"
+msgstr "Pole"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Přílohy"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Účastník"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "Fax - práce"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Category"
+msgstr "Kategorie je"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Klasifikace"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "Datum dokončení"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Důvěrné"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Popis"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Popis obsahuje"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Neexistují"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existují"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+#, fuzzy
+msgid "Favourites"
+msgstr "Mauricius"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+#, fuzzy
+msgid "Holiday"
+msgstr "Dnes"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+#, fuzzy
+msgid "Hot Contacts"
+msgstr "Kontakty"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+#, fuzzy
+msgid "Ideas"
+msgstr "dnů"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+#, fuzzy
+msgid "International"
+msgstr "tradiční"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "Přizpůsobit"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "Různé"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+#, fuzzy
+msgid "Next 7 days"
+msgstr "Úkoly v příštích 7 dnech"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organizátor"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "Telefon"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Soukromé"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Veřejné"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Opakování"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Stav"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+#, fuzzy
+msgid "Strategies"
+msgstr "Kategorie"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Přehled"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Přehled obsahuje"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "Odpovědi"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+#, fuzzy
+msgid "Waiting"
+msgstr "Čekám..."
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "obsahuje"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "neobsahuje"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "je"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "není"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Chyba při otevírání kalendáře"
@@ -5448,7 +5682,7 @@ msgstr "Přístup zamítnut při otevírání kalendáře"
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Upravit alarm"
 
@@ -5552,6 +5786,7 @@ msgid "hour(s)"
 msgstr "hodin"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "minut"
 
@@ -5570,12 +5805,11 @@ msgstr "_Přidat"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmy"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
-#: ../composer/e-composer-actions.c:63
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Navrhnout automatické zobrazovaní příloh"
 
@@ -5648,7 +5882,7 @@ msgid "Display"
 msgstr "Zobrazení"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "pátek"
@@ -5664,7 +5898,7 @@ msgstr ""
 "Dny"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "pondělí"
@@ -5698,7 +5932,7 @@ msgid "S_un"
 msgstr "_ned"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "sobota"
@@ -5716,7 +5950,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Zobrazovat čísla _týdnů v měsíčním přehledu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "neděle"
@@ -5735,7 +5969,7 @@ msgid "Template:"
 msgstr "Šablona:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "čtvrtek"
@@ -5750,13 +5984,13 @@ msgid "Time format:"
 msgstr "Formát času:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "úterý"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "středa"
@@ -5930,39 +6164,39 @@ msgstr "%s Provedli jste změny. Opominout tyto změny a aktualizovat editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Neprovedli jste změny, aktualizovat editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Chyba ověření: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (Dokončený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Dokončený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (Termín dokončení "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Termín dokončení "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Připojená zpráva - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1772
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
 #: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
@@ -5971,29 +6205,217 @@ msgstr[0] "Připojená zpráva"
 msgstr[1] "%d připojené zprávy"
 msgstr[2] "%d připojených zpráv"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2059
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
 #: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2046
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Přesunout"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Zrušit _tažení"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "příloha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Nemohu aktualizovat objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Upravit událost"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Schůzka - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Událost - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Přidělený úkol - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Úkol - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Poznámka - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+#, fuzzy
+msgid "No Summary"
+msgstr "Není shrnutí"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Kliknutím zde uzavřete aktuální okno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Kopírovat vybraný text do schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Vyjmout vybraný text do schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Kliknutím zde zobrazíte dostupnou nápovědu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Vložit text ze schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Kliknutím sem uložíte aktuální okno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Vybrat všechen text"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "Klasi_fikace"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_Soubor"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "Nápo_věda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+#, fuzzy
+msgid "_Insert"
+msgstr "_Vložit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "V_olby"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2082
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "_Zobrazit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Přílohu..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Kliknutím zde vyberete soubor pro přílohu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Kategorie"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Přepne zobrazení kategorií"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Časové pás_mo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Přepne zobrazení pole pro časovou zónu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Veř_ejné"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Zařadit mezi veřejné"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "Soukro_mé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+#, fuzzy
+msgid "Classify as private"
+msgstr "Zařadit mezi soukromé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Důvěrné"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "Zařadit mezi důvěrné"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "S_loupce Funkce"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Přepne zobrazení pole pro funkce"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Přepne zobrazení pole RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Sloupe_c Stav"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Přepne zobrazení pole stavu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Sloupec T_yp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Přepne zobrazení pole účastníka"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent Docu_ments"
+msgstr "Dokončeno procent"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Příloha"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6001,87 +6423,47 @@ msgstr[0] "<b>%d</b> příloha"
 msgstr[1] "<b>%d</b> přílohy"
 msgstr[2] "<b>%d</b> příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Skrýt lištu _příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "_Zobrazit lištu příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Přidat přílohu..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Zobrazit přílohy"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Přepne lištu příloh stisknutím klávesy mezery"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Upravit událost"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Schůzka - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Událost - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Přidělený úkol - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Úkol - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Poznámka - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Není shrnutí"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Změny provedené v této položce mohou být ztraceny, pokud dorazí aktualizace"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Nemohu používat aktuální verzi!"
 
@@ -6163,96 +6545,143 @@ msgstr "Postoupit komu:"
 msgid "Enter Delegate"
 msgstr "Zapsat postoupení"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alarmy"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Kliknutím sem nastavíte nebo zrušíte alarmy pro tuto událost"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "Opaková_ní"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Vytvoří opakující se událost"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Možnosti odesílání"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Vložit pokročilé možnosti odesílání"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Celo_denní událost"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Přepne událost na celodenní"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "Zobrazovat čas jako _obsazený"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Přepne čas jako obsazený"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "V_olno/obsazeno"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Informace o volném/obsazeném čase pro tuto schůzku"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Událost"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Opakování"
-
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Tato událost má nastaveny alarmy"
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "_Organizátor:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegáti"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "Úča_stníci"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Událost bez počátečního data"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Událost bez konečného data"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Počáteční datum je chybné"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Konečné datum je chybné"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Počáteční čas je chybný"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Konečný čas je chybný"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizátor už nemá účet."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Je požadován organizátor."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Je požadován alespoň jeden účastník."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "Př_idat "
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nemohu otevřít kalendář '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Jednáte v zastoupení %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6260,7 +6689,7 @@ msgstr[0] "%d den před událostí"
 msgstr[1] "%d dny před událostí"
 msgstr[2] "%d dnů před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6268,7 +6697,7 @@ msgstr[0] "%d hodinu před událostí"
 msgstr[1] "%d hodiny před událostí"
 msgstr[2] "%d hodin před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6276,22 +6705,22 @@ msgstr[0] "%d minutu před událostí"
 msgstr[1] "%d minuty před událostí"
 msgstr[2] "%d minut před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Přizpůsobit"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:939
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6366,25 +6795,21 @@ msgstr "_Změnit organizátora"
 msgid "Co_ntacts..."
 msgstr "Ko_ntakty..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organizátor"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Poznámka"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nemohu otevřít poznámky v '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
@@ -6405,7 +6830,7 @@ msgid "_Description:"
 msgstr "_Popis:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Skupina:"
@@ -6446,18 +6871,18 @@ msgstr "Tuto a budoucí instance"
 msgid "All Instances"
 msgstr "Všechny instance"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tato událost obsahuje taková opakování, která Evolution nemůže editovat."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Datum opakování je neplatné"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "zapnuto"
 
@@ -6465,7 +6890,7 @@ msgstr "zapnuto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "1."
 
@@ -6474,7 +6899,7 @@ msgstr "1."
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "2."
 
@@ -6482,7 +6907,7 @@ msgstr "2."
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "3."
 
@@ -6490,7 +6915,7 @@ msgstr "3."
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "4."
 
@@ -6498,13 +6923,13 @@ msgstr "4."
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "poslední"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Další data"
 
@@ -6512,7 +6937,7 @@ msgstr "Další data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1. až 10."
 
@@ -6520,7 +6945,7 @@ msgstr "1. až 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11. až 20."
 
@@ -6528,45 +6953,45 @@ msgstr "11. až 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21. až 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "den"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "_"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "opakování"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Přidat výjimku"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Nemohu získat výběr k modifikaci."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Změnit výjimku"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Nemohu získat výběr k vymazání."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/čas"
 
@@ -6617,12 +7042,12 @@ msgstr "týdnů"
 msgid "year(s)"
 msgstr "let"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Čas dokončení je chybný"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "WWW stránka"
 
@@ -6637,51 +7062,55 @@ msgstr "<span weight=\"bold\">Stav</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:252
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Dokončeno"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Vysoká"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "Probíhá"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1061
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Nízká"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normální"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Nezačato"
 
@@ -6694,7 +7123,7 @@ msgid "Stat_us:"
 msgstr "_Stav:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Nedefinováno"
 
@@ -6711,25 +7140,39 @@ msgstr "_Naléhavost:"
 msgid "_Web Page:"
 msgstr "_WWW stránka:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Podrobno_sti o úkolu"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "Kliknutím změníte / zobrazíte stav úkolu"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Možno_sti odesílání"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "Ú_kol"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Podrobnosti úkolů"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zátor:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Datum splnění je chybné"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nemohu otevřít úkoly v '%s'."
@@ -6832,75 +7275,59 @@ msgstr "%s při %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pro neznámý typ spouštění"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím sem otevřete %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:852
-#: ../shell/e-shell-folder-title-bar.c:586
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Datum začátku:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
 #: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "WWW stránka:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:210
 #: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Shrnutí"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Termín dokončení:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Naléhavost:"
 
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Veřejné"
-
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Soukromé"
-
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Důvěrné"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Konečné datum"
@@ -6910,20 +7337,13 @@ msgstr "Konečné datum"
 msgid "Start Date"
 msgstr "Začátek"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Summary"
-msgstr "Přehled"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "Free"
 msgstr "Volný"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:612
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Obsazený"
@@ -6963,9 +7383,9 @@ msgstr "Ne"
 #: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
 #: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
+#: ../plugins/itip-formatter/itip-formatter.c:2047
 #: ../plugins/plugin-manager/plugin-manager.c:73
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Neznámá"
@@ -6991,9 +7411,9 @@ msgstr "Zvolte adresář pro uložení vybraných příloh..."
 msgid "untitled_image.%s"
 msgstr "nepojmenovany_obrazek.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "_Uložit jako..."
 
@@ -7011,126 +7431,155 @@ msgstr "_Uložit vybrané"
 msgid "Open in %s..."
 msgstr "Otevřít v %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:330
+#, fuzzy
+msgid "* No Summary *"
+msgstr "Není shrnutí"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizátor: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizátor: %s"
+
+#: ../calendar/gui/e-calendar-table.c:400
+#, fuzzy
+msgid "Start: "
+msgstr "Začátek"
+
+#: ../calendar/gui/e-calendar-table.c:412
+#, fuzzy
+msgid "Due: "
+msgstr "Termín dokončení "
+
+#: ../calendar/gui/e-calendar-table.c:581
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:583
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:584
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:585
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:586
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:587
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:871
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Odstraňuji vybrané objekty"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1155
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Aktualizuji objekty"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1340
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Uložit jako..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1563
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Nový ú_kol"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Otevřít _WWW stránku"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1569
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Tisknout..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1573
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Vyjmout"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1575
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Př_edat úkol"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Odeslat jako iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1581
 msgid "_Mark as Complete"
 msgstr "Označit jako _dokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1582
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Označit _vybrané úkoly jako dokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1583
 msgid "_Mark as Incomplete"
 msgstr "Označit jako _nedokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1584
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Označit _vybrané úkoly jako nedokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Delete Selected Tasks"
 msgstr "_Odstranit vybrané úkoly"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1826
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Úkol přidáte kliknutím zde"
@@ -7153,6 +7602,7 @@ msgid "Due date"
 msgstr "Termín dokončení"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Naléhavost"
@@ -7161,13 +7611,6 @@ msgstr "Naléhavost"
 msgid "Start date"
 msgstr "Začátek"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Stav"
-
 #: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Přesunuji položky"
@@ -7229,7 +7672,7 @@ msgstr "_Odeslat jako iCalendar..."
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7247,26 +7690,14 @@ msgstr "Odstranit tento vý_skyt"
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _všechny výskyty"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizátor: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizátor: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Místo: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Datum: %s %s"
@@ -7442,12 +7873,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Akceptováno"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Předběžně akceptováno"
 
@@ -7455,7 +7886,7 @@ msgstr "Předběžně akceptováno"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Zamítnuto"
 
@@ -7832,7 +8263,7 @@ msgstr "Předběžné"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegováno"
 
@@ -7937,10 +8368,6 @@ msgstr "_Začátek:"
 msgid "_End time:"
 msgstr "_Konec:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Účastník"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Účastníka přidáte kliknutím zde"
@@ -8174,11 +8601,11 @@ msgstr "Informace iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Musíte být účastníkem události."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Nový seznam poznámek"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8186,7 +8613,7 @@ msgstr[0] "%d poznámka"
 msgstr[1] "%d poznámky"
 msgstr[2] "%d poznámek"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8194,56 +8621,56 @@ msgstr[0] ", %d vybráno"
 msgstr[1] ", %d vybrány"
 msgstr[2] ", %d vybráno"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Nemohu aktualizovat poznámky."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Nemohu otevřít seznam poznámek '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Není k dispozici kalendář pro tvorbu poznámek"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Výběr zdroje poznámky"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nová poznámka"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Mem_o"
 msgstr "_Poznámka"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Vytvořit novou poznámku"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nová sdílená poznámka"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "_Shared memo"
 msgstr "_Sdílená poznámka"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Vytvořit novou sdílenou poznámku"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nový seznam poznámek"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Memo li_st"
 msgstr "Sez_nam poznámek"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Vytvořit nový seznam poznámek"
 
@@ -8251,6 +8678,11 @@ msgstr "Vytvořit nový seznam poznámek"
 msgid "Print Memos"
 msgstr "Tisknout poznámky"
 
+#: ../calendar/gui/memotypes.xml.h:25
+#, fuzzy
+msgid "Next 7 Days'"
+msgstr "Úkoly v příštích 7 dnech"
+
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8503,11 +8935,11 @@ msgstr "Kontakty: "
 msgid "Upcoming Appointments"
 msgstr "Nadcházející události"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Nový seznam úkolů"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8515,52 +8947,52 @@ msgstr[0] "%d úkol"
 msgstr[1] "%d úkoly"
 msgstr[2] "%d úkolů"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "Nemohu aktualizovat úkoly."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Nemohu otevřít seznam úkolů '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Není k dispozici kalendář pro tvorbu úkolů"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Výběr zdroje úkolu"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nový úkol"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Vytvořit nový úkol"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nový přidělený úkol"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Assigne_d Task"
 msgstr "_Přidělený úkol"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Vytvořit nový přidělený úkol"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nový seznam úkolů"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Tas_k list"
 msgstr "Seznam ú_kolů"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Vytvořit nový seznam úkolů"
 
@@ -8576,7 +9008,7 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto úkoly?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Příště se neptat."
 
@@ -8584,6 +9016,29 @@ msgstr "Příště se neptat."
 msgid "Print Tasks"
 msgstr "Tisknout úkoly"
 
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "% hotovo"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+#, fuzzy
+msgid "Cancelled"
+msgstr "Zrušeno"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+#, fuzzy
+msgid "In progress"
+msgstr "Probíhá"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "je více než"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "je méně než"
+
 #: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Události a schůzky"
@@ -10161,204 +10616,202 @@ msgstr "Nemohu otevřít soubor"
 msgid "Unable to retrieve message from editor"
 msgstr "Nemohu získat z editoru"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Vložit přílohu"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "_Přiložit"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "Nepojmenovaná zpráva"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Přílohu..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Připojit soubor"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "Uzavřít aktuální soubor"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1343
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Tisknout..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Náhled před tiskem"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "Uložit aktuální soubor"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "Uložit _jako..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "Uložit aktuální soubor pod jiným jménem"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "Uložit _koncept"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "Uložit jako koncept"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "P_oslat"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "Poslat tuto zprávu"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Možno_sti odesílání"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Vložit možnosti odesílání"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+#, fuzzy
+msgid "New _Message"
+msgstr "_Zpráva"
+
+#: ../composer/e-composer-actions.c:537
+#, fuzzy
+msgid "Open New Message window"
+msgstr "_Odeslat novou zprávu..."
+
+#: ../composer/e-composer-actions.c:544
 #, fuzzy
 msgid "Character _Encoding"
 msgstr "Kódování znaků"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "_Zabezpečení"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "Ši_frování PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "Zašifrovat tuto zprávu pomocí PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "Pod_pis PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "Podepsat tuto zprávu vaším klíčem PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "_Důležitost zprávy"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "Nastavit vysokou prioritu zprávy"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:585
 #, fuzzy
 msgid "Re_quest Read Receipt"
 msgstr "Žáda_t o doručenku o čtení"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
 msgstr "Doručit oznámení, že vaše zpráva byla přečtena"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "Šif_rování S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Zašifrovat tuto zprávu vaším šifrovacím certifikátem S/MIME"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "Po_dpis S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podepsat tuto zprávu podpisovým certifikátem S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "_Skrytá kopie:"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Přepne zobrazení pole BCC"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "_Kopie"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
 msgstr "Přepne zobrazení pole CC"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "_Od:"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Přepne zobrazení pole pro výběr odesílatele"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "_Poslat-komu"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Přepne zobrazení pole Poslat-komu"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "Odpovědět-_komu:"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Přepne zobrazení pole Odpověď-kam"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 #, fuzzy
 msgid "_Subject Field"
 msgstr "_Kopie"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 #, fuzzy
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Přepne zobrazení pole stavu"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "_Komu"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
 msgstr "Přepne zobrazení pole Komu"
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Příloha"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Vyplnit příjemce zprávy"
@@ -10624,7 +11077,7 @@ msgstr "_Uložit zprávu"
 msgid "Evolution Mail and Calendar"
 msgstr "Pošta a Kalendář Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Sada groupware"
 
@@ -10683,15 +11136,15 @@ msgstr "Povoleno"
 msgid "Whether the plugin is enabled"
 msgstr "Jestli je rozbalovač rozbalen"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Během tisku se vyskytla chyba"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "Tiskový systém nahlásil následující detaily o chybě:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Tiskový systém nenahlásil žádné další detaily o chybě."
@@ -10924,56 +11377,56 @@ msgstr "Vybrat soubor"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:847
+#: ../filter/filter-rule.c:851
 msgid "R_ule name:"
 msgstr "Ná_zev pravidla:"
 
-#: ../filter/filter-rule.c:875
+#: ../filter/filter-rule.c:879
 msgid "Find items that meet the following criteria"
 msgstr "Hledat položky s následujícími kritérii"
 
-#: ../filter/filter-rule.c:909
+#: ../filter/filter-rule.c:913
 msgid "A_dd Filter Criteria"
 msgstr "_Přidat pravidlo filtru"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:919
 msgid "If all criteria are met"
 msgstr "Pokud souhlasí všechna kritéria"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:919
 msgid "If any criteria are met"
 msgstr "Pokud souhlasí některá kritéria"
 
-#: ../filter/filter-rule.c:917
+#: ../filter/filter-rule.c:921
 msgid "_Find items:"
 msgstr "_Najít položky:"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:943
 msgid "All related"
 msgstr "Vše související"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:943
 msgid "Replies"
 msgstr "Odpovědi"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:943
 msgid "Replies and parents"
 msgstr "Odpovědi a rodiče"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:943
 msgid "No reply or parent"
 msgstr "Bez odpovědi nebo rodič"
 
-#: ../filter/filter-rule.c:941
+#: ../filter/filter-rule.c:945
 msgid "I_nclude threads"
 msgstr "Z_ahrnout vlákna"
 
-#: ../filter/filter-rule.c:1039 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Příchozí"
 
-#: ../filter/filter-rule.c:1039 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Odchozí"
 
@@ -11087,7 +11540,7 @@ msgstr "s časem, který určíte"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "týdnů"
 
@@ -11158,10 +11611,10 @@ msgstr "Ovládací prvek nastavení pošty Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Ovládací prvek nastavení kalendáře Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
@@ -11294,18 +11747,18 @@ msgstr "Přidat skript podpisu"
 msgid "Signature(s)"
 msgstr "Podpisy"
 
-#: ../mail/em-composer-utils.c:1008 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Přeposlaná zpráva --------"
 
-#: ../mail/em-composer-utils.c:1820
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "neznámý odesílatel"
 
 #. 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:1867
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11313,7 +11766,7 @@ msgstr ""
 "${Sender} píše v ${AbbrevWeekdayName} ${Day}. ${Month}. ${Year} v ${24Hour}:"
 "${Minute} ${TimeZone}:"
 
-#: ../mail/em-composer-utils.c:2010
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Původní zpráva --------"
 
@@ -11334,10 +11787,6 @@ msgstr "Přiřadit barvu"
 msgid "Assign Score"
 msgstr "Přiřadit skóre"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Přílohy"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Skrytá kopie"
@@ -11354,10 +11803,6 @@ msgstr "Kopie"
 msgid "Completed On"
 msgstr "Dokončeno"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "obsahuje"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopírovat do složky"
@@ -11382,10 +11827,6 @@ msgstr "Odstranit"
 msgid "Deleted"
 msgstr "Odstraněno"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "neobsahuje"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "nekončí na"
@@ -11406,10 +11847,6 @@ msgstr "nezní jako"
 msgid "does not start with"
 msgstr "nezačíná na"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Neexistují"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Koncept"
@@ -11418,10 +11855,6 @@ msgstr "Koncept"
 msgid "ends with"
 msgstr "končí na"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existují"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existuje"
@@ -11434,14 +11867,10 @@ msgstr "Výraz"
 msgid "Follow Up"
 msgstr "K vyřízení"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Důležité"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "je"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "je po"
@@ -11454,18 +11883,6 @@ msgstr "je před"
 msgid "is Flagged"
 msgstr "je označený"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "je více než"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "je méně než"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "není"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "není označený"
@@ -11662,11 +12079,11 @@ msgstr "Důležité zprávy"
 msgid "Messages Not Junk"
 msgstr "Zprávy nejsou nevyžádané"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Vyhledávání účtu"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Vyhledávání všech účtů"
 
@@ -11778,12 +12195,12 @@ msgstr "Přesouvám složku %s"
 msgid "Copying folder %s"
 msgstr "Kopíruji složku %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Přesouvám zprávy do složky %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopíruji zprávy do složky %s"
@@ -11805,13 +12222,6 @@ msgstr "_Přesunout do složky"
 msgid "Scanning folders in \"%s\""
 msgstr "Procházím složky v \"%s\""
 
-#: ../mail/em-folder-tree.c:2082 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Zobrazit"
-
 #: ../mail/em-folder-tree.c:2083
 msgid "Open in _New Window"
 msgstr "Otevřít v _novém okně"
@@ -11846,13 +12256,13 @@ msgstr "Vyprázdnit _koš"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopíruji `%s' do `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Vyberte složku"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "_Kopírovat"
 
@@ -11874,168 +12284,168 @@ msgstr "Vytvořit složku"
 msgid "Specify where to create the folder:"
 msgstr "Upřesněte, kde chcete vytvořit složku:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Selhalo mazání pošty"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemáte dostatečná oprávnění pro smazání této pošty."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_Odpovědět odesílateli"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Přeposlat"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Upravit jako novou zprávu..."
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "Obnovit _odstraněné"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "Pře_sunout do složky..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "_Kopírovat do složky..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Označit jako _přečtené"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Označit jako _nepřečtené"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Označit jako _důležité"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Označit jako nedůlež_ité"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Označit jako _nevyžádaná"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Označit že není _nevyžádaná"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Označit k _vyřízení..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "Š_títek"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "Žá_dný"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "_Nový štítek"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Označit jako _dokončeno"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "Zrušit _značku"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Vy_tvořit pravidlo ze zprávy"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Složka hledání podle _předmětu"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Složka hledání podle _odesílatele"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Složka hledání podle příje_mců"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Složka hledání podle poštovní _konference"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filtr podle _předmětu"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filtr podle _odesílatele"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filtr podle příje_mců"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filtr podle poštovní _konference"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "Implicitní"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Nemohu získat zprávu"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Získávám zprávu..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "_Volat..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Vytvořit složku _hledání"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Z této adresy"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_Na tuto adresu"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím sem pošlete e-mail %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknutím zavoláte %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Skrýt/odkrýt adresy"
 
@@ -12322,7 +12732,7 @@ msgid "Bcc"
 msgstr "Skrytá kopie"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Program elektronické pošty"
@@ -12371,43 +12781,43 @@ msgstr "Diskusní skupiny"
 msgid "%s attachment"
 msgstr "%s příloha"
 
-#: ../mail/em-format.c:1197
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nemohu zpracovat zprávu S/MIME: Neznámá chyba"
 
-#: ../mail/em-format.c:1334 ../mail/em-format.c:1490
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nemohu zpracovat zprávu MIME. Zobrazím ji jako zdrojový kód."
 
-#: ../mail/em-format.c:1342
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodporovaný typ šifrování pro multipart/encrypted"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message"
 msgstr "Nemohu zpracovat zprávu PGP/MIME"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Nemohu zpracovat zprávu PGP/MIME: Neznámá chyba"
 
-#: ../mail/em-format.c:1509
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "Nepodporovaný formát podpisu"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "Chyba při ověřování podpisu"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1579 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "Neznámá chyba při ověřování podpisu"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message"
 msgstr "Nemohu zpracovat zprávu PGP"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Nemohu zpracovat zprávu PGP: Neznámá chyba"
 
@@ -12471,68 +12881,86 @@ msgid "No Junk plugin available"
 msgstr "Žádný zásuvný modul pro nevyžádanou poštu není dostupný"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Udělat"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Později"
 
-#: ../mail/em-migrate.c:1210
-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 ""
-"Umístění a hierarchie složek poštovních schránek Evolution se od Evolution 1."
-"x změnilo.\n"
-"\n"
-"Počkejte prosím, než Evolution převede vaše složky..."
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "Převádím `%s':"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nemohu vytvořit novou složku `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Nemohu kopírovat složku `%s' do `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nemohu hledat existující poštovní schránky v `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+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 ""
+"Umístění a hierarchie složek poštovních schránek Evolution se od Evolution 1."
+"x změnilo.\n"
+"\n"
+"Počkejte prosím, než Evolution převede vaše složky..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nemohu se otevřít stará data o ponechávání na serveru POP `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nemohu vytvořit adresář dat o ponechávání na serveru POP3 `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nemohu zkopírovat data POP3 ponechávaná na serveru `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nemohu vytvořit místní úložiště pošty `%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Umístění a hierarchie složek poštovních schránek Evolution se od Evolution 1."
+"x změnilo.\n"
+"\n"
+"Počkejte prosím, než Evolution převede vaše složky..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Nemohu vytvořit místní složky pošty v `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13557,7 +13985,14 @@ msgstr "%s konferencí"
 msgid "Add Filter Rule"
 msgstr "Přidat pravidlo filtru"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Šablona:"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13565,7 +14000,7 @@ msgstr[0] "%d vybráno, "
 msgstr[1] "%d vybrány, "
 msgstr[2] "%d vybráno, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13573,7 +14008,7 @@ msgstr[0] "%d odstraněna"
 msgstr[1] "%d odstraněny"
 msgstr[2] "%d odstraněno"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13581,7 +14016,7 @@ msgstr[0] "%d nevyžádaná pošta"
 msgstr[1] "%d nevyžádaný pošty"
 msgstr[2] "%d nevyžádaných pošt"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13589,7 +14024,7 @@ msgstr[0] "%d koncept"
 msgstr[1] "%d koncepty"
 msgstr[2] "%d konceptů"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13597,7 +14032,7 @@ msgstr[0] "%d odeslána"
 msgstr[1] "%d odeslány"
 msgstr[2] "%d odesláno"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13605,7 +14040,7 @@ msgstr[0] "%d neodeslána"
 msgstr[1] "%d neodeslány"
 msgstr[2] "%d neodesláno"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13613,7 +14048,7 @@ msgstr[0] "%d nepřečtena, "
 msgstr[1] "%d nepřečteny, "
 msgstr[2] "%d nepřečteno, "
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13621,87 +14056,87 @@ msgstr[0] "%d celkem"
 msgstr[1] "%d celkem"
 msgstr[2] "%d celkem"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "Nová zpráva"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "_Zpráva"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "Napsat novou zprávu"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "Nová složka pošty"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "_Složka pošty"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "Vytvořit novou složku pošty"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nemohu aktualizovat nastavení nebo složky pošty."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "Chyba"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "Chyby"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "Varování a chyby"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "Ladění"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "Chybé, varující a ladicí zprávy"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "Ladicí protokol"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "_Zobrazit chyby ve stavovém řádku"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1743
 #, fuzzy
 msgid "second(s)."
 msgstr "sekundách."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "Zprávy protokolu:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "Úroveň protokolování"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Čas"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2388
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Zavřít toto okno"
@@ -14291,7 +14726,7 @@ msgid "Use Authe_ntication"
 msgstr "Autentizace"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "_Jméno uživatele:"
 
@@ -14778,11 +15213,6 @@ msgstr "Uživatel zrušil operaci."
 msgid "_Save and Close"
 msgstr "Uložit a zavřít"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Soubor"
-
 #: ../mail/mail-signature-editor.c:355
 #, fuzzy
 msgid "Edit Signature"
@@ -15486,85 +15916,86 @@ msgstr "_Vyčistit"
 msgid "_Open Messages"
 msgstr "_Otevřít zprávy"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Nepřečtené"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Přečtené"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Odpovězené"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 #, fuzzy
 msgid "Forwarded"
 msgstr "Přeposlat"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Více nepřečtených zpráv"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Více zpráv"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Nižší"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Vyšší"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Nejvyšší"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Dnes %k:%M"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %k:%M"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3843
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Generuji seznam zpráv"
 
-#: ../mail/message-list.c:4129
+#: ../mail/message-list.c:4176
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4131
+#: ../mail/message-list.c:4178
 #, fuzzy
 msgid "There are no messages in this folder."
 msgstr ""
@@ -15686,6 +16117,7 @@ msgstr ""
 "těle zprávy."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Klíčová slova"
 
@@ -15771,102 +16203,106 @@ msgstr "Zvolte, který archiv Evolution obnovit:"
 msgid "Choose a file to restore"
 msgstr "Vybrat, který soubor obnovit"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Zazálohovat adresář Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Obnovit adresář Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Zkontrolovat zálohu Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Restartovat Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "s grafickým uživatelským rozhraním"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Ukončuji Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Zálohování účtů a nastavení Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Zálohování dat Evolutionu (pošta, kontakty, kalendář, úlohy, poznámky)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Zálohování dokončeno"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Restartování Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Zazálohovat aktuální data Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Rozbalování souborů ze zálohy"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Načítání nastavení Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Odstraňuji dočasné soubory zálohy"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Zálohování do složky %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Obnova ze složky %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Zálohování Evolution"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Obnova Evolution"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:494
 #, fuzzy
 msgid "Backing up Evolution Data"
 msgstr "Zazálohovat aktuální data Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:309
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:311
+#: ../plugins/backup-restore/backup.c:497
 #, fuzzy
 msgid "Restoring Evolution Data"
 msgstr "Restartování Evolution"
 
-#: ../plugins/backup-restore/backup.c:312
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:330
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
@@ -16054,7 +16490,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "Použít _SSL"
 
@@ -16076,7 +16512,7 @@ msgstr "Poskytuje základní funkce místních kalendářů."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:381
 #, fuzzy
 msgid "Re_fresh:"
 msgstr "_Obnovit"
@@ -16220,11 +16656,28 @@ msgid ""
 "default one."
 msgstr "Poskytuje funkce pro označení kalendáře nebo adresáře jako implicitní."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 #, fuzzy
 msgid "_Custom Header"
 msgstr "Vlastní hlavičky"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+#, fuzzy
+msgid "Key"
+msgstr "Keňa"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 #, fuzzy
 msgid "Email Custom Header"
@@ -16605,7 +17058,7 @@ msgstr "Velikost složky"
 msgid "User"
 msgstr "_Uživatel"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Přihlásit se ke složce jiného uživatele"
@@ -16936,10 +17389,14 @@ msgid "Could not update out-of-office state"
 msgstr "Nemohu aktualizovat stav \"mimo kancelář\""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Účet Exchange je off-line."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16966,105 +17423,105 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Nemohu aktualizovat delegáty:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Složka již existuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Složka neexistuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Složka je off-line"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Obecná chyba"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Server Global Catalog není dostupný"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 "Pokud OWA běží na jiné cestě, musíte ji zadat v dialogu nastavení účtu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "Poštovní schránka pro {0} není na tomto serveru."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Zkontrolujte, že je URL správné, a zkuste to znovu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Zkontrolute, že název serveru je zadán správně, a zkuste to znovu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Zkontrolute, že jméno uživatele a heslo jsou správné, a zkuste to znovu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Pro tento účet není nastaven server Global Catalog."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Pro uživatele {0} není na {1} poštovní schránka."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Uživatel {0} neexistuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Heslo úspěšně změněno."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Prosím vložte delegátovo ID a zrušte výběr volby Odeslat jako zplnomocnění."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Prosím ujistěte se, že název serveru Global Catalog je správný."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Aby se změny projevily, prosím restartujte Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Vyberte prosím uživatele."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Server odmítl heslo, protože je příliš slabé."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Účet Exchange bude zakázán, až ukončíte Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Účet Exchange bude odstraněn, až ukončíte Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Server Exchange není kompatibilní s Exchange Connectorem."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17072,7 +17529,7 @@ msgstr ""
 "Na serveru běží Exchange 5.5. Exchange Connector \n"
 "podporující jen Microsoft Exchange 2000 a 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17086,58 +17543,58 @@ msgstr ""
 "\n"
 "Nebo jste prostě zadali špatné heslo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Zkuste to znovu s jiným heslem."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Nemohu přidat uživatele do seznamu řízení přístupu:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Nemohu upravit delegáty."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Neznámá chyba při vyhledávání {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Neznámý typ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operace."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Blížíte se své kvótě pro ukládání pošty na tomto serveru."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr ""
 "Je vám umožněno posílat zprávy pouze jménem jednoho delegujícího zároveň."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Nemůžete se učinit svým vlastním delegátem"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Překročili jste svou kvótu pro ukládání pošty na tomto serveru."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Můžete nastavit jen jeden účet Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17145,14 +17602,14 @@ msgstr ""
 "Momentálně používáte: {0} KB. Zkuste uvolnit trochu místa odstraněním nějaké "
 "pošty."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "Momentálně používáte: {0} KB. Teď nebudete moci odesílat ani přijímat poštu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17160,19 +17617,19 @@ msgstr ""
 "Momentálně používáte: {0} KB. Teď nebudete moci odesílat poštu, dokud "
 "neuvolníte trochu místa odstraněním nějaké pošty."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Platnost vašeho hesla vypršela."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} nelze přidat do seznamu řízení přístupu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} již je delegát"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} již je na seznamu"
 
@@ -17288,13 +17745,32 @@ msgstr "Odhlásit složky"
 msgid "_Unsubscribe"
 msgstr "_Odhlásit se"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>Členové:</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+#, fuzzy
+msgid "Username:"
+msgstr "_Jméno uživatele:"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+#, fuzzy
+msgid "Update every"
+msgstr "Aktualizuji dotaz"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "Zásuvný modul pro nastavení Google Calendar."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17403,12 +17879,6 @@ msgstr "Stáhnout poštu zpět"
 msgid "Add Send Options to groupwise messages"
 msgstr "Přidat možnosti odesílání ke zprávám groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Možnosti odesílání"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Zásuvný modul pro funkce účtů GroupWise."
@@ -17992,31 +18462,31 @@ msgstr ""
 "Pro zpracování všech těchto položek by měl být soubor uložen a kalendář "
 "importován"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Tato schůzka se opakuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Tento úkol se opakuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Tato poznámka se opakuje"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Odstranit zprávu po zpracování"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Hledání konfliktů"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Zvolte kalendáře, ve kterých hledat konflikty se schůzkou"
 
@@ -18595,12 +19065,22 @@ msgstr "Zda má ikona blikat či ne."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Zdali upozornit pouze na nové zprávy ve složce Příchozí."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Vytvořit zprávu _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Upozornění na novou poštu"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Upozornění na novou poštu"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18609,65 +19089,65 @@ msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
 msgstr[0] ""
-"Dorazila vám %d nová zpráva\n"
-"v %s."
+"Přijata %d nová zpráva\n"
+"ve složce %s."
 msgstr[1] ""
-"Dorazily vám %d nové zprávy\n"
-"v %s."
+"Přijaty %d nové zprávy\n"
+"ve složce %s."
 msgstr[2] ""
-"Dorazilo vám %d nových zpráv\n"
-"v %s."
+"Přijato %d nových zpráv\n"
+"ve složce %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] "Přišla vám %d nová zpráva."
-msgstr[1] "Přišly vám %d nové zprávy."
-msgstr[2] "Přišlo vám %d nových zpráv."
+msgstr[0] "Přijata %d nová zpráva."
+msgstr[1] "Přijaty %d nové zprávy."
+msgstr[2] "Přijato %d nových zpráv."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "Nový e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "Zobrazovat ikonu v _oznamovací oblasti"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "B_likat s ikonou v oznamovací oblasti"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "V_yskakovací zpráva společně s ikonou"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "Za_hrát zvuk, když přijde nová pošta"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "_Pípnout"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "Přehrát _zvukový soubor"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "Zvolte _název souboru:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "Vyberte zvukový soubor"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "Pře_hrát"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "Upozo_rnit pouze na nové zprávy v Příchozích"
 
@@ -18978,11 +19458,6 @@ msgstr "_Zásuvné moduly"
 msgid "Author(s)"
 msgstr "Autoři"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Popis"
-
 #: ../plugins/plugin-manager/plugin-manager.c:130
 msgid "Configuration"
 msgstr "Nastavení"
@@ -19149,6 +19624,32 @@ msgstr ""
 "iCal\n"
 "volné/obsazené"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Telefon domů"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#, fuzzy
+msgid "Python Loader"
+msgstr "Načítač Mono"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (vestavěn)"
@@ -19243,7 +19744,6 @@ msgid "MIME Type"
 msgstr "Typ MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Uložit"
 
@@ -19450,6 +19950,34 @@ msgstr "Seskupovat zprávy podle předmětu"
 msgid "F_all back to threading messages by subject"
 msgstr "_Seskupovat zprávy podle předmětu"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Seznam vodítek pro zásuvný modul připomínající přílohu, které má hledat v "
+"těle zprávy."
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "Název pozice"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Uložit jako koncept"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "Uložit jako koncept"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
@@ -19476,116 +20004,112 @@ msgid "Evolution Test component"
 msgstr "Komponenta testů Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Popis aktuálního nastavení tiskárny."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
 msgid "Automatic proxy configuration URL"
 msgstr "Automatické rozpoznávání odkazů"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Verze nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "Určuje, jestli má detekce havárie běžet nebo ne."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Implicitní šířka bočního panelu"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Implicitní výška okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Implicitní stav okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Implicitní šířka okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "Zadejte heslo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID nebo alias komponenty, kterou implicitně zobrazit po spuštění."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username/password combo is defined by \"/apps/evolution/shell/network_config/"
 "authentication_user\" and locally stored password in .gnome2_private/."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Verze posledního aktualizovaného nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Seznam cest ke složkám, které synchronizovat na disk pro použití v režimu "
 "odpojení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 #, fuzzy
 msgid "Proxy configuration mode"
 msgstr "Nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19593,27 +20117,27 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Boční panel je viditelný"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Přeskakovat dialog varování o vývoji"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Přeskakovat dialog varování o obnovení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Spustit v režimu off-line"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Stavová lišta je viditelná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19621,19 +20145,19 @@ msgstr ""
 "Verze nastavení Evolution, jako hlavní/vedlejší/úrovně nastavení (například "
 "\"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Implicitní výška hlavního okna v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Implicitní šířka hlavního okna v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Implicitní šířka bočního panelu v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19641,37 +20165,37 @@ msgstr ""
 "Poslední verze aktualizovaného nastavení Evolution, s hlavní/vedlejší/úrovní "
 "nastavení (například \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19681,7 +20205,7 @@ msgstr ""
 "li nastaveno \"toolbar\", styl tlačítek je určen nastavením lišt nástrojů "
 "GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19689,65 +20213,65 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Lišta nástrojů je viditelná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "Verze posledního aktualizovaného nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Jestli se má Evolution spouštět v režimu off-line místo on-line."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "Jestli má být udělána detekce pádu nebo ne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Jestli mají být okna maximalizovaná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Jestli má být boční panel viditelný."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Jestli má být stavový řádek viditelný."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Jestli má být lišta nástrojů viditelná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Jestli se přeskakuje dialog varování ve vývojových verzích Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "Jestli se přeskakuje dialog varování během obnovení Evolutionu."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Jestli mají být tlačítka okna viditelná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Styl tlačítek okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Tlačítka okna jsou viditelná"
 
@@ -19820,29 +20344,9 @@ msgstr "Importovat _jeden soubor"
 msgid "Evolution Preferences"
 msgstr "Nastavení Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Není zadán název složky."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Název složky nesmí obsahovat znak Enter."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Název složky nesmí obsahovat znak \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Název složky nesmí obsahovat znak \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' a '..' jsou rezervované názvy složek."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19867,7 +20371,7 @@ msgstr "Nemohu spustit bug buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Radka Doulíková <doulikova@centrum.cz>\n"
@@ -19879,43 +20383,49 @@ msgstr ""
 "Jiří Eischmann <jiri@eischmann.cz>\n"
 "Petr Kovář <pknbe@volny.cz>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Webová stránka Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Chyba při otevírání stránky FAQ."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Pracovat _on-line"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "_Pracovat při odpojení"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Pracovat při odpojení"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu off-"
 "line."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution přechází do režimu off-line."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 "Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do režimu on-"
 "line."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Přepnout na %s"
@@ -19945,9 +20455,9 @@ msgstr "Nemohu se registrovat u OAF"
 msgid "Configuration Database not found"
 msgstr "Databáze nastavení nebyla nalezena"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Nový"
 
@@ -20865,7 +21375,7 @@ msgstr "Uložit kontakty z vybrané složky jako VCard"
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
@@ -21072,192 +21582,6 @@ msgstr "Pracovní týden"
 msgid "_Open Appointment"
 msgstr "_Otevřít událost"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Kliknutím zde vyberete soubor pro přílohu"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Kliknutím zde uzavřete aktuální okno"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Kliknutím sem uložíte aktuální okno"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Kliknutím zde zobrazíte dostupnou nápovědu"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Zavřít"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopírovat vybraný text do schránky"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Vyjmout vybraný text do schránky"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "_Vložit"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Vložit text ze schránky"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Vybrat všechen text"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "Nápo_věda"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "V_olby"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Celodenní událost"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Celo_denní událost"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Zařadit mezi důvěrné"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Zařadit mezi soukromé"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Zařadit mezi veřejné"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Kliknutím sem nastavíte nebo zrušíte alarmy pro tuto událost"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Vložit pokročilé možnosti odesílání"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Vytvoří opakující se událost"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Veř_ejné"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Informace o volném/obsazeném čase pro tuto schůzku"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "S_loupce Funkce"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Možnosti _odesílání"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Zobrazovat čas jako _obsazený"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Časové pás_mo"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Přepne zobrazení pole účastníka"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Přepne zobrazení pole RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Přepne zobrazení pole pro funkce"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Přepne zobrazení pole stavu"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Přepne zobrazení pole pro časovou zónu"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Přepne zobrazení kategorií"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Přepne událost na celodenní"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Přepne čas jako obsazený"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmy"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorie"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "Klasi_fikace"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Důvěrné"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "V_olno/obsazeno"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "Soukro_mé"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "Opaková_ní"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Sloupe_c Stav"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Sloupec T_yp"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Zrušit aktuální operaci pošty"
@@ -21368,7 +21692,7 @@ msgstr "_Přihlášení"
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
-msgstr "S_vislý náhled"
+msgstr "S_vislé zobrazení"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
@@ -21397,7 +21721,7 @@ msgstr "Vyjmout vybrané zprávy do schránky"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "_Rozbalit všechny vlákna"
+msgstr "_Rozbalit všechna vlákna"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
@@ -21405,7 +21729,7 @@ msgstr "_Vyčistit"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "Rozbalit všechny vlákna"
+msgstr "Rozbalit všechna vlákna"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
@@ -21959,6 +22283,10 @@ msgstr "Z_většit"
 msgid "_Zoom In"
 msgstr "Z_většit"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Zavřít"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Hlavní nástrojová lišta"
@@ -21995,22 +22323,6 @@ msgstr "Zobrazit vybranou poznámku"
 msgid "_Open Memo"
 msgstr "Ot_evřít poznámku"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Kliknutím změníte / zobrazíte stav úkolu"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Podrobnosti o stavu"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Časové pásmo"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Podrobno_sti o úkolu"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopírovat vybrané úkoly"
@@ -22053,7 +22365,7 @@ msgstr "Zobrazit okno s náhledem úkolu"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
-msgstr "_Náhled zprávy"
+msgstr "_Náhled úkolu"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
@@ -22465,38 +22777,10 @@ msgstr "Typ zobrazení"
 msgid "Type of view:"
 msgstr "Typ zobrazení:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Lišta příloh"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "Dokončeno procent"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22575,16 +22859,16 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Minimální šířka"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Minimální šířka"
 
@@ -22850,6 +23134,15 @@ msgstr ""
 "Widget interaktivní mapy ovládané myší pro výběr časového pásma. Uživatelé "
 "klávesnice by měli vybrat časové pásmo z kombinovaného pole níže."
 
+#: ../widgets/misc/e-online-button.c:112
+#, fuzzy
+msgid "Online"
+msgstr "Vložené"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synchronizovat s:"
@@ -22874,52 +23167,52 @@ msgstr "Model přeformátování"
 msgid "Column width"
 msgstr "Šířka sloupce"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Hledat"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Kliknutím zde změníte typ vyhledávání"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Hledat"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Hledat"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "Vy_mazat"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID položky"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Text"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "_Zobrazit: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "_Hledat: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " _v "
 
@@ -22969,10 +23262,6 @@ msgstr "<b>Sledování stavu</b>"
 msgid "A_uto-delete sent item"
 msgstr "_Automaticky odstranit odeslanou položku"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Klasifikace"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Vytvořit odeslanou položku po sledování informací"
@@ -23079,14 +23368,14 @@ msgid "_When opened:"
 msgstr "_Při otevření:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotovo)"
@@ -23304,81 +23593,81 @@ msgstr[0] "%s (%d položka)"
 msgstr[1] "%s (%d položky)"
 msgstr[2] "%s (%d položek)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Střídající se barvy řádků"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Kreslit vodorovný rastr"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Kreslit svislý rastr"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Kreslit zaměření"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Režim kurzoru"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Model výběru"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Práh délky"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Stejná výška řádku"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Zmrazen"
 
@@ -23454,24 +23743,24 @@ msgstr "Řadicí informace"
 msgid "Tree"
 msgstr "Strom"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Záhlaví tabulky"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Model tabulky"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Řádek kurzoru"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Vždy hledat"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Přidejte kliknutím"
 
@@ -23591,6 +23880,53 @@ msgstr "Kontext IM"
 msgid "Handle Popup"
 msgstr "Obsloužit kontextovou nabídku"
 
+#, fuzzy
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "'{0}' je zdroj kalendáře pouze pro čtení. Přepněte na náhled kalendáře a "
+#~ "zvýrazněte kalendář, který může přijmout události."
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Popis aktuálního nastavení tiskárny."
+
+#~ msgid "No folder name specified."
+#~ msgstr "Není zadán název složky."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Název složky nesmí obsahovat znak Enter."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Název složky nesmí obsahovat znak \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Název složky nesmí obsahovat znak \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' a '..' jsou rezervované názvy složek."
+
+#~ msgid "All Day Event"
+#~ msgstr "Celodenní událost"
+
+#~ msgid "Send _Options"
+#~ msgstr "Možnosti _odesílání"
+
+#~ msgid "Status Details"
+#~ msgstr "Podrobnosti o stavu"
+
+#~ msgid "Time Zone"
+#~ msgstr "Časové pásmo"
+
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+
 #~ msgid "Permission Denied."
 #~ msgstr "Oprávnění zamítnuto."
 
diff --git a/po/de.po b/po/de.po
index eeeb28799b..11ef0c7409 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 # Manuel Borchers <webmaster@matronix.de>, 2002.
 # Kai Lahmann <kl@linuxfaqs.de>, 2000.
 # Matthias Warkus <mawa@iname.com>, 2000.
-# Hendrik Richter <hendrikr@gnome.org>, 2004, 2005, 2006, 2007.
+# Hendrik Richter <hendrikr@gnome.org>, 2004, 2005, 2006, 2007, 2008.
 # Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
 # Christian Kintner <mail@christian-kintner.de>, 2006, 2007.
 # Andre Klapper <ak-47@gmx.net>, 2007, 2008.
@@ -16,13 +16,14 @@
 # bcc = Blindkopie
 # send options = Versandoptionen
 #
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 14:47+0200\n"
-"PO-Revision-Date: 2008-03-31 14:53+0200\n"
-"Last-Translator: Philipp Kerling <k.philipp@gmail.com>\n"
+"POT-Creation-Date: 2008-07-29 20:15+0200\n"
+"PO-Revision-Date: 2008-07-29 20:15+0200\n"
+"Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,21 +32,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "Evolution-Adressbuch"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -53,7 +54,6 @@ msgstr[0] "Angezeigter Adressbuchordner %s enthält %d Karte"
 msgstr[1] "Angezeigter Adressbuchordner %s enthält %d Karten"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Öffnen"
 
@@ -163,7 +163,7 @@ msgid "calendar view for one or more days"
 msgstr "Kalenderansicht für einen oder mehrere Tage"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -174,18 +174,18 @@ msgstr "%A, %d. %B %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:331
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -193,10 +193,10 @@ msgstr "%a, %d. %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -206,15 +206,15 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:345
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d. %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
@@ -326,31 +326,32 @@ msgstr "Kalender: von %s bis %s"
 msgid "evolution calendar item"
 msgstr "Evolution Kalenderelement"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Auswahllistenknopf"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Vorgabe verwenden"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Kontextmenü"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Anlagenleiste ein-/ausblenden"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "aktivieren"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
 "»{0}« ist ein schreibgeschütztes Adressbuch. Wechseln Sie zur Kontakte-"
 "Ansicht und wählen Sie ein Adressbuch aus, das Kontakte akzeptieren kann."
@@ -399,10 +400,11 @@ msgid "Could not remove addressbook."
 msgstr "Adressbuch konnte nicht entfernt werden."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Momentan können Sie mit Evolution nur auf das GroupWise-Systemadressbuch "
 "zugreifen. Bitte verwenden Sie einmalig eine andere GroupWise-E-Mail-"
@@ -427,7 +429,7 @@ msgstr "Legitimation am LDAP-Server gescheitert."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelöscht werden"
 
@@ -533,9 +535,10 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
 #, fuzzy
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+"Sie haben keine ausreichenden Rechte um Kontakte in diesem Adressbuch zu "
+"löschen."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -576,8 +579,8 @@ msgid "_Use as it is"
 msgstr "_Wie es ist benutzen"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -586,17 +589,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Voreingestellte Synchronisierungsadresse:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Adressbuch konnte nicht geladen werden"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -618,10 +621,10 @@ msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -630,7 +633,8 @@ msgid "Evolution Address Book"
 msgstr "Evolution-Adressbuch"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+#, fuzzy
+msgid "Evolution Address Book address popup"
 msgstr "Adressenfenster des Evolution-Adressbuchs"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -662,11 +666,12 @@ msgstr "Hier können Sie Ihre S/MIME-Zertifikate verwalten"
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:584 ../calendar/gui/migration.c:1098
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "Auf diesem Computer"
 
@@ -679,15 +684,16 @@ msgstr "Auf diesem Computer"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:592 ../calendar/gui/migration.c:1106
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Persönlich"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
@@ -709,7 +715,7 @@ msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
@@ -725,72 +731,72 @@ msgstr "Ein neues Adressbuch anlegen"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Aktualisieren der Adressbucheinstellungen oder -ordner gescheitert."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "Basis"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "A_rt:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:618
 msgid "Copy _book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus _kopieren"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:967
 #: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2356
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allgemein"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:972
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:974
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:977
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:980
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1190
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrationsvorgang …"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "»%s« wird migriert:"
@@ -846,48 +852,48 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Pilot-Sync-Daten …"
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "_Neues Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "Als VCard speichern …"
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "Ei_genschaften …"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Kontaktquellenauswahl"
 
@@ -896,19 +902,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Der Zugriff auf den LDAP-Server erfolgt anonym"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Geben Sie das Passwort für %s ein (Benutzer %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Passwort eingeben"
@@ -1003,7 +1009,7 @@ msgid "Add Address Book"
 msgstr "Adressbuch hinzufügen"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Immer"
 
@@ -1038,14 +1044,14 @@ msgid "Lo_gin:"
 msgstr "Anm_eldename:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nie"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Keine Verschlüsselung"
 
@@ -1057,7 +1063,7 @@ msgstr "Eins"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
@@ -1125,7 +1131,7 @@ msgstr "Unterstützte Suchbasen"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../mail/em-account-editor.c:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
@@ -1148,8 +1154,8 @@ msgid ""
 msgstr ""
 "Der Suchbereich legt fest, wie tief Sie bei der Suche im Verzeichnisbaum "
 "absteigen wollen. Der Suchbereich »sub« schließt alle Einträge unterhalb des "
-"Suchbereichs ein. Der Suchbereich »one« hingegen schließt lediglich die "
-"Ebene unterhalb des Ausgangspunktes der Suche ein."
+"Suchbereichs ein. Der Suchbereich »one« hingegen schließt lediglich die Ebene "
+"unterhalb des Ausgangspunktes der Suche ein."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
@@ -1197,7 +1203,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
-msgstr "Eindeutigen Namen (EN) verwenden"
+msgstr "Eindeutigen Namen (DN) verwenden"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
@@ -1224,8 +1230,8 @@ msgid "_Login method:"
 msgstr "An_meldemethode:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:173
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1240,7 +1246,7 @@ msgid "_Search scope:"
 msgstr "_Suchbereich:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1261,9 +1267,9 @@ msgstr "Karten"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "Minuten"
 
@@ -1304,7 +1310,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Geschäftlich</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1316,16 +1322,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorien …"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -1338,7 +1344,7 @@ msgid "Image"
 msgstr "Grafik"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN-Messenger"
 
@@ -1351,7 +1357,7 @@ msgid "Nic_kname:"
 msgstr "_Spitzname:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1365,11 +1371,11 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Geschäftlich"
 
@@ -1391,7 +1397,7 @@ msgid "_Birthday:"
 msgstr "_Geburtstag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
@@ -1481,1122 +1487,1122 @@ msgstr "_In:"
 msgid "_Zip/Postal Code:"
 msgstr "Postleit_zahl:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Editierbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algerien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Amerikanisch-Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antigua und Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentinien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Australien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Österreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Weißrussland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnien und Herzegowina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Bouvet-Insel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Britisches Territorium im Indischen Ozean"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Kapverdische Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Cayman-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "Zentralafrikanische Republic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Tschad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Weihnachtsinsel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos-(Keeling-)Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Kolumbien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Komoren"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Demokratische Republik Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cook-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Elfenbeinküste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Zypern"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Dänemark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Dschibuti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominikanische Republik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Ägypten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Äquatorial-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Äthiopien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Falkland-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Färöer-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fidschi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finnland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Frankreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Französisch-Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Französisch-Polynesian"
 
 # CHECK - Source: Database of program "Ding"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Französische Südpolar-Territorien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Georgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Deutschland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Griechenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Grönland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Heard- und McDonald-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Heiliger Stuhl"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "Indien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Jordanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Demokratische Volksrepublik Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Republik Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Lettland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libyen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Mazedonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Malediven"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Marshall-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldawien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Niederländische Antillen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Neuseeland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Norfolkinsel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Nördliche Marianen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norwegen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palästinensisches Autonomiegebiet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papua-Neuguinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Polen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Katar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Reunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Russische Föderation"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts und Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "St. Licia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent und die Grenadinen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome und Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Serbien und Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Solomon-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Südafrika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Südgeorgien und die Südlichen Sandwichinseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre und Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard- und Jan-Mayen-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swasiland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Syrien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Vereinigte Republik Tansania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad und Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Türkei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Turks und Caicos-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "Kleinere abseitsliegende Inseln der Vereinigten Staaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Britische Jungferninseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "US-Jungferninseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis und Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Westsahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Sambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL-Instant-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Yahoo-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "_Gadu-Gadu-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Dienst"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Ort"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Privat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Weitere"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Quellbuch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Zielbuch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "Ist neuer Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Beschreibbare Felder"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "Benötigte Felder"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Geändert"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2604,47 +2610,47 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Voller Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E-_Mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "Adressbuch aus_wählen"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2653,7 +2659,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontaktliste löschen wollen (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2661,7 +2667,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontaktlisten löschen wollen?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2670,7 +2676,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diesen Kontakt löschen wollen (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2822,9 +2828,9 @@ msgstr "_Mitglieder"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Buch"
 
@@ -2869,40 +2875,39 @@ msgstr ""
 "Der Namen oder die E-Mail-Adresse dieses Kontakts existiert\n"
 "bereits in diesem Ordner. Soll er dennoch hinzugefügt werden?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
 msgid "Merge Contact"
 msgstr "Kontakte zusammenführen"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Zusammenführen"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-Mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:81 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Name beginnt mit"
+msgid "Name contains"
+msgstr "Name enthält"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2917,9 +2922,9 @@ msgstr[1] "%d Kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Abfrage"
 
@@ -2930,9 +2935,9 @@ msgstr "Fehler beim Abrufen der Buchansicht"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modell"
 
@@ -2940,107 +2945,109 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "Name beginnt mit"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Quelle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Art"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "Als VCard speichern …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Neuer Kontakt …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Neue Kontakt_liste …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "Als VCard _speichern …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "Kontakt weiter_leiten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "Kontakte weiter_leiten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "_Nachricht an Kontakte schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Drucken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "In Adressbuch _kopieren …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "In Adressbuch _verschieben …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3099 ../mail/em-folder-tree.c:997
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2064
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "E_infügen"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Anderer Fehler"
 
@@ -3075,7 +3082,7 @@ msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3176,9 +3183,9 @@ msgid "Radio"
 msgstr "Funk"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "Position"
 
@@ -3215,38 +3222,38 @@ msgid "Web Site"
 msgstr "Website"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Breite"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Höhe"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Hat Fokus"
 
@@ -3266,11 +3273,22 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "Spaltenbreite"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Suche nach dem Kontakt."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3284,7 +3302,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3298,7 +3316,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3308,7 +3326,7 @@ msgstr ""
 "\n"
 "Suche nach dem Kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3318,41 +3336,41 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden Einträge."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-Mail, geschäftlich"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "E-Mail, privat"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Weitere E-Mail-Adresse"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Gewählt"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an …"
 
@@ -3395,15 +3413,15 @@ msgid "Video Chat"
 msgstr "Video-Chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3412,8 +3430,7 @@ msgstr "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
@@ -3435,12 +3452,14 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -3457,103 +3476,103 @@ msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Erfolg"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Backend belegt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "Adressbuch existiert nicht"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "Kein eigener Kontakt festgelegt"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Kontakt nicht gefunden"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "Kontaktkennung existiert bereits"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Abgebrochen"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "Abbrechen gescheitert"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Legitimation gescheitert"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "Keine derartige Quelle"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "Im Offline-Modus nicht verfügbar"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Ungültige Server-Version"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3565,7 +3584,7 @@ msgstr ""
 "laden Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte "
 "herunterzuladen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3574,7 +3593,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
 "Pfad %s existiert und Sie darauf zugreifen dürfen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3583,7 +3602,7 @@ msgstr ""
 "Sie eine falschen URI eingegeben haben, oder dass der LDAP-Server nicht "
 "erreichbar ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 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 "
@@ -3593,7 +3612,7 @@ msgstr ""
 "Falls Sie LDAP in Evolution verwenden wollen, müssen Sie eine LDAP-mächtige "
 "Evolution-Version installieren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3602,7 +3621,7 @@ msgstr ""
 "Sie eine falsche URI eingegeben haben, oder dass der Server nicht erreichbar "
 "ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3614,7 +3633,7 @@ msgstr ""
 "oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers für dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 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"
@@ -3626,49 +3645,49 @@ msgstr ""
 "Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
 "Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte die Syntax dieser "
 "Abfrage nicht analysieren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
 "ausführen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
 msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 #: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "Fehler beim Ändern eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 #: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3685,17 +3704,17 @@ msgstr[1] ""
 "geöffnet werden.\n"
 "Wollen Sie wirklich all diese Kontakte anzeigen?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "_Nicht anzeigen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
 # CHECK der Kontakt -> diesen?
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3704,7 +3723,7 @@ msgstr ""
 "%s existiert bereits\n"
 "Soll er überschrieben werden?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "Überschreiben"
 
@@ -3747,27 +3766,27 @@ msgstr "Kontakt verschieben nach"
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "Mehrere VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "vCard for %s"
 msgstr "VCard für %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformationen für %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "Adressbuch wird abgefragt …"
 
@@ -3795,43 +3814,43 @@ msgstr "In Adressbuch speichern"
 msgid "Card View"
 msgstr "Kartenansicht"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importieren …"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-Datenaustauschformat (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution-LDIF-Importeur"
 
@@ -3884,11 +3903,11 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "Kopfzeile"
@@ -3991,7 +4010,7 @@ msgstr "Schattierung"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1055
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4010,7 +4029,7 @@ msgid "Top:"
 msgstr "Oben:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Art:"
 
@@ -4117,19 +4136,17 @@ msgstr "Unbehandelter Fehler"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"»{0}« ist ein schreibgeschützter Kalender. Wechseln Sie zur Kalenderansicht "
-"und wählen Sie einen Kalender aus, der Termine akzeptieren kann."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
+#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 "»{0}« ist ein schreibgeschützter Kalender. Wechseln Sie zur Kalenderansicht "
 "und wählen Sie einen Kalender aus, der Termine akzeptieren kann."
@@ -4232,19 +4249,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen Termin löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sind Sie sicher, dass Sie diese Besprechung löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sind Sie sicher, dass Sie diese Notiz löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe löschen wollen?"
@@ -4272,9 +4289,8 @@ msgid "Cannot create a new event"
 msgstr "Anlegen eines neuen Ereignisses gescheitert"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Cannot save event"
-msgstr "Anlegen eines neuen Ereignisses gescheitert"
+msgstr "Ereignis kann nicht gespeichert werden"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
@@ -4413,7 +4429,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Der Kalender ist nicht für eine Offline-Benutzung markiert."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "Die Notizliste ist nicht für eine Offline-Benutzung markiert."
 
 #: ../calendar/calendar.error.xml.h:55
@@ -4522,8 +4539,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../calendar/calendar.error.xml.h:76 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -4533,7 +4549,7 @@ msgstr "Änderungen _speichern"
 
 #: ../calendar/calendar.error.xml.h:78
 #: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "Ab_schicken"
 
@@ -4545,55 +4561,55 @@ msgstr "Nachricht ver_schicken"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtägige Ereignisse aufteilen:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server konnte nicht gestartet werden"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kalender-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Notiz-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Notiz-Anwendungsblock des Pilot konnte nicht geschrieben werden"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Vorgabepriorität:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht geschrieben werden"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2347
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Kalender"
 
@@ -4636,25 +4652,25 @@ msgid "Memo_s"
 msgstr "_Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -4672,25 +4688,25 @@ msgstr "_Aufgaben"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Anfangszeit"
 
@@ -4701,9 +4717,9 @@ msgstr "Termine"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Ort:"
@@ -4713,17 +4729,15 @@ msgid "Snooze _time:"
 msgstr "Schlummer_zeit:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
@@ -4735,32 +4749,32 @@ msgstr "_Schlummer"
 msgid "location of appointment"
 msgstr "Ort des Termins"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No location information available."
 msgstr "Keine Ortinformationen verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sie haben %d Alarme"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4773,7 +4787,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4790,15 +4804,15 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4811,7 +4825,7 @@ msgid "invalid time"
 msgstr "ungültige Zeit"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4820,7 +4834,7 @@ msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4831,7 +4845,7 @@ msgstr[1] "%d Minuten"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -5086,12 +5100,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show the \"Preview\" pane"
 msgstr "Das Vorschaufeld anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show the \"Preview\" pane."
 msgstr "Das Vorschaufeld anzeigen."
 
@@ -5292,66 +5306,66 @@ msgstr "Minute, zu der der Arbeitstag beginnt"
 msgid "daylight savings time"
 msgstr "Sommerzeit"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "Kategorie ist"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "Ort enthält"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "Aufgaben der nächsten 7 Tage"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "Überfällige Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drucken"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5361,15 +5375,15 @@ msgstr ""
 "sind. Falls Sie fortfahren, können Sie diese Ereignisse nicht "
 "wiederherstellen."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Ereignisse löschen älter als"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "Tage"
@@ -5378,106 +5392,106 @@ msgstr "Tage"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:611 ../calendar/gui/migration.c:1125
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "Im Web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Wetter"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2086
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopieren …"
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3637 ../mail/em-folder-tree.c:2100
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Auffrischen der Kalender gescheitert."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Der Kalender »%s« konnte nicht zum Anlegen von Ereignissen und Besprechungen "
 "geöffnet werden"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Es ist kein Kalender zum Anlegen von Ereignissen und Besprechungen verfügbar"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "Ka_lender"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
@@ -5498,15 +5512,225 @@ msgid "Month View"
 msgstr "Monatsansicht"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+msgid "Any Field"
+msgstr "Feld"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anlagen"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Teilnehmer"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Geschäftlich"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Kategorie"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Einstufung"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "Abschlussdatum"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Vertraulich"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Beschreibung enthält"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Existieren nicht"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existieren"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favoriten"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Geschenke"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Ferien"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Ferienkarten"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Heiße Kontakte"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideen"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "International"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "Anpassen"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+#, fuzzy
+msgid "Next 7 days"
+msgstr "Aufgaben der nächsten 7 Tage"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organisator"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "Telefon"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privat"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Öffentlich"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Wiederholung"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategien"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Zusammenfassung enthält"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "Antworten"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Zeit &amp; Ausgaben"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "Wartend"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "enthält"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "enthält nicht"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "ist"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "ist nicht"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Fehler beim Öffnen des Kalenders"
@@ -5519,11 +5743,11 @@ msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 msgid "Permission denied to open the calendar"
 msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Alarm bearbeiten"
 
@@ -5556,17 +5780,17 @@ msgid "Mes_sage:"
 msgstr "_Nachricht:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Alarm-Popup anzeigen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
@@ -5579,7 +5803,7 @@ msgid "Send To:"
 msgstr "Schicken an:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
@@ -5627,6 +5851,7 @@ msgid "hour(s)"
 msgstr "Stunde(n)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -5634,7 +5859,7 @@ msgstr "Minute(n)"
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "Aktion/Auslöser"
 
@@ -5645,16 +5870,15 @@ msgstr "_Hinzufügen"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarme"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
@@ -5724,8 +5948,8 @@ msgid "Display"
 msgstr "Anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Freitag"
 
@@ -5740,8 +5964,8 @@ msgstr ""
 "Tage"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Montag"
 
@@ -5764,7 +5988,7 @@ msgstr ""
 "Sonntag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
@@ -5774,8 +5998,8 @@ msgid "S_un"
 msgstr "_So"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -5792,8 +6016,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -5811,8 +6035,8 @@ msgid "Template:"
 msgstr "Vorlage:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -5826,14 +6050,14 @@ msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Dienstag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -5911,328 +6135,469 @@ msgstr "M_i"
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Den Kalenderinhalt lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Den Inhalt der Aufgabenliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 msgid "Colo_r:"
 msgstr "_Farbe:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Notizliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Aufgabenlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "New Task List"
-msgstr "_Neue Aufgabenliste"
+msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "Memo List Properties"
-msgstr "Aufgabenlisteneigenschaften"
+msgstr "Notizlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "Diese Notiz wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "Diese Notiz wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "aktualisieren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " bis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2849
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Beigelegte Nachricht - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2854
-#: ../composer/e-msg-composer.c:3036
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Beigelegte Nachricht"
 msgstr[1] "%d beigelegte Nachrichten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3100
-#: ../mail/em-folder-tree.c:998 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3102
-#: ../mail/em-folder-tree.c:1000 ../mail/message-list.c:2067
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "_Ziehen abbrechen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2486
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Termin bearbeiten"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Besprechung - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Termin - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Zugewiesene Aufgabe - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Aufgabe - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Notiz - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Keine Zusammenfassung"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu schließen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Den markierten Text in die Zwischenablage kopieren"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Den markierten Text in die Zwischenablage verschieben"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Den in der Zwischenablage befindlichen Text einfügen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu speichern"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Den gesamten Text markieren"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "E_instufung"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_Datei"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "Ein_fügen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Optionen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "_Ansicht"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Anlage …"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Klicken Sie hier, um eine Datei beizulegen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Kategorien"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Kategorien anzeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Zeit_zone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Zeitzone anzeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Ö_ffentlich"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Als öffentlich einstufen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Als privat einstufen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "Ver_traulich"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Als vertraulich einstufen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "_Positions-Feld"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Feld für die Position angezeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_UAwg"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "UAwg-Feld angezeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "_Statusfeld"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Statusfeld anzeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "A_rt-Feld"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent Docu_ments"
+msgstr "Prozent abgeschlossen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Beilegen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anlage"
 msgstr[1] "<b>%d</b> Anlagen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3636
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3639
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Anlagen anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 "Durch Drücken der Leertaste wird die Anlagenleiste ein bzw. ausgeblendet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Termin bearbeiten"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Besprechung - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Zugewiesene Aufgabe - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Aufgabe - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Notiz - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "Keine Zusammenfassung"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Quelle konnte nicht geöffnet werden"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Ziel konnte nicht geöffnet werden"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
 "werden?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "Die Aufgabe konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Die Notiz konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Das Ereignis konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Die Aufgabe konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 "Diese Notiz konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Das Objekt konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden"
 
@@ -6241,7 +6606,7 @@ msgid "Contacts..."
 msgstr "Kontakte …"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Delegieren an:"
 
@@ -6249,135 +6614,181 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alarme"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Klicken Sie hier, um Alarme für dieses Ereignis einzustellen"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Wiederholung"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Dies zu einem wiederkehrenden Ereignis machen"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Versandoptionen"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Erweiterte Versandoptionen einfügen"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "_Ganztägiges Ereignis"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Festlegen, ob es ein ganztägiges Ereinis ist"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Zeit als b_eschäftigt anzeigen"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Verfügbarkeit"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Termin"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Wiederholung"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Dieses Ereignis enthält Alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegaten"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Ereignis ohne Anfangsdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organisator ist kein Konto mehr zugeordnet."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Hinzufügen"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d Tag vor dem Termin"
 msgstr[1] "%d Tage vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d Stunde vor dem Termin"
 msgstr[1] "%d Stunden vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Minute vor dem Termin"
 msgstr[1] "%d Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Anpassen"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2024
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "Keine"
 
@@ -6449,28 +6860,24 @@ msgstr "Organisa_tor ändern"
 msgid "Co_ntacts..."
 msgstr "Ko_ntakte …"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organisator"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Notiz"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Notizen in »%s« konnten nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1549
-#: ../mail/em-format-html.c:1607 ../mail/em-format-html.c:1633
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "An"
 
@@ -6488,66 +6895,66 @@ msgid "_Description:"
 msgstr "_Beschreibung:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einem wiederkehrenden Ereignis vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Sie delegieren ein wiederkehrendes Ereignis. Was möchten Sie delegieren?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Aufgabe vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Notiz vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Nur diese Instanz"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Diese und frühere Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Diese und zukünftige Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Alle Instanzen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthält Wiederholungen, die Evolution nicht bearbeiten kann."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Das Wiederholungsdatum ist ungültig"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "am"
 
@@ -6555,7 +6962,7 @@ msgstr "am"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "erster"
 
@@ -6564,7 +6971,7 @@ msgstr "erster"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "zweiter"
 
@@ -6572,7 +6979,7 @@ msgstr "zweiter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "dritter"
 
@@ -6580,7 +6987,7 @@ msgstr "dritter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "vierter"
 
@@ -6588,13 +6995,13 @@ msgstr "vierter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "letzter"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Anderes Datum"
 
@@ -6602,7 +7009,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1. bis 10."
 
@@ -6610,7 +7017,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11. bis 20."
 
@@ -6618,45 +7025,45 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21. bis 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "Tag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "am"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "Treffer"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Ausnahme hinzufügen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Keine zu verändernde Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Ausnahme verändern"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Keine zu löschende Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -6707,12 +7114,12 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Das Fertigstellungsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Website"
 
@@ -6727,51 +7134,55 @@ msgstr "<b>Status</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:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Hoch"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Niedrig"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -6784,7 +7195,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Nicht festgelegt"
 
@@ -6801,25 +7212,40 @@ msgstr "_Priorität:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "S_tatusdetails"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr ""
+"Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu ändern"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "_Versandoptionen"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Aufgabendetails"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
@@ -6845,7 +7271,7 @@ msgid "_Due date:"
 msgstr "_Fällig am:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6853,142 +7279,126 @@ msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Auszuführende Aktion unbekannt"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s vor Terminbeginn"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nach Terminbeginn"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s zum Terminbeginn"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s vor Terminende"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nach Terminende"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Website:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Fällig am:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Priorität:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Öffentlich"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privat"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Vertraulich"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Enddatum"
@@ -6998,21 +7408,14 @@ msgstr "Enddatum"
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "Zusammenfassung"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -7027,34 +7430,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nein"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2049
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -7066,159 +7469,188 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "Speichern unter …"
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
 msgid "Select folder to save selected attachments..."
 msgstr "Ordner zum Speichern der gewählten Anlagen auswählen …"
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "_Speichern unter …"
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "Auswahl _speichern"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:830
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "In %s öffnen …"
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+#, fuzzy
+msgid "* No Summary *"
+msgstr "Keine Zusammenfassung"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisator: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisator: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+#, fuzzy
+msgid "Start: "
+msgstr "Anfang"
+
+#: ../calendar/gui/e-calendar-table.c:420
+#, fuzzy
+msgid "Due: "
+msgstr "Fällig am "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Neue _Aufgabe"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Ausschneiden"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -7241,7 +7673,8 @@ msgid "Due date"
 msgstr "Fällig am"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Priorität"
 
@@ -7249,112 +7682,93 @@ msgstr "Priorität"
 msgid "Start date"
 msgstr "Anfangsdatum"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Objekte werden verschoben"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "Objekte werden kopiert"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "Neue Bes_prechung"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "_Aktuelle Ansicht"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "_Datum wählen …"
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Diese Wiederholung löschen"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "_Termin inkl. Wiederholungen löschen"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisator: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisator: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -7382,7 +7796,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
@@ -7393,44 +7807,34 @@ msgstr "%02i Minuten-Unterteilungen"
 #. 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:837 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:322 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:772 ../calendar/gui/e-week-view.c:511
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
 #: ../calendar/gui/print.c:813
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
 #: ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "PM"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Täglich"
 msgstr[1] "Alle %d Tage"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7438,9 +7842,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Wöchentlich"
 msgstr[1] "Alle %d Wochen"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7448,52 +7850,36 @@ msgstr[0] "Wöchentlich am "
 msgstr[1] "Alle %d Wochen am "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "monatlich"
 msgstr[1] "alle %d Monate"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Jährlich"
 msgstr[1] "Alle %d Jahre"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7502,47 +7888,47 @@ msgstr[1] " insgesamt %d Mal"
 
 # CHECK
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", endet am "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Anfang"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Ende"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Fällig"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7550,28 +7936,28 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus untenstehendem Menü."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7579,269 +7965,269 @@ msgstr ""
 "Die Besprechung wurde abgesagt, konnte jedoch nicht in Ihren Kalendern "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Die Aufgabe wurde abgesagt, konnte jedoch nicht in Ihren Aufgabenlisten "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Teilnahme von %s an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Teilnahme an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr ""
 "<b>%s</b> wünscht zu einer existierenden Besprechung hinzugefügt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Besprechungsabsage"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> wünscht, dass %s eine Aufgabe auszuführt."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> wünscht, dass Sie eine Aufgabe ausführen."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzugefügt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht aktuelle Aufgabeninformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> hat eine Aufgabe abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Aufgabenabsage"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalendereinträge"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als "
 "Teilnehmer hinzufügen?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Teilnahmestatus konnte auf Grund eines ungültigen Status nicht aktualisiert "
 "werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
+#: ../calendar/gui/e-itip-control.c:2080
 #: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -7870,112 +8256,112 @@ msgstr "Kalender wird geladen …"
 msgid "Server Message:"
 msgstr "Server-Nachricht:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Benötigte Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Optionale Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
 #: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
 #: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "Raum"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
 #: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegiert"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "In Bearbeitung"
 
 #. 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -7983,85 +8369,81 @@ msgstr "%a, %d. %B %Y"
 #. 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.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Nicht im Büro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "_Teilnehmer …"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Auto-Auswählen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "_Benötigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Teilnehmer"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Klicken Sie hier, um einen Teilnehmer hinzuzufügen"
@@ -8094,8 +8476,8 @@ msgstr "Gewählte Notizen _löschen"
 msgid "Click to add a memo"
 msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8104,84 +8486,84 @@ msgstr ""
 "Fehler bei »%s«:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Notizen werden geladen"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Notizen unter %s werden geöffnet"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Gewählte Objekte werden gelöscht …"
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen …"
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "Zeitzone auswählen"
 
 #. 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/e-week-view-main-item.c:339 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "Abfrage wird aktualisiert"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "Be_nutzerdefinierte Ansicht"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "Benutzerdefinierte Ansicht _speichern"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "Ansichten _definieren …"
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Termine unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Notizen unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet …"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -8241,139 +8623,144 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Es muss ein Organisator festgelegt werden."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Notiz-Informationen"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Auffrischen"
 
 # CHECK
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d Notiz"
 msgstr[1] "%d Notizen"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d gewählt"
 msgstr[1] ", %d gewählt"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Auffrischen der Notizen gescheitert."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Die Notizliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Es ist kein Kalender zum Anlegen von Notizen verfügbar"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Notizquellenauswahl"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Neue Notiz"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Mem_o"
 msgstr "N_otiz"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Neue gemeinsame Notiz"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "_Shared memo"
 msgstr "_Gemeinsame Notiz"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Eine neue gemeinsame Notiz anlegen"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Memo li_st"
 msgstr "Noti_zenliste"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Notizen drucken"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+#, fuzzy
+msgid "Next 7 Days'"
+msgstr "Aufgaben der nächsten 7 Tage"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8385,7 +8772,7 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8398,28 +8785,28 @@ msgstr ""
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:782 ../calendar/gui/migration.c:950
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Alte Einstellungen aus evolution/config.xmldb konnten nicht migiriert werden"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:811
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Der Kalender »%s« konnte nicht migriert werden."
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:979
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Die Aufgaben in »%s« konnten nicht migriert werden."
 
-#: ../calendar/gui/migration.c:1234
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../calendar/gui/migration.c:1227
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "Notizen"
 
@@ -8627,69 +9014,69 @@ msgstr "Kontakte: "
 msgid "Upcoming Appointments"
 msgstr "Bevorstehende Termine"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "Auffrischen der Aufgaben gescheitert."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Die Aufgabenliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Es ist kein Kalender zum Anlegen von Aufgaben verfügbar"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Aufgabenquellenauswahl"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Zugewiesene Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Assigne_d Task"
 msgstr "_Zugewiesene Aufgabe"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Eine neue zugewiesene Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Tas_k list"
 msgstr "Aufgabenl_iste"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8702,49 +9089,70 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Nicht mehr rückfragen."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% abgeschlossen"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "In Bearbeitung"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "ist größer als"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "ist kleiner als"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Termine und Besprechungen"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "Kalender wird geöffnet"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-Dateien (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-iCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Erinnerung!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-Dateien (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-vCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
@@ -10278,57 +10686,220 @@ msgstr "Pazifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
+#: ../composer/e-composer-autosave.c:275
+#, fuzzy
+msgid "Could not open autosave file"
+msgstr "Datei konnte nicht geöffnet werden"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Zielordner"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Anlage hinzufügen"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "Bei_legen"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "Si_gnatur:"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "Namenlose Nachricht"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "V_on:"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "Eine Datei beilegen"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "Antwo_rt an:"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "S_chließen"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "A_n:"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "Die momentan geöffnete Datei schließen"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Drucken …"
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "Druck_vorschau"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "Die momentan geöffnete Datei speichern"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "Speichern _unter …"
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "_Entwurf speichern"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "Als Entwurf speichern"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "A_bschicken"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "Diese Nachricht verschicken"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "Versandoptionen einfügen"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Neue _Nachricht"
+
+#: ../composer/e-composer-actions.c:537
+#, fuzzy
+msgid "Open New Message window"
+msgstr "Neue Nachricht _schicken an …"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "Zeichen_kodierung"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "_Sicherheit"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "Mit P_GP verschlüsseln"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "Diese Nachricht mit PGP verschlüsseln"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "Mit _PGP signieren"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "Diese Nachricht mit PGP signieren"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "Nachricht _priorisieren"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "Die Priorität der Nachricht auf hoch setzen"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "_Lesebestätigung anfordern"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr ""
+"Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "Mit S/_MIME verschlüsseln"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+"Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "Mit _S/MIME signieren"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "_Blindkopie-Feld"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Blindkopie-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "_Kopie-Feld"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "Kopie-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "_Von-Feld"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Von-Wähler anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "V_eröffentlichen-in-Feld"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Veröffentlichen-in-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "An_twort-an-Feld"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Antwort-an-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:649
+#, fuzzy
+msgid "_Subject Field"
+msgstr "_Kopie-Feld"
+
+#: ../composer/e-composer-actions.c:651
+#, fuzzy
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Statusfeld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "A_n-Feld"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "An-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Kopie an:"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "Blindko_pie an:"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-composer-header-table.c:71
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10336,30 +10907,71 @@ msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie erhalten, jedoch nicht in der "
 "Empfängerliste auftauchen sollen"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "V_on:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "Antwo_rt an:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "A_n:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Kopie an:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "Blindko_pie an:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_Veröffentlichen in:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "Bei_legen"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Si_gnatur:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Anlage hinzufügen"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
+
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "Zielordner"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
+
+#: ../composer/e-composer-private.c:65
+#, fuzzy
+msgid "Recent _Documents"
+msgstr "Prozent abgeschlossen"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "Anla_genleiste anzeigen"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10367,42 +10979,23 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2515
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Anlage"
+msgstr[1] "Anlagen"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2518
-#: ../composer/e-msg-composer.c:3884
-msgid "Show _Attachment Bar"
-msgstr "Anla_genleiste anzeigen"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Unbekannter Grund"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Datei konnte nicht geöffnet werden"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
-
-#: ../composer/e-msg-composer.c:1819
-msgid "Untitled Message"
-msgstr "Namenlose Nachricht"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1855
-msgid "Open File"
-msgstr "Datei öffnen"
-
-#: ../composer/e-msg-composer.c:2529 ../composer/e-msg-composer.c:3764
-#: ../composer/e-msg-composer.c:3767
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:5037
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10436,8 +11029,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "Grund: »{0}«. Möglicherweise müssen Sie Ihre E-Mail-Einstellungen ändern."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Grund: »{1}«."
 
@@ -10562,7 +11154,7 @@ msgstr "Sie müssen ein Konto einrichten, bevor Sie E-Mails verfassen können."
 msgid "_Do not Recover"
 msgstr "_Verwerfen"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Wiederherstellen"
 
@@ -10574,7 +11166,7 @@ msgstr "Nachricht _speichern"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-E-Mail und -Kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Groupware-Suite"
 
@@ -10590,49 +11182,75 @@ msgstr "Adresskarte"
 msgid "calendar information"
 msgstr "Kalenderinformationen"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution-Fehler"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution-Warnung"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution-Informationen"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution-Abfrage"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interner Fehler, unbekannter Fehler »%s« angefordert"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Komponente"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "Aktiv"
+
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "Ist der Ausklapper ausgeklappt?"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Während des Druckens ist ein Fehler aufgetreten"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "Das Drucksystem hat folgende Details zum Fehler berichtet:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 "Das Drucksystem hat keine weiteren Details über den aufgetretenen Fehler "
 "berichtet."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#, fuzzy
+msgid "Because \"{1}\"."
+msgstr "Grund: »{1}«."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
 msgstr "Die Datei »{0}« konnte nicht geöffnet werden."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
 msgstr "Die Datei »{0}« konnte nicht gespeichert werden."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10640,7 +11258,7 @@ msgid "Do you wish to overwrite it?"
 msgstr "Soll sie überschrieben werden?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
 msgstr "Die Datei »{0}« existiert bereits."
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10651,52 +11269,63 @@ msgstr "Datei überschreiben?"
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_Wichtig"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Geschäftlich"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Persönlich"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "Zu er_ledigen"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "S_päter"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Beschriftungsname:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Beschriftung bearbeiten"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Beschriftungsname darf nicht leer sein."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr ""
 "Beschriftung mit der gleichen Markierung existiert bereits. Bitte geben Sie "
 "der Beschriftung einen anderen Namen."
 
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-Fehler: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr ""
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10813,66 +11442,66 @@ msgstr "%d.%m.%Y"
 msgid "Select a time to compare against"
 msgstr "Wählen Sie eine Vergleichszeit"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Eine Datei wählen"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:851
 msgid "R_ule name:"
 msgstr "Regel_name:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:879
 msgid "Find items that meet the following criteria"
 msgstr "Objekte suchen, die folgenden Kriterien entsprechen"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:913
 msgid "A_dd Filter Criteria"
 msgstr "Filter_kriterien hinzufügen"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If all criteria are met"
 msgstr "Falls alle Kriterien zutreffen"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If any criteria are met"
 msgstr "Falls irgendein Kriterium zutrifft"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:921
 msgid "_Find items:"
 msgstr "Objekte _suchen:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "All related"
 msgstr "Alle mit Bezug"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies"
 msgstr "Antworten"
 
 # CHECK
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies and parents"
 msgstr "Antworten und Vorgänger"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "No reply or parent"
 msgstr "Ohne Antwort oder Vorgänger"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:945
 msgid "I_nclude threads"
 msgstr "_Threads einschließen"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -10896,7 +11525,7 @@ msgstr "Datum fehlt."
 msgid "Missing file name."
 msgstr "Dateiname fehlt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Name fehlt."
 
@@ -10974,7 +11603,7 @@ msgstr "in der Zukunft"
 msgid "months"
 msgstr "Monate"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:193
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -10986,9 +11615,9 @@ msgstr "der aktuellen Zeit"
 msgid "the time you specify"
 msgstr "die von Ihnen angegebene Zeit"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "Wochen"
 
@@ -11004,7 +11633,7 @@ msgstr "Regel hinzufügen"
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Regelname"
 
@@ -11063,16 +11692,16 @@ msgstr "Evolution-E-Mail-Einstellungsbedienelement"
 msgid "Evolution Network configuration control"
 msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:578 ../mail/mail-component.c:579
-#: ../mail/mail-component.c:743
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-Mail"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
@@ -11082,21 +11711,20 @@ msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-#, fuzzy
 msgid "Network Preferences"
-msgstr "Editoreinstellungen"
+msgstr "Netzwerkeinstellungen"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_E-Mail"
 
 # CHECK gibt's ne Übersetzung für diese Methode?
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s-Lizenzvereinbarung"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11109,115 +11737,109 @@ msgstr ""
 " Lizenzvereinbarung für %s.\n"
 "Haken Sie das Kontrollkästchen ab, um sie zu akzeptieren.\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identität"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2041
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2049
 msgid "minu_tes"
 msgstr "Minu_ten"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Vorgaben"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sicherheit"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
 msgid "Checking for New Messages"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Vorgabe]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:970
-#: ../plugins/plugin-manager/plugin-manager.c:331
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Aktiv"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Kontoname"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: ../mail/em-composer-prefs.c:976
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Signaturskript hinzufügen"
 
-#: ../mail/em-composer-prefs.c:1039
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. 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:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11225,11 +11847,11 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Filterregeln"
 
@@ -11246,10 +11868,6 @@ msgstr "Farbe zuweisen"
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Anlagen"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11266,10 +11884,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Abgeschlossen am"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "enthält"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
@@ -11283,7 +11897,7 @@ msgid "Date sent"
 msgstr "Verschickt-Datum"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11294,10 +11908,6 @@ msgstr "Löschen"
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "enthält nicht"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "endet nicht auf"
@@ -11318,10 +11928,6 @@ msgstr "klingt nicht wie"
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Existieren nicht"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Entwurf"
@@ -11330,10 +11936,6 @@ msgstr "Entwurf"
 msgid "ends with"
 msgstr "endet auf"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existieren"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existiert"
@@ -11346,14 +11948,10 @@ msgstr "Ausdruck"
 msgid "Follow Up"
 msgstr "Folgenachricht"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Wichtig"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "ist"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "ist nach"
@@ -11366,18 +11964,6 @@ msgstr "ist vor"
 msgid "is Flagged"
 msgstr "ist markiert"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "ist größer als"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "ist kleiner als"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ist nicht"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ist nicht markiert"
@@ -11399,7 +11985,7 @@ msgstr "Unerwünscht"
 msgid "Junk Test"
 msgstr "Unerwünscht-Test"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Beschriftung"
 
@@ -11441,7 +12027,7 @@ msgstr "Klang abspielen"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Gelesen"
 
@@ -11513,10 +12099,9 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1706
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11527,11 +12112,11 @@ msgid "Unset Status"
 msgstr "Status nicht setzen"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Dann"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Aktion hin_zufügen"
 
@@ -11575,16 +12160,16 @@ msgstr "Wichtige Nachrichten"
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ungelesene Nachrichten:"
@@ -11592,31 +12177,37 @@ msgstr[1] "Ungelesene Nachrichten:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Nachrichten insgesamt:"
 msgstr[1] "Nachrichten insgesamt:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#, fuzzy
+msgid "Quota usage"
+msgstr "Nachrichten insgesamt:"
+
+#: ../mail/em-folder-properties.c:385
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Ordnereigenschaften"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "_Anlegen"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Suchordner"
 
@@ -11626,27 +12217,27 @@ msgstr "Suchordner"
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Entwürfe"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2536
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:507 ../mail/em-folder-tree.c:2556
+#: ../mail/mail-component.c:160
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Verschickt"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Ladevorgang …"
 
@@ -11665,87 +12256,79 @@ msgstr "Ladevorgang …"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:373
+#: ../mail/em-folder-tree.c:380
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:733
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:892
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:894
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:901 ../mail/message-list.c:1973
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:903 ../mail/message-list.c:1975
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:918
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ../mail/em-folder-tree.c:996 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ../mail/em-folder-tree.c:1705 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Ansicht"
-
-#: ../mail/em-folder-tree.c:2079
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "In _neuem Fenster öffnen"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2084
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen …"
 
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Verschieben …"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../mail/em-folder-tree.c:2102 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Müll leeren"
 
@@ -11754,13 +12337,13 @@ msgstr "_Müll leeren"
 msgid "Copying `%s' to `%s'"
 msgstr "»%s« wird nach »%s« kopiert"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "K_opieren"
 
@@ -11782,207 +12365,199 @@ msgstr "Ordner anlegen"
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Löschen der E-Mail gescheitert"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:579 ../mail/em-popup.c:590
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten …"
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Drucken …"
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "Löschen rü_ckgängig"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "In Ordner verschie_ben …"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Als u_ngelesen markieren"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Als u_nerwünscht markieren"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Als Folg_enachricht markieren …"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "Bes_chriftung"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Keine"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Re_gel aus Nachricht anlegen"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Suchordner über _Betreff"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Suchordner über Abse_nder"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Suchordner über _Empfänger"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Suchordner über Mailing_liste"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filter über Be_treff"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filter über Ab_sender"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filter über Em_pfänger"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filter über Ma_ilingliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Nachricht wird abgerufen …"
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "_Anrufen …"
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:616
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:640
 msgid "_Previous"
 msgstr "_Rückwärts suchen"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:645
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:650
 msgid "M_atch case"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Unsigniert"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11990,12 +12565,12 @@ msgstr ""
 "Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
 "daher nicht sichergestellt."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Gültige Signatur"
 
 # CHECK
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12003,11 +12578,11 @@ msgstr ""
 "Diese Nachricht ist signiert und gültig. Es ist daher sehr wahrscheinlich, "
 "dass der Absender der ist, der er vorgibt zu sein."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Ungültige Signatur"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12015,11 +12590,11 @@ msgstr ""
 "Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
 "Möglicherweise wurde sie bei der Übertragung verändert."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12027,11 +12602,11 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, der Absender der "
 "Nachricht konnte jedoch nicht verifiziert werden."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Signatur existiert, jedoch wird der öffentliche Schlüssel benötigt"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12039,11 +12614,11 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, jedoch ist kein "
 "passender öffentlicher Schlüssel vorhanden."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12051,11 +12626,11 @@ msgstr ""
 "Diese Nachricht ist nicht verschlüsselt. Daher kann ihr Inhalt bei der "
 "Übertragung über das Internet möglicherweise ausgespäht werden."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Schwach verschlüsselt"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12065,11 +12640,11 @@ msgstr ""
 "jedoch schwach. Daher können Dritte ihren Inhalt zwar nur schwerlich, jedoch "
 "nicht unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12077,11 +12652,11 @@ msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können Dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Stark verschlüsselt"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:963
 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 "
@@ -12091,95 +12666,90 @@ msgstr ""
 "verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1079
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
 # CHECK
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fertiggestellt am %d. %B %Y, %R"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "am %d. %b, %k:%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1461
 msgid "_View Inline"
 msgstr "_Inline (eingebettet) anzeigen"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1462
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1463
 msgid "_Fit to Width"
 msgstr "In der Breite ein_passen"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1464
 msgid "Show _Original Size"
 msgstr "In _Originalgröße anzeigen"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Anlage"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1984
 msgid "Save attachment as"
 msgstr "Anlage speichern als"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
 msgstr "Ordner zum Speichern aller Anlagen auswählen"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
 msgstr "Gewählte _speichern …"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2106
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d A_nlage"
 msgstr[1] "%d A_nlagen"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
 msgid "S_ave"
 msgstr "_Speichern"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2124
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2198
 msgid "No Attachment"
 msgstr "Keine Anlagen"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2341
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2396
 msgid "O_pen With"
 msgstr "Ö_ffnen mit"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2467
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "Evolution kann diese E-Mail nicht wiedergeben, da sie zu groß ist um sie zu "
@@ -12190,212 +12760,210 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../mail/em-format-html.c:499 ../mail/em-format-html.c:508
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "»%s« wird abgerufen"
 
-#: ../mail/em-format-html.c:920
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Unbekannter external-body-Teil."
 
-#: ../mail/em-format-html.c:928
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Fehlerhaft formatierter external-body-Teil."
 
-#: ../mail/em-format-html.c:958
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: ../mail/em-format-html.c:969
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: ../mail/em-format-html.c:992
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf ferne Daten (%s)"
 
-#: ../mail/em-format-html.c:1003
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 
-#: ../mail/em-format-html.c:1231
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: ../mail/em-format-html.c:1398
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Nachricht wird formatiert  …"
 
-#: ../mail/em-format-html.c:1550 ../mail/em-format-html.c:1614
-#: ../mail/em-format-html.c:1636 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Kopie"
 
-#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1620
-#: ../mail/em-format-html.c:1639 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Blindkopie"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1710 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1737
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1742
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1754 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Datum"
-
-#: ../mail/em-format-html.c:1777 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1870
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Diese Nachricht wurde von <b>%s</b> im Namen von <b>%s</b> gesendet"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "Von"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Antwort an"
 
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "Datum"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
 "als Quelltext angezeigt."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstützter Verschlüsselungstyp für multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message"
 msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: "
 "Unbekannter Fehler"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message"
 msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message: Unknown error"
 msgstr ""
 "Die Syntax der PGP-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Jedes Mal"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Einmal pro Tag"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Einmal pro Woche"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Einmal pro Monat"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Benutzerdefinierte Unerwünscht-Kopfzeile hinzufügen"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Name der Kopfzeile:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Wert der Kopfzeile enthält:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Enthält Wert"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Farbe"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Markierung"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-Plugin ist verfügbar und das zugehörige Programm ist installiert."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -12403,74 +12971,92 @@ msgstr ""
 "%s-Plugin ist nicht verfügbar. Bitte prüfen Sie, ob das zugehörige "
 "Programmpaket installiert ist."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Kein Unerwünscht-Plugin verfügbar"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Später"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"Der Speicherort und die Hierarchie der Evolution-E-Mail-Ordner hat sich seit "
-"Evolution 1.x verändert.\n"
-"\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "»%s« wird migriert:"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Der Ordner »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Der Ordner »%s« konnte nicht nach »%s« kopiert werden: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "»%s« konnte nicht auf vorhandene Postfächer überprüft werden: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1868
+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 ""
+"Der Speicherort und die Hierarchie der Evolution-E-Mail-Ordner hat sich seit "
+"Evolution 1.x verändert.\n"
+"\n"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Alte POP-Keep-on-Server-Daten »%s« konnten nicht geöffnet werden: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "POP-Keep-on-Server-Datenverzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP-Keep-on-Server-Daten »%s« konnten nicht kopiert werden: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2852
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Der Speicherort und die Hierarchie der Evolution-E-Mail-Ordner hat sich seit "
+"Evolution 1.x verändert.\n"
+"\n"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Lokale E-Mail-Ordner unter »%s« konnten nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2871
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12478,64 +13064,66 @@ msgstr ""
 "Die Einstellungen der vorhandenen Evolution-Installation konnten nicht "
 "gelesen werden, »evolution/config.xmldb« existiert nicht oder ist fehlerhaft."
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
 #. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:851
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "Zum Adressbuch _hinzufügen"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dieser Speicher unterstützt keine Abonnements oder sie sind nicht aktiviert."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Ordner"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "Diese _Meldung nicht mehr anzeigen."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "Nachricht"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Nachricht speichern …"
 
-#: ../mail/em-utils.c:692
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Adresse hinzufügen"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1213
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -12549,57 +13137,71 @@ msgid "Search Folder source"
 msgstr "Suchordner-Quelle"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "E-Mails verschicken und abrufen"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Send and Receive Mail\" window width"
+msgstr "E-Mails verschicken und abrufen"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "Erlaubt Evolution Textteile von begrenzter Größe anzuzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Lesebestätigung immer anfordern"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Anzahl der Sekunden, die eine Fehlermeldung in der Statusleiste angezeigt "
 "wird."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatische Emoticon-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Automatische Link-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Eingehende E-Mails daraufhin überprüfen, ob sie unerwünscht sind"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Hervorhebungsfarbe für Zitate"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Hervorhebungsfarbe für Zitate."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Vorgabehöhe des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Vorgabebreite des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Vorgabeverzeichnis für Anlagen im Nachrichteneditor"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Kürzen der Adressanzeige in den Empfängerfeldern (An/Kopie/Blindkopie)"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12607,65 +13209,89 @@ msgstr ""
 "Die Anzeige der Adressen in den Empfängerfeldern (An/Kopie/Blindkopie) auf "
 "die im Schlüssel »address_count« angegebene Anzahl reduzieren."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+#, fuzzy
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird. "
+"Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default charset in which to compose messages"
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages."
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default height of the Composer Window."
 msgstr "Die Vorgabehöhe des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the message window."
 msgstr "Die Vorgabehöhe des Nachrichtenfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the subscribe dialog."
 msgstr "Die Vorgabehöhe des Abonnementdialogs."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default value for thread expand state"
 msgstr "Vorgabewert, ob Threads ausgeklappt angezeigt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default width of the Composer Window."
 msgstr "Die Vorgabebreite des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the message window."
 msgstr "Die Vorgabebreite des Nachrichtenfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the subscribe dialog."
 msgstr "Die Vorgabebreite des Abonnementdialogs."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
+"wird"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
 "wird"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12678,13 +13304,13 @@ msgstr ""
 "markiert sind. Diese Funktion kann langsam sein falls entfernte Adressbücher "
 "(wie LDAP) für die Auto-Vervollständigung aktiviert sind."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Unerwünscht-Prüfung "
 "benutzt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12695,65 +13321,69 @@ msgstr ""
 "eine angegebene Kopfzeile auftritt, so wird hierdurch die Prüfung auf "
 "Unerwünschtheit beschleunigt."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile "
-"in der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
+"Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile in "
+"der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeverzeichnis für Anlagen im Nachrichteneditor."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Indikatoren für Rechtschreibfehler bei der Eingabe zeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Empty Junk folders on exit"
 msgstr "Unerwünscht-Ordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Trash folders on exit"
 msgstr "Müllordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle Unerwünscht-Ordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Müllordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor "
 "angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable search folders"
 msgstr "Suchordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders on startup."
 msgstr "Aktiviert die Suchordner beim Starten von Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12765,7 +13395,7 @@ msgstr ""
 "Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt dann "
 "sofort zu diesem Ordner."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12773,29 +13403,29 @@ msgstr ""
 "Legt fest, ob die Leertaste zum Blättern in der Nachrichtenvorschau, der "
 "Nachrichtenliste und den Ordnern benutzt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Verarbeiten von Nachrichten-Textteilen von begrenzter Größe aktivieren/"
 "deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12803,7 +13433,7 @@ msgstr ""
 "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu öffnen, "
 "wird er gefragt, ob er es wirklich tun will."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12812,7 +13442,7 @@ msgstr ""
 "darunter anzeigen."
 
 # CHECK - etwas holprig
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
 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 "
@@ -12823,14 +13453,35 @@ msgstr ""
 "Bonobo-Komponentenbetrachter verknüpft ist, dieser Betrachter der GNOME-MIME-"
 "Datenbank entnommen und zum Anzeigen des Inhalts verwendet."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Die Anzeige während dem Markieren mehrerer Nachrichten aktivieren/"
 "deaktivieren"
 
 # FIXME
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12838,7 +13489,7 @@ msgstr ""
 "Legt fest, ob jedes Mal vorm Setzen des Offline-Statuses gefragt werden "
 "soll, ob für den Offline-Modus synchronisiert werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12848,31 +13499,31 @@ msgstr ""
 "Nachricht in einem Suchordner die Nachricht wirklich löscht und nicht nur "
 "aus den Suchergebnissen entfernt."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Last time empty junk was run"
 msgstr "Letzte Unerwünscht-Ordner-Leerung"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty trash was run"
 msgstr "Letzte Müllleerung"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of accepted licenses"
 msgstr "Liste akzeptierter Lizenzen"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12881,12 +13532,16 @@ msgstr ""
 "enthält Zeichenketten, die Unterverzeichnisse relativ zu »/apps«/evolution/"
 "mail/accounts« angeben."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
 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."
@@ -12896,21 +13551,21 @@ msgstr ""
 "HTML-Hextriplet anzugeben ist."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste der MIME-Typen, die auf Bonobo-Komponentenbetrachter hin überprüft "
 "werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste der Protokollnamen, deren Lizenzen akzeptiert wurden."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Load images for HTML messages over http"
 msgstr "Bilder von HTML-Nachrichten per HTTP laden"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net. 1 - Load images in messages from contacts. 2 - "
@@ -12920,117 +13575,117 @@ msgstr ""
 "Niemals Bilder aus dem Netz laden, 1 - Bilder laden falls Absender im "
 "Adressbuch, 2 - Immer Bilder aus dem Netz laden."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Message Window default height"
 msgstr "Vorgabehöhe des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default width"
 msgstr "Vorgabebreite des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Stil der Nachrichtenanzeige. Zulässige Werte: »normal« (normal), »full "
 "headers« (alle Kopfzeilen), »source« (Quelltext)"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 "Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/Blindkopie"
 "( angezeigt werden"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff rückfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Legt fest, ob der Benutzer gefragt werden soll, ob er sofort offline gehen "
 "möchte"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim Löschen von Nachrichten in Suchordner"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern rückfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Vor gleichzeitigem Öffnen von 10 oder mehr Nachrichten einen Hinweis anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13038,74 +13693,74 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "rückfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld rückfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu "
 "verschicken"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Emoticons im Text erkennen und durch Bilder ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Run junk test on incoming mail."
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Search for the sender photo in local addressbooks"
 msgstr "In den lokalen Adressbüchern nach dem Photo des Absenders suchen"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show photo of the sender"
 msgstr "Photo des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13113,66 +13768,63 @@ msgstr ""
 "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der "
 "Nachrichtenliste an."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Photos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr ""
-"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird."
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Spell check inline"
+msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird. "
-"Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
+#: ../mail/evolution-mail.schemas.in.h:127
+#, fuzzy
+msgid "Spell checking color"
+msgstr "Rechtschreibprüfung"
 
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Spell check inline"
+#: ../mail/evolution-mail.schemas.in.h:128
+#, fuzzy
+msgid "Spell checking languages"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Subscribe dialog default height"
 msgstr "Vorgabehöhe des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Subscribe dialog default width"
 msgstr "Vorgabebreite des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Text message part limit"
 msgstr "Textnachrichtenteil-Begrenzung"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "Die Zeit seit der letzten Unerwünscht-Ordner-Leerung in Tagen seit dem "
 "01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Die Zeit seit der letzten Müllleerung in Tagen seit dem 01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The variable width font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -13180,7 +13832,7 @@ msgstr ""
 "Hier sind drei verschiedene Werte möglich: 0 für Fehler, 1 für Warnungen, 2 "
 "für Diagnosemeldungen."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13188,7 +13840,7 @@ msgstr ""
 "Dies entscheidet die maximale Größe des Textteils, der von Evolution "
 "formatiert wird. Die Vorgabe sind 4MB/4096kb und ist in KB angegeben."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13198,7 +13850,7 @@ msgstr ""
 "aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
 "so wird nicht auf eines der anderen Plugins zurückgegriffen."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This key is read only once and reset to false after read. This unselects the "
 "mail in the list and removes the preview for that folder."
@@ -13209,7 +13861,7 @@ msgstr ""
 "Nachrichtenliste gesetzt."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 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;"
@@ -13221,11 +13873,18 @@ msgstr ""
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "This option would help in improving the speed of fetching."
 msgstr "Beschleunigt das Abrufen."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13233,7 +13892,7 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor »…« angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13242,7 +13901,7 @@ msgstr ""
 "werden sollen. Evolution muss nach Ändern dieses Wertes hierfür neu "
 "gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13252,110 +13911,128 @@ msgstr ""
 "werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
 "Ändern dieses Wertes hierfür neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Thread the message list."
 msgstr "Die Nachrichtenliste nach Threads sortieren."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Thread the message-list"
 msgstr "Die Nachrichtenliste nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Time interval, in seconds, how often upload store changes to server."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Time interval, in seconds, how often upload store changes to server. The "
+"actual value cannot be less than 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin-Daemon und -Client verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin-Daemon und -Client verwenden (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Ausschließlich lokale Spam-Tests verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ausschließlich lokale Spam-Tests verwenden (kein DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Breite oder nebeneinander ausgerichtete Ansicht benutzen?"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Ansicht/Von-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Ansicht/Von-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Legt fest, ob die Anforderung einer Lesebestätigung standardmäßig zu jeder "
 "Nachricht hinzugefügt wird."
 
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13363,43 +14040,43 @@ msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Threads nach der letzten Nachricht im jeweiligen Thread sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm-Daten werden importiert"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution-Elm-Importeur"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "E-Mail von Elm importieren."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Zielordner:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Wählen Sie den Ordner, in den importiert werden soll"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importeur für Ordner im Berkeley-Mailbox-Format"
 
@@ -13407,7 +14084,7 @@ msgstr "Importeur für Ordner im Berkeley-Mailbox-Format"
 msgid "Importing mailbox"
 msgstr "E-Mail-Postfach wird importiert"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "»%s« wird importiert"
@@ -13417,15 +14094,15 @@ msgstr "»%s« wird importiert"
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Pine-Daten werden importiert"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolution-Pine-Importeur"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "E-Mail von Pine importieren."
 
@@ -13453,142 +14130,153 @@ msgstr "Mailingliste %s"
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Vorlage:"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d gewählt, "
 msgstr[1] "%d gewählt, "
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d gelöscht"
 msgstr[1] "%d gelöscht"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d unerwünscht"
 msgstr[1] "%d unerwünscht"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d Entwurf"
 msgstr[1] "%d Entwürfe"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d verschickt"
 msgstr[1] "%d verschickt"
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nicht verschickt"
 msgstr[1] "%d nicht verschickt"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:900
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:901
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "Neuer E-Mail-Ordner"
 
-#: ../mail/mail-component.c:908
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../mail/mail-component.c:909
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../mail/mail-component.c:1056
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Auffrischen der E-Mail-Einstellungen oder -Ordner gescheitert."
 
-#: ../mail/mail-component.c:1529
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "Fehler"
 
-#: ../mail/mail-component.c:1529
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "Fehler"
 
-#: ../mail/mail-component.c:1530
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "Warnungen und Fehler"
 
-#: ../mail/mail-component.c:1531
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "Fehlerdiagnose"
 
-#: ../mail/mail-component.c:1531
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "Fehler, Warnungen und Diagnosemeldungen"
 
-#: ../mail/mail-component.c:1641
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "Fehlerdiagnose-Protokoll"
 
-#. Translators: This is the first part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1646
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "_Fehlermeldungen in der Statusleiste für"
 
-#. Translators: This is the second part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1654
-#, fuzzy
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1743
 msgid "second(s)."
 msgstr "Sekunden anzeigen."
 
-#: ../mail/mail-component.c:1664
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "Protokollmeldungen:"
 
-#: ../mail/mail-component.c:1716
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "Protokolltyp"
 
-#: ../mail/mail-component.c:1723 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../mail/mail-component.c:1730 ../mail/message-list.c:2405
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Nachrichten"
 
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Prüfen, welche Arten unterstützt werden "
@@ -13602,7 +14290,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL wird von diesem Evolution-Build nicht unterstützt</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Photo des Absenders</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13774,10 +14462,8 @@ msgid "Ch_eck for Supported Types "
 msgstr "_Prüfen, welche Arten unterstützt werden "
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Check cu_stom headers for junk"
-msgstr ""
-"_Benutzerdefinierte Kopfzeilen für Prüfung auf Unerwünschtheit benutzen"
+msgstr "_Benutzerdefinierte Kopfzeilen auf Unerwünschtheit prüfen"
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
@@ -13842,13 +14528,13 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 "Textinhalt in E-Mails nicht formatieren wenn folgende Text_größe "
 "überschritten wird:"
 
 #: ../mail/mail-config.glade.h:72
-#, fuzzy
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
 msgstr ""
 "_Nachrichten nicht als Unerwünscht markieren, wenn der Absender im "
@@ -13989,19 +14675,25 @@ msgstr ""
 "eine Verbindung mit dem Server aufbauen"
 
 #: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Diese Einstellung wird ignoriert wenn ein Treffer für eine "
+"benutzerdefinierte Kopfzeile vorgefunden wird."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: ../mail/mail-config.glade.h:111
-#, fuzzy
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Passwort:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14009,7 +14701,7 @@ msgstr ""
 "Bitte geben Sie unten einen beschreibenden Namen für dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige verwendet."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14018,7 +14710,7 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 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 "
@@ -14029,114 +14721,117 @@ msgstr ""
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: ../mail/mail-config.glade.h:118
-#, fuzzy
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
-msgstr "_Port:"
+msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
 "nachfragen"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "An Passwort _erinnern"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "An _Passwort erinnern"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "_Nach Photo des Absenders nur in den lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "A_uswählen …"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Lese_bestätigungen verschicken:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Dicktengleiche HTML-Druckschrift wählen"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wählen"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "HTML-Proportionaldruckschrift wählen"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Server-Art: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_Signatur:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Signaturtabelle"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_yp:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14144,7 +14839,7 @@ msgstr ""
 "Diese Sprachliste enthält ausschließlich die Sprachen, für die ein "
 "Wörterbuch installiert sind."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14154,14 +14849,7 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zu Anzeigezwecken verwendet."
 
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Diese Einstellung wird ignoriert wenn ein Treffer für eine "
-"benutzerdefinierte Kopfzeile vorgefunden wird."
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14169,26 +14857,24 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Geschäftlich« oder »Persönlich«."
 
-#: ../mail/mail-config.glade.h:153
-#, fuzzy
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.glade.h:154
-#, fuzzy
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
-msgstr "Legitimation"
+msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "_Proportional:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14198,125 +14884,131 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Vor«, um zu beginnen."
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Automatic proxy configuration URL:"
 msgstr "Automatische Link-Erkennung"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Vorgabe-Unerwünscht-Plugin:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "Signat_ur beim Antworten über der Original-Nachricht behalten"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "Bilder in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local addressbook only"
+msgstr "Lokale Adressbuchordner auflisten"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Manual proxy configuration:"
 msgstr "E-Mail-Konfiguration"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: ../mail/mail-config.glade.h:176
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
 "wünschen"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nachfrage beim Abschicken von Nachrichten mit _leerem Betreff"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "A_uswählen …"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "Bildanimationen an_zeigen"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Photo des Absenders in der Nachrichtenvorschau anzeigen"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Empfängerkopfzeilen (An/Kopie/Blindkopie) _verkleinern zu "
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 #, fuzzy
 msgid "_Use system defaults"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "Adressen"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "Beschreibung"
 
@@ -14356,69 +15048,68 @@ msgstr "_Groß-/Kleinschreibung berücksichtigen"
 msgid "Co_mpleted"
 msgstr "Abges_chlossen"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "S_uchen:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Als Folgenachricht markieren"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Keiner gewählt"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Bestimmte Ordner"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "Dies ist eine Liste der von Ihnen als Folgenachricht markierten "
 "Nachrichten.\n"
-"Bitte wählen Sie eine Aktion für die Folgenachricht aus dem Menü "
-"»Markierung«."
+"Bitte wählen Sie eine Aktion für die Folgenachricht aus dem Menü »Markierung«."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "Lizenz _akzeptieren"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Fällig am:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-folder-cache.c:831
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -14465,11 +15156,11 @@ msgstr "Nachricht %d von %d wird verschickt"
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Abgeschlossen."
 
@@ -14497,67 +15188,72 @@ msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
 #: ../mail/mail-ops.c:1270
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Kontaktinformationen für %s"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "Ordner wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht wird abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d Nachricht wird gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14566,11 +15262,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14579,51 +15275,51 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto '%s' wird für Offline-Betrieb vorbereitet"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "Absagevorgang …"
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "Aktualisieren …"
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Warten …"
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
@@ -14651,17 +15347,19 @@ msgstr "Geben Sie das Passwort ein"
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Signatur bearbeiten"
+#: ../mail/mail-signature-editor.c:201
+#, fuzzy
+msgid "_Save and Close"
+msgstr "Speichern und schließen"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Geben Sie einen Namen für diese Signatur ein."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Signatur bearbeiten"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Name:"
+#: ../mail/mail-signature-editor.c:370
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "Signaturtabelle"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14671,8 +15369,7 @@ msgstr "Spool-Verzeichnis »%s« konnte nicht angelegt werden: %s"
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
-"Es wurde versucht, movemail auf eine nicht-mbox-Quelle »%s« auszuführen"
+msgstr "Es wurde versucht, movemail auf eine nicht-mbox-Quelle »%s« auszuführen"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14703,31 +15400,30 @@ msgstr "Suchordner für »%s:%s« werden aktualisiert"
 msgid "Updating Search Folders for '%s'"
 msgstr "Suchordner für »%s« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Suchordner bearbeiten"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "Es existiert bereits ein Ordner namens »{0}«. Bitte verwenden Sie einen "
 "anderen Namen."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "Es existiert bereits ein Ordner namens »{1}«. Bitte verwenden Sie einen "
 "anderen Namen."
 
 #: ../mail/mail.error.xml.h:3
+#, fuzzy
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
@@ -14738,17 +15434,19 @@ msgstr ""
 "oder abbrechen."
 
 #: ../mail/mail.error.xml.h:6
+#, fuzzy
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
-"Eine Lesebestätigung wurde für »{1}« angefordert. Soll die Bestätigung an "
-"{0} geschickt werden?"
+"Eine Lesebestätigung wurde für »{1}« angefordert. Soll die Bestätigung an {0} "
+"geschickt werden?"
 
 #: ../mail/mail.error.xml.h:7
+#, fuzzy
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
 "Es existiert bereits eine Signatur namens »{0}«. Bitte verwenden Sie einen "
 "anderen Namen."
@@ -14791,12 +15489,13 @@ msgstr ""
 "Ordnern entfernen wollen?"
 
 #: ../mail/mail.error.xml.h:14
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
-"Sind Sie sicher, dass Sie alle gelöschten Nachrichten endgültig aus dem "
-"Ordner »{0}« entfernen wollen?"
+"Sind Sie sicher, dass Sie endgültig alle gelöschten Nachrichten aus allen "
+"Ordnern entfernen wollen?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14814,11 +15513,11 @@ msgstr ""
 "Sind Sie sicher, dass Sie eine Nachricht ohne Betreff verschicken wollen?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "Grund: »{0}«."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "Grund: »{2}«."
 
 #: ../mail/mail.error.xml.h:21
@@ -14826,15 +15525,15 @@ msgid "Blank Signature"
 msgstr "Leere Signatur"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Suchordner »{0}« konnte nicht hinzugefügt werden."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Ordner »{0}« konnte nicht nach »{1}« kopiert werden."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
 msgstr "Ordner »{0}« konnte nicht angelegt werden."
 
 #: ../mail/mail.error.xml.h:25
@@ -14842,54 +15541,53 @@ msgid "Cannot create temporary save directory."
 msgstr "Temporäres Speicherverzeichnis konnte nicht angelegt werden."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Das Speicherverzeichnis konnte nicht angelegt werden. Grund: »{1}«."
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr "Ordner »{0}« konnte nicht gelöscht werden."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "Systemordner »{0}« konnte nicht gelöscht werden."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "Suchordner »{0}« konnte nicht bearbeitet werden, da er nicht vorhanden ist."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Ordner »{0}« konnte nicht nach »{1}« verschoben werden."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "Quelle »{1}« konnte nicht geöffnet werden"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "Quelle »{2}« konnte nicht geöffnet werden."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "Ziel »{2}« konnte nicht geöffnet werden."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 "Die Lizenzdatei »{0}« konnte wegen einem Installationsproblem nicht gelesen "
 "werden. Die Nutzung dieses Providers ist nicht möglich, solange Sie dessen "
 "Lizenz nicht akzeptiert haben."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "»{0}« konnte nicht in »{1}« umbenannt werden."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Systemordner »{0}« konnte nicht umbenannt oder verschoben werden."
 
 #: ../mail/mail.error.xml.h:37
@@ -14897,18 +15595,23 @@ msgid "Cannot save changes to account."
 msgstr "Änderungen am Konto konnten nicht gespeichert werden."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "Speichern in den Ordner »{0}« gescheitert."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "Speichern in die Datei »{0}« gescheitert."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr "Signaturskript »{0}« konnte nicht festgelegt werden."
 
 #: ../mail/mail.error.xml.h:41
+#, fuzzy
+msgid "Check Junk Failed"
+msgstr "Über_prüfung auf unerwünschte Nachrichten"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14917,46 +15620,44 @@ msgstr ""
 "Erinnerung: Bei Passwörtern wird zwischen Groß- und Kleinschreibung "
 "unterschieden. Möglicherweise ist Ihre Dauerumschalttaste aktiv."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "»{0}« löschen?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "Konto löschen?"
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Gelöscht: "
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Nachrichten im Suchordner »{0}« löschen?"
+msgid "Delete account?"
+msgstr "Konto löschen?"
 
 #: ../mail/mail.error.xml.h:46
-msgid "Delete messages in Search Folder?"
+#, fuzzy
+msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Nachrichten im Suchordner löschen?"
 
 #: ../mail/mail.error.xml.h:47
+msgid "Delete messages in Search Folder?"
+msgstr "Nachrichten im Suchordner löschen?"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Änderungen verwerfen?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Nicht l_öschen"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Nicht löschen"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Nicht deaktivieren"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Soll diese Aktion auch in den Unterordnern ausgeführt werden?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -15067,39 +15768,31 @@ msgid "Mark all messages as read"
 msgstr "Alle Nachrichten als gelesen markieren"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Sollen alle Nachrichten in Unterordnern als gelesen markiert werden?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Ordner fehlt."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Keine Quellen gewählt."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Nur im der_zeitigen Ordner"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Zu viele Nachrichten auf einmal zu öffnen, könnte eine längere Zeit in "
 "Anspruch nehmen."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr ""
 "Bitte überprüfen Sie ihre Kontoeinstellungen und versuchen Sie es erneut."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Aktivieren Sie bitte das Konto oder verwenden Sie ein anderes Konto zum "
 "Senden."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 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."
@@ -15108,7 +15801,7 @@ msgstr ""
 "E-Mail-Adressen suchen, indem Sie den An-Knopf neben dem Eingabefeld "
 "anklicken."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15119,36 +15812,47 @@ msgstr ""
 "{0}\n"
 "Dennoch abschicken?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Geben Sie bitte einen eindeutigen Namen für diese Signatur ein."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Bitte warten."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+#, fuzzy
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners »{0}«."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Abfrage des Servers"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Abfrage des Servers nach einer Liste der unterstützten "
 "Legitimationsmechanismen."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Lesebestätigung angefordert."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ordner »{0}« und alle seine Unterordner wirklich löschen?"
 
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "Datei importieren"
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Suchordner automatisch aktualisiert."
@@ -15200,7 +15904,7 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Der bzw. die folgende(n) Suchordner:\n"
@@ -15214,7 +15918,7 @@ msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Die folgende(n) Filterregel(n):\n"
@@ -15339,7 +16043,8 @@ msgstr ""
 "das Wählen aller lokalen, aller fernen Ordner oder beider."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+#, fuzzy
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Das Anmelden am Server »{0}« als »{0}« ist gescheitert."
 
 #: ../mail/mail.error.xml.h:135
@@ -15362,77 +16067,92 @@ msgstr "_Säubern"
 msgid "_Open Messages"
 msgstr "Nachrichten ö_ffnen"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "im derzeitigen Ordner und in _Unterordnern"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "Weitergeleitet"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Höher"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../mail/message-list.c:1613 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1620 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1629 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1641 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1649 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1651 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3837
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4178
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"In dieser Ansicht existieren keine anzuzeigenden Einträge."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Fällig am "
@@ -15462,39 +16182,39 @@ msgstr "Nachrichten verschicken"
 msgid "Size"
 msgstr "Größe"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Anrufen"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Nicht weiterleiten"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Folgenachricht"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Überprüfen"
 
@@ -15531,14 +16251,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Stellt Kernfunktionalität für lokale Adressbücher zur Verfügung."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Anlagenerinnerung-Plugin aktivieren"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Anlagenerinnerung aktivieren."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15546,7 +16258,7 @@ msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
@@ -15554,14 +16266,11 @@ msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "An vergessene Anlagen _erinnern"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
@@ -15588,8 +16297,8 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Nachricht besitzt keine Anlagen"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
 msgstr "Nachricht _bearbeiten"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
@@ -15604,27 +16313,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Audio-Einbettungs-Plugin"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "Name des Evolution-Sicherungsarchivs auswählen"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "Evolution nach Sicherung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Evolution-Sicherungsarchiv zur Wiederherstellung wählen"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "Evolution nach Wiederherstellung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15634,96 +16343,122 @@ msgstr ""
 "Alle E-Mails, Kalender, Aufgaben, Notizen und Adressbücher sowie alle\n"
 "persönlichen Einstellungen, Filter etc. können wiederhergestellt werden."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "Evolution aus _Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Evolution-Archiv zur Wiederherstellung wählen:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "Eine Datei zum Wiederherstellen wählen"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Evolution-Sicherungsverzeichnis"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Evolution-Wiederherstellungsverzeichnis"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Evolution neu starten"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "Mit grafischer Oberfläche"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sichern der Evolution-Daten (E-Mails, Kontakte, Kalender, Aufgaben, Notizen)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Sicherung komplett"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Evolution-Daten sichern"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Dateien aus dem Sicherungsarchiv extrahieren"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Entfernen der temporären Sicherungsdateien"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
+#: ../plugins/backup-restore/backup.c:494
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Evolution-Daten sichern"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Evolution wird neugestartet"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15760,14 +16495,24 @@ msgstr ""
 "soll."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Berechtigungen des Delegaten"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Ungültiges Evolution-Archiv"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Bitte wählen Sie ein gültiges Evolution-Archiv zur Wiederherstellung."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15801,8 +16546,8 @@ msgstr "Automatische Kontakte"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#, fuzzy
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
 "_Automatische Erstellung von Adressbucheinträgen bei Beantwortung von E-Mails"
 
@@ -15816,9 +16561,8 @@ msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und Bilder regelmäßig mit der Pidgin-Buddy-Liste "
 "abgleichen"
@@ -15846,7 +16590,28 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Während des Druckens ist ein Fehler aufgetreten"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Nachrichtentext nach _Unicode konvertieren"
 
@@ -15880,12 +16645,12 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "_SSL verwenden"
 
@@ -15905,18 +16670,18 @@ msgstr "Lokale Kalender"
 msgid "Provides core functionality for local calendars."
 msgstr "Stellt Kernfunktionalität für lokale Kalender zur Verfügung."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
+#: ../plugins/google-account-setup/google-source.c:381
 #, fuzzy
 msgid "Re_fresh:"
 msgstr "Auf_frischen"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Sichere Verbindung"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Benutzername:"
 
@@ -16020,14 +16785,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Möchten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Als _Vorgabeordner markieren"
+msgid "Mark as _default address book"
+msgstr "Als _Vorgabeadressbuch markieren"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "Als _Vorgabekalender markieren"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "Als _Vorgabeaufgabenliste markieren"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "Als _Vorgabenotizliste markieren"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -16041,6 +16817,55 @@ msgstr ""
 "Stellt Funktionalität zum Markieren von Kalendern und Adressbüchern als "
 "Vorgabe zur Verfügung."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "Benutzerdefinierte _Kopfzeile"
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+#, fuzzy
+msgid "Key"
+msgstr "Kenia"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Benutzerdefinierte E-Mail-Kopfzeile"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr "Fügt ausgehenden Nachrichten eine benutzerdefinierte Kopfzeile hinzu."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Benutzerdefinierte Kopfzeile"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr "Liste der benutzerdefinierten Kopfzeilen"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"Diese Liste legt die benutzerdefinierten Kopfzeilen fest, die ausgehenden "
+"Nachrichten hinzugefügt werden können. Das Format für eine Kopfzeile und "
+"ihren Wert ist: Name der Kopfzeile gefolgt von »=« und die Werte, die durch "
+"ein Semikolon (»;«) getrennt werden"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Ordner eines anderen Benutzers öffnen"
@@ -16058,12 +16883,12 @@ msgid "_User:"
 msgstr "_Benutzer:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Sicheres Passwort"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16071,11 +16896,11 @@ msgstr ""
 "Diese Option stellt eine Verbindung mit dem Exchange-Server her, wobei eine "
 "sichere Passwort-Legitimation (NTLM) verwendet wird."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Klartext-Passwort"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16083,11 +16908,11 @@ msgstr ""
 "Diese Option stellt eine Verbindung mit dem Exchange-Server her, wobei ein "
 "einfaches Klartext-Passwort verwendet wird."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Nicht im Büro"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16095,77 +16920,82 @@ msgstr ""
 "Die unten angegebene Nachricht wird automatisch an jede Person verschickt,\n"
 "von der Sie eine E-Mail erhalten, während Sie nicht im Büro sind."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Ich bin nicht im Büro"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Ich bin im Büro"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Passwort für das Exchange-Konto ändern"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Passwort ändern"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Delegierungseinstellungen für das Exchange-Konto verwalten"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Delegierungsassistent"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Verschiedenes"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Die Größe aller Exchange-Ordner anzeigen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Ordnergröße"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-Einstellungen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:674
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:700
 msgid "A_uthenticate"
 msgstr "_Legitimation"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:721
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_E-Mail"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:922
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "Ch_eck for Supported Types"
 msgstr "_Prüfen, welche Arten unterstützt werden"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1048
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16184,7 +17014,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -16192,7 +17022,7 @@ msgstr ""
 "Das aktuelle Passwort stimmt nicht mit dem vorhandenen Passwort Ihres Kontos "
 "überein. Bitte geben Sie das korrekte Passwort ein."
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr ""
 "Die beiden Passworte stimmen nicht überein. Bitte geben Sie sie erneut ein."
@@ -16218,33 +17048,33 @@ msgstr "Ihr aktuelles Passwort ist abgelaufen. Bitte ändern Sie es jetzt."
 msgid "Your password will expire in the next %d days"
 msgstr "Ihr Passwort wird in den nächsten %d Tagen ablaufen"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Bearbeitung (lesen, erstellen, bearbeiten)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Erstellung (lesen, erstellen)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Einsicht (nur lesen)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Berechtigungen des Delegaten"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Berechtigungen für %s"
@@ -16252,7 +17082,7 @@ msgstr "Berechtigungen für %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16263,67 +17093,67 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Sie haben nun folgende Zugriffserlaubnis auf meine Ordner:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "Es ist Ihnen zudem erlaubt, meine privaten Elemente zu sehen."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr ""
 "Es ist Ihnen allerdings nicht erlaubt, meine privaten Elemente zu sehen."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Sie wurden als Delegat für %s eingetragen"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Delegieren an"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Den Delegaten %s entfernen?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Zugriff auf Active Directory gescheitert"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Eigener Eintrag wurde in Active Directory nicht gefunden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Delegat %s wurde in Active Directory nicht gefunden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Delegat %s konnte nicht entfernt werden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Liste der Delegaten konnte nicht aktualisiert werden."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Delegat %s konnte nicht hinzugefügt werden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Fehler beim Lesen der Delegatenliste."
 
@@ -16372,26 +17202,25 @@ msgstr "_Berechtigungen zusammenfassen"
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Berechtigungen …"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Ordnername"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Ordnergröße"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
 msgid "User"
-msgstr "_Benutzer"
+msgstr "Benutzer"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Ordner eines anderen Benutzers abonnieren"
@@ -16400,20 +17229,20 @@ msgstr "Ordner eines anderen Benutzers abonnieren"
 msgid "Exchange Folder Tree"
 msgstr "Exchange-Ordnerbaum"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "Ordner abbestellen …"
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Den Ordner »%s« wirklich abbestellen?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Abbestellen von »%s«"
@@ -16478,17 +17307,18 @@ msgstr "Ihr Passwort wird in 7 Tagen ablaufen …"
 msgid "_Change Password"
 msgstr "Passwort ä_ndern"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Erlaubnis verweigert.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Benutzer hinzufügen:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
@@ -16610,11 +17440,11 @@ msgstr "_Benutzer"
 msgid "button-user"
 msgstr "button-user"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Benutzer auswählen"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Adressbuch …"
 
@@ -16627,8 +17457,9 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Kalender eines anderen Benutzers abonnieren"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+#, fuzzy
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
 "Ein Plugin, das eine Reihe von Exchange-spezifischen Abläufen und Funktionen "
@@ -16724,10 +17555,14 @@ msgid "Could not update out-of-office state"
 msgstr "Abwesenheitsstatus konnte nicht aktualisiert werden"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange-Konto ist offline."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16755,32 +17590,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Aktualisierung der Delegaten gescheitert:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Ordner existiert bereits"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Ordner existiert nicht"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Ordner offline"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Globaler Katalog-Server ist nicht erreichbar"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16788,81 +17623,81 @@ msgstr ""
 "Falls OWA unter einem anderen Pfad läuft, muss dies im Konten-"
 "Konfigurationsdialog angegeben werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "Das Postfach für {0} befindet sich nicht auf diesem Server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 "Stellen Sie sicher, dass die Adresse korrekt ist und versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Stellen Sie sicher, dass der Name des Servers korrekt geschrieben ist und "
 "versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Stellen Sie sicher, dass Benutzername und Passwort korrekt sind und "
 "versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Für dieses Konto ist kein globaler Katalog-Server konfiguriert."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Kein Postfach für den Benutzer {0} auf {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Benutzer {0} nicht vorhanden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Das Passwort wurde erfolgreich geändert."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Bitte geben Sie die Benutzerkennung des Delegaten ein oder wählen Sie die "
 "Option Als Delegat senden ab."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
 "werden?"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr ""
 "Bitte starten Sie Evolution neu, damit die Änderungen angewendet werden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Bitte wählen Sie einen Benutzer."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Der Server hat das Passwort abgelehnt, da es zu einfach ist."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Das Exchange-Konto wird deaktiviert, sobald Sie Evolution beenden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Das Exchange-Konto wird entfernt, sobald Sie Evolution beenden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Der Exchange-Server ist mit dem Exchange-Connector nicht kompatibel."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16870,7 +17705,7 @@ msgstr ""
 "Auf dem Server läuft Exchange 5.5. Exchange-Connector \n"
 "unterstützt nur Microsoft Exchange 2000 und 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16884,42 +17719,42 @@ msgstr ""
 "\n"
 "Oder Sie haben nur ein falsches Passwort eingegeben."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Versuchen Sie es mit einem anderen Passwort noch einmal."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr ""
 "Der Benutzer konnte nicht zur Zugriffskontrollliste hinzugefügt werden:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Bearbeitung der Delegaten nicht möglich."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Unbekannter Fehler beim Suchen von {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Unbekannte Art"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Nicht unterstützte Aktion"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Sie nähern sich Ihrem Speicherplatzlimit zum Ablegen von Nachrichten auf "
 "diesem Server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
@@ -16927,21 +17762,21 @@ msgstr ""
 "Es ist Ihnen nur gestattet, Nachrichten im Namen eines Delegaten "
 "gleichzeitig zu verschicken."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Sie können sich nicht selbst als Ihren eigenen Delegaten angeben."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Sie haben Ihr Speicherplatzlimit zum Ablegen von Nachrichten auf diesem "
 "Server überschritten."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Sie dürfen nur ein einziges Exchange-Konto konfigurieren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16949,7 +17784,7 @@ msgstr ""
 "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Versuchen Sie durch "
 "das Löschen einiger Nachrichten etwas Platz zu schaffen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16957,7 +17792,7 @@ msgstr ""
 "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Sie sind jetzt nicht "
 "mehr in der Lage, Nachrichten zu senden oder zu empfangen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16966,19 +17801,19 @@ msgstr ""
 "Speicherplatz durch das Löschen einiger Nachrichten freigemacht wurde, "
 "werden Sie wieder Nachrichten verschicken können."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Ihr Passwort ist abgelaufen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} kann nicht zu einer Zugriffskontrollliste hinzugefügt werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} ist bereits ein Delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} befindet sich bereits in der Liste"
 
@@ -16990,6 +17825,15 @@ msgstr "Aufgaben eines anderen Benutzers abonnieren"
 msgid "Check folder permissions"
 msgstr "Ordnerberechtigungen überprüfen"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#, fuzzy
+msgid "Default External Editor"
+msgstr "Externer Editor"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
@@ -17003,6 +17847,27 @@ msgstr ""
 msgid "External Editor"
 msgstr "Externer Editor"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "Temporäres Speicherverzeichnis konnte nicht angelegt werden."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in External Editor"
 msgstr "Im externen Editor verfassen"
@@ -17011,6 +17876,16 @@ msgstr "Im externen Editor verfassen"
 msgid "Compose messages using an external editor"
 msgstr "E-Mails mit einem externen Editor verfassen"
 
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
 #: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Wählen Sie eine 48*48-Pixel-PNG-Datei kleiner als 700 Bytes"
@@ -17019,7 +17894,7 @@ msgstr "Wählen Sie eine 48*48-Pixel-PNG-Datei kleiner als 700 Bytes"
 msgid "PNG files"
 msgstr "PNG-Dateien"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "_Gesicht"
 
@@ -17056,20 +17931,39 @@ msgstr "Ordner abbestellen"
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>Mitglieder</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+#, fuzzy
+msgid "Username:"
+msgstr "_Benutzername:"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+#, fuzzy
+msgid "Update every"
+msgstr "Abfrage wird aktualisiert"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "Ein Plugin zum Einrichten des Google-Kalenders."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google-Quellen"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Checkliste"
 
@@ -17149,6 +18043,17 @@ msgid "_Junk List"
 msgstr "_Unerwünscht-Liste"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "Nachrichtenstatus"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr ""
 "Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
@@ -17156,7 +18061,7 @@ msgstr ""
 "Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt dann "
 "sofort zu diesem Ordner."
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "E-Mail zurückziehen"
 
@@ -17164,12 +18069,6 @@ msgstr "E-Mail zurückziehen"
 msgid "Add Send Options to groupwise messages"
 msgstr "Versandoptionen zu GroupWise-Nachrichten hinzufügen"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Versandoptionen"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Ein Plugin für die Funktionen von GroupWise-Konten."
@@ -17194,10 +18093,9 @@ msgstr "Die gewählte Nachricht in eine neue Aufgabe umwandeln"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
-#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
 msgid "Invalid user"
-msgstr "Ungültige Signatur"
+msgstr "Ungültiger Benutzer"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
 #, fuzzy
@@ -17205,7 +18103,7 @@ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Speichern in die Datei »{0}« gescheitert."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 #, fuzzy
 msgid "Specify User"
 msgstr "Benutzer auswählen"
@@ -17227,9 +18125,8 @@ msgstr ""
 "anderen Namen."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-#, fuzzy
 msgid "Account Already Exists"
-msgstr "Signatur existiert bereits"
+msgstr "Konto existiert bereits"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
@@ -17237,32 +18134,27 @@ msgid ""
 "try again."
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 #, fuzzy
-msgid "All instances"
-msgstr "Alle Instanzen"
+msgid "This is a recurring meeting"
+msgstr "Dies zu einem wiederkehrenden Ereignis machen"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
 #, fuzzy
-msgid "This instance"
-msgstr "Nur diese Instanz"
+msgid "Would you like to accept it?"
+msgstr "Wollen Sie die vorgenommenen Änderungen speichern?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
-msgid "This is a recurring meeting"
-msgstr "Dies zu einem wiederkehrenden Ereignis machen"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-#, fuzzy
-msgid "What would you like to {0}?"
+msgid "Would you like to decline it?"
 msgstr "Wollen Sie die vorgenommenen Änderungen speichern?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 #, fuzzy
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "Automatisches Speichern in Datei »{0}« gescheitert."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr ""
 
@@ -17364,9 +18256,9 @@ msgstr "<b>Kontoname</b>"
 msgid "Proxy Login"
 msgstr "Vertretungsanmeldung"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17375,20 +18267,20 @@ msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "_Vertretungsanmeldung …"
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto online ist."
 
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto aktiviert ist."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Benutzer"
 
@@ -17404,16 +18296,16 @@ msgstr "Neue Ordner_freigabe …"
 msgid "Sharing"
 msgstr "Freigeben"
 
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
 #, fuzzy
 msgid "Custom Notification"
 msgstr "Ausrichtung"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Hinzufügen   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Ändern"
 
@@ -17478,11 +18370,11 @@ msgstr "Ein Plugin zum Einrichten von Hula-Kalenderquellen."
 msgid "Hula Account Setup"
 msgstr "Hula-Kontoeinrichtung"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Benutzerdefinierte Kopfzeilen"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP-Kopfzeilen"
 
@@ -17536,28 +18428,28 @@ msgstr "Ein Plugin für die Funktionen von IMAP-Konten."
 msgid "IMAP Features"
 msgstr "IMAP-Funktionen"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "In Kalender i_mportieren …"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "In Aufgaben i_mportieren"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS importieren"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Aufgabenliste auswählen"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Kalender auswählen"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "_Importieren"
 
@@ -17595,8 +18487,8 @@ msgstr ""
 "Evolution konnte keinen iPod zum Synchronisieren finden. Entweder der iPod "
 "ist nicht angeschlossen oder er ist ausgeschaltet."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-Format (.ics)"
 
@@ -17736,13 +18628,13 @@ msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1372
-#: ../plugins/itip-formatter/itip-formatter.c:1387
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1373
-#: ../plugins/itip-formatter/itip-formatter.c:1388
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17750,15 +18642,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gültiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1423
-#: ../plugins/itip-formatter/itip-formatter.c:1441
-#: ../plugins/itip-formatter/itip-formatter.c:1523
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1424
-#: ../plugins/itip-formatter/itip-formatter.c:1442
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17766,11 +18658,11 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1453
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1454
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17778,229 +18670,229 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2157
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2372
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2382
-#: ../plugins/itip-formatter/itip-formatter.c:2414
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2397
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Heute"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "Heute %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "Heute %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "Heute %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "Morgen"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgen %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "Morgen %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Bitte antworten Sie im Namen von <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Erhalten im Namen von <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 "<b>%s</b> hat durch %s folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> hat folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> hat folgende Besprechung an Sie delegiert:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> wünscht durch %s Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> wünscht Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> wünscht durch %s zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wünscht zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18009,7 +18901,7 @@ msgstr ""
 "<b>%s</b> durch %s wünscht, aktuelle Informationen zu folgender Besprechung "
 "zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -18017,82 +18909,82 @@ msgstr ""
 "<b>%s</b> wünscht, aktuelle Informationen zu folgender Besprechung zu "
 "erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> durch %s hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> hat durch %s folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> hat folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> durch %s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> hat durch %s folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> hat folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> hat durch %s folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> hat folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> wünscht die Zuweisung folgender Aufgabe an %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> hat Ihnen durch %s eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> hat Ihnen eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> wünscht durch %s zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18101,7 +18993,7 @@ msgstr ""
 "<b>%s</b> durch %s wünscht aktuelle Informationen zu folgender zugewiesener "
 "Aufgabe zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18110,7 +19002,7 @@ msgstr ""
 "<b>%s</b> wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe "
 "zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18118,23 +19010,23 @@ msgstr ""
 "<b>%s</b> durch %s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe "
 "geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> hat folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18142,103 +19034,103 @@ msgstr ""
 "<b>%s</b> durch %s hat folgende Änderungen an der Aufgabenzuweisung "
 "vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> hat die folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> hat durch %s folgende Notiz veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> hat folgende Notiz veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> wünscht durch %s zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> wünscht zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> hat durch %s folgende gemeinsame Notiz gelöscht:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> hat folgende gemeinsame Notiz gelöscht:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "Ab_lehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "An_nehmen"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "_Vorläufig"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "Alles anneh_men"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "Informationen über_mitteln"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "A_ktualisieren"
 
@@ -18397,12 +19289,22 @@ msgstr ""
 "Legt fest, ob nur über Nachrichten im Eingangsordner benachrichtigt werden "
 "soll."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Eine _D-Bus-Nachricht erzeugen"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Benachrichtigung bei neuen E-Mails"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Benachrichtigung bei neuen E-Mails"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18413,55 +19315,55 @@ msgid_plural ""
 msgstr[0] "Sie haben %d neue Nachricht in %s."
 msgstr[1] "Sie haben %d neue Nachrichten in %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Sie haben %d neue Nachricht."
 msgstr[1] "Sie haben %d neue Nachrichten."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "Neue E-Mail"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "Symbol im _Benachrichtigungsfeld anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "_Blinkendes Symbol im Benachrichtigungsfeld"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "Popup-_Nachricht zusammen mit Symbol anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "Klang_datei abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "A_bspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur über neue Nachrichten im _Eingangsordner benachrichtigen."
 
@@ -18609,9 +19511,10 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Die Nachricht an die Mailingliste schicken?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18696,6 +19599,28 @@ msgstr "Liste _abonnieren"
 msgid "_Unsubscribe from List"
 msgstr "Liste _abbestellen"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "Sollen alle Nachrichten in Unterordnern als gelesen markiert werden?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "Soll diese Aktion auch in den Unterordnern ausgeführt werden?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "Alle Nachrichten als gelesen markieren"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "im derzeitigen Ordner und in _Unterordnern"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "Derzeitiger Ordner"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Alles als gelesen markieren"
@@ -18738,7 +19663,7 @@ msgstr "Ein Plugin zur Verwaltung der Plugin-Aktivierungszustände."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Plugin-Verwaltung"
 
@@ -18750,33 +19675,24 @@ msgstr "Plugins aktivieren und deaktivieren"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Beschreibung"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Konfiguration"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Hinweis: Einige Änderungen werden erst nach einem Neustart wirksam."
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Überblick"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Für dieses Plugin bestehen keine Konfigurationsoptionen."
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -18802,43 +19718,22 @@ msgstr "Einfacher Textmodus"
 msgid "Prefer plain-text"
 msgstr "Einfachen Text bevorzugen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "HTML anzeigen, wenn vorhanden"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Einfachen Text bevorzugen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Immer als einfachen Text anzeigen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML-_Modus"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr ""
-"Bereitstellung einer Möglichkeit zum Drucken von E-Mails aus dem Editor "
-"heraus."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Nachricht drucken"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "Druck_vorschau"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Nachricht drucken"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution-Profiler"
@@ -18863,13 +19758,7 @@ msgstr "Orte"
 msgid "_Publish Calendar Information"
 msgstr "Kalenderinformationen verö_ffentlichen"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Geben Sie das Passwort für »%s« ein"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Sind Sie sicher, dass Sie diese URL entfernen wollen?"
 
@@ -18957,15 +19846,79 @@ msgstr ""
 "iCal\n"
 "Verfügbarkeit"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Telefon, privat"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#, fuzzy
+msgid "Python Loader"
+msgstr "Mono-Loader"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (eingebaut)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin-Unerwünscht-Plugin"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"Fehler bei »%s«:\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "Die Versandoptionen sind nicht verfügbar."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dies erhöht die Zuverlässigkeit des Filters, verlangsamt ihn jedoch"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "Zusätzliche _Ferntests durchführen"
 
@@ -18993,7 +19946,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "Anlagen speichern"
 
@@ -19005,16 +19958,15 @@ msgstr "Anlagen speichern …"
 msgid "Save all attachments"
 msgstr "Alle Anlagen speichern"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Basisnamen zum Speichern festlegen"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME-Typ"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Speichern"
 
@@ -19022,79 +19974,79 @@ msgstr "Speichern"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%d.%m.%Y %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Beschreibungsliste"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Kategorienliste"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Kommentarliste"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Angelegt"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Anfang"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Ende"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "Prozent abgeschlossen"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Teilnehmerliste"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Geändert"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Erweiterte Einstellungen für das CSV-Format"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Einen Kopf voranstellen"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Variablentrennzeichen:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Eintragstrennzeichen:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Variablen einschließen in:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparierte Variablen (.csv)"
 
@@ -19117,15 +20069,15 @@ msgstr "Auf Datenträger _speichern"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%d.%m.%YT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF-Format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Zieldatei wählen"
 
@@ -19150,7 +20102,8 @@ msgid "Show _only this Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
+#, fuzzy
+msgid "A plugin that manages the Startup wizard."
 msgstr "Ein Plugin zur Bereitstellung eines Einrichtungsassistenten."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
@@ -19183,24 +20136,24 @@ msgid "Importing files"
 msgstr "Dateien werden importiert"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte wählen Sie die Informationen, die Sie importieren wollen:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "Daten werden importiert."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -19223,6 +20176,34 @@ msgstr "Betreffsbezogenes Threading der Nachrichten"
 msgid "F_all back to threading messages by subject"
 msgstr "Zurückfallen auf be_treffsbezogenes Threading der Nachrichten"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
+"sucht."
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "Tätigkeit"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Als Entwurf speichern"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "Als Entwurf speichern"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Ein Plugin, welches ytnef benutzt, um tnef-Anlagen zu dekodieren."
@@ -19248,119 +20229,115 @@ msgid "Evolution Test component"
 msgstr "Evolution-Testkomponente"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Eine Textbeschreibung der derzeitigen Druckereinstellungen."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
 msgid "Automatic proxy configuration URL"
 msgstr "Automatische Link-Erkennung"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr ""
 "Legt fest, ob die Wiederabsturzverhinderung gestartet werden soll oder nicht."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Voreingestellte Seitenleistenbreite"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Voreingestellte Fensterhöhe"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Voreingestllter Fensterzustand"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Voreingestellte Fensterbreite"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "Passwort eingeben"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "Kennung oder Alias der Komponente, die per Vorgabe beim Start angezeigt "
 "werden soll."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username/password combo is defined by \"/apps/evolution/shell/network_config/"
 "authentication_user\" and locally stored password in .gnome2_private/."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Zuletzt aktualisierte Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste der Pfade für Ordner, die für eine Offline-Benutzung auf der Platte "
 "synchronisiert werden sollen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 #, fuzzy
 msgid "Proxy configuration mode"
 msgstr "Konfiguration"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19368,27 +20345,27 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Absturzverhinderung-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Statusleiste ist sichtbar"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19396,19 +20373,19 @@ msgstr ""
 "Die Konfigurationsversion von Evolution mit Haupt-, Unter- und "
 "Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Die Vorgabehöhe des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Die Vorgabebreite des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Die Vorgabebreite der Seitenleiste in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19416,47 +20393,47 @@ msgstr ""
 "Die zuletzt aktualisierte Konfigurationsversion von Evolution mit Haupt-, "
 "Unter- und Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"Der Stil der Fensterknöpfe. Mögliche Einstellungen sind »text«, »icons«, "
-"»both« und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der "
-"GNOME-Einstellungen festgelegt."
+"Der Stil der Fensterknöpfe. Mögliche Einstellungen sind »text«, »icons«, »both« "
+"und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der GNOME-"
+"Einstellungen festgelegt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19464,70 +20441,70 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Werkzeugleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "Zuletzt aktualisierte Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Soll Evolution im Offline- statt im Online-Modus gestartet werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr ""
 "Legt fest, ob die Wiederabsturzverhinderung durchgeführt werden soll oder "
 "nicht"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Soll das Fenster maximiert werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Soll die Seitenleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Soll der Warndialog in Evolution-Entwicklerversionen nicht angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr ""
 "Legt fest, ob der Warndialog der Wiederabsturzverhinderung angezeigt werden "
 "soll."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Sollen die Fensterknöpfe angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Fensterknopfstil"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Fensterknöpfe sind sichtbar"
 
@@ -19544,11 +20521,11 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Klicken Sie auf OK, um diese Verbindungen zu schließen und offline zu gehen"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "Wählen Sie den auszuführenden Importeur:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -19559,14 +20536,14 @@ msgstr ""
 "Wählen Sie die Datei, die Sie in Evolution importieren wollen und legen Sie "
 "anhand der Liste den Dateityp fest.\n"
 "\n"
-"Falls er Ihnen unbekannt ist, können Sie »Automatisch« wählen. Evolution "
-"wird dann versuchen, ihn selbst zu bestimmen."
+"Falls er Ihnen unbekannt ist, können Sie »Automatisch« wählen. Evolution wird "
+"dann versuchen, ihn selbst zu bestimmen."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "Wählen Sie das Ziel dieses Imports"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19579,80 +20556,60 @@ msgstr ""
 "gefunden. Klicken Sie bitte den »Zurück«-Knopf an, falls\n"
 "Sie es noch einmal versuchen wollen.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus ä_lteren Programmen importieren"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Evolution-Einstellungen"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Kein Ordnername angegeben."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Ordnername darf das Slash-Zeichen »/« nicht enthalten."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' und '..' sind reservierte Ordnernamen."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
 "sein."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Fehler beim Ausführen von %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Kai Lahmann <kl@linuxfaqs.de>\n"
@@ -19664,75 +20621,81 @@ msgstr ""
 "Christian Kintner <mail@christian-kintner.de>\n"
 "Andre Klapper <ak-47@gmx.net>"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution-Webseite"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Fehler beim Öffnen der FAQ-Webseite."
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um offline "
 "zu arbeiten."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution geht gerade offline."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 "Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um online "
 "zu arbeiten."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "Unbekannter Systemfehler."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Neu"
 
@@ -19789,7 +20752,7 @@ msgstr ""
 "Dateien in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19828,7 +20791,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19836,19 +20799,19 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "Evolution-Wiederabsturzverhinderung"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "Ig_norieren"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19860,39 +20823,39 @@ msgstr ""
 "nicht angezeigt. Dieser kann wieder unter dem Menüpunkt\n"
 "»Ansicht« aktiviert werden.\n"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "Diese _Meldung nicht mehr anzeigen"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Remigrierung von Evolution 1.4 erzwingen"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
@@ -19951,8 +20914,8 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
-"Sie sind im Begriff, den gesamten Inhalt des Ordners »evolution« dauerhaft "
-"zu löschen.\n"
+"Sie sind im Begriff, den gesamten Inhalt des Ordners »evolution« dauerhaft zu "
+"löschen.\n"
 "\n"
 "Es ist empfehlenswert, vor dem Löschen der alten Daten manuell "
 "sicherzustellen, dass alle E-Mail-, Kontakt- und Kalenderdaten vorhanden "
@@ -19974,9 +20937,9 @@ msgstr ""
 "gespeichert.\n"
 "\n"
 "Falls Sie sich dafür entscheiden, diese Daten zu entfernen, gehen die "
-"gesamten Daten im Ordner »evolution« dauerhaft verloren. Falls Sie sich "
-"dafür entscheiden, diese Daten beizubehalten, können Sie den Inhalt von "
-"»evolution« jederzeit manuell entfernen.\n"
+"gesamten Daten im Ordner »evolution« dauerhaft verloren. Falls Sie sich dafür "
+"entscheiden, diese Daten beizubehalten, können Sie den Inhalt von »evolution« "
+"jederzeit manuell entfernen.\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -20046,7 +21009,7 @@ msgstr ""
 "Falls Sie sich dafür entscheiden, fortzufahren, können Sie möglicherweise "
 "auf einen Teil Ihrer alten Daten nicht mehr zugreifen.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20057,7 +21020,7 @@ msgstr ""
 "\n"
 "Einstellungen zur Vertrauenswürdigkeit bearbeiten:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20067,7 +21030,7 @@ msgstr ""
 "hat. Daher vertrauen Sie der Authentizität dieses Zertifikats, falls Sie es "
 "hier nicht anders angeben."
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20125,11 +21088,16 @@ msgstr "E-Mail-Adresse"
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Zertifikatbetrachter: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Geben Sie das Passwort für »%s« ein"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -20140,7 +21108,7 @@ msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20149,7 +21117,7 @@ msgstr ""
 "Ausgestellt auf:\n"
 "      Empfänger: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20158,7 +21126,7 @@ msgstr ""
 "Aussteller:\n"
 "      Empfänger: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Zertifikat wählen"
 
@@ -20349,7 +21317,7 @@ msgid "_Edit CA Trust"
 msgstr "CA-Vertrauenswürdigkeit _bearbeiten"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Zertifikat existiert bereits"
 
@@ -20559,8 +21527,7 @@ msgstr "Kontakte _kopieren nach …"
 msgid "Contact _Preview"
 msgstr "Kontakt_vorschau"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopieren"
@@ -20585,8 +21552,7 @@ msgstr "In Ordner kopieren …"
 msgid "Create a new addressbook folder"
 msgstr "Einen neuen Adressbuchordner anlegen"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
@@ -20627,8 +21593,7 @@ msgstr "Die Kontakte des gewählten Ordners in einen anderen Ordner verschieben"
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben …"
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Einfügen"
@@ -20665,13 +21630,11 @@ msgstr "Die gewählten Kontakte als VCard speichern."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Die Kontakte des gewählten Ordners als VCard speichern"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Alle auswählen"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Alle auswählen"
 
@@ -20801,7 +21764,7 @@ msgid "Month"
 msgstr "Monat"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Weiter"
 
@@ -20810,7 +21773,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Vorherige"
 
@@ -20878,232 +21841,6 @@ msgstr "Arbeitswoche"
 msgid "_Open Appointment"
 msgstr "Termin ö_ffnen"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Den markierten Text in die Zwischenablage kopieren"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Auswahl in die Zwischenablage kopieren"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Den markierten Text in die Zwischenablage verschieben"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Auswahl in die Zwischenablage verschieben"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Inhalt der Zwischenablage einfügen"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Den in der Zwischenablage befindlichen Text einfügen"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Den gesamten Text markieren"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Beilegen"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Klicken Sie hier, um eine Datei beizulegen"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu schließen"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu speichern"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Schließen"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Ein_fügen"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Anlage …"
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "S_chließen"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Datei"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Optionen"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Ganztägiges Ereignis"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "_Ganztägiges Ereignis"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Als vertraulich einstufen"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Als privat einstufen"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Als öffentlich einstufen"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klicken Sie hier, um Alarme für dieses Ereignis einzustellen"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Erweiterte Versandoptionen einfügen"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Dies zu einem wiederkehrenden Ereignis machen"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Ö_ffentlich"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "_Positions-Feld"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Sendeoptionen"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Zeit als b_eschäftigt anzeigen"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Zeit_zone"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "UAwg-Feld angezeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Feld für die Position angezeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Statusfeld anzeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Zeitzone anzeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Kategorien anzeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Festlegen, ob es ein ganztägiges Ereinis ist"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarme"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorien"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "E_instufung"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "Ver_traulich"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Verfügbarkeit"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privat"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_UAwg"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Wiederholung"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Statusfeld"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "A_rt-Feld"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
@@ -21135,7 +21872,6 @@ msgid "Empty _Trash"
 msgstr "_Müll leeren"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Ordner"
 
@@ -21812,9 +22548,9 @@ msgstr "Ansicht ver_größern"
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Schließen"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21852,293 +22588,6 @@ msgstr "Die gewählte Notiz anzeigen"
 msgid "_Open Memo"
 msgstr "Notiz ö_ffnen"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Eine Datei beilegen"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Die momentan geöffnete Datei schließen"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Alles außer Signatur löschen"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Diese Nachricht mit PGP verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
-"Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "_Format"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr ""
-"Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "_HTML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Versandoptionen einfügen"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Eine Datei öffnen"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Mit PGP verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Mit PGP signieren"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "Mit P_GP verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "Mit _PGP signieren"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "_Lesebestätigung anfordern"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "Mit S/_MIME verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Mit S/MIME verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "Mit _S/MIME signieren"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Mit S/MIME signieren"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "A_bschicken"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Speichern unter"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Entwurf speichern"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Speichern _unter …"
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "_Entwurf speichern"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Als Entwurf speichern"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "In Ordner speichern …"
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Die momentan geöffnete Datei speichern"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Die Nachricht in einem bestimmten Ordner speichern"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Abschicken"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Diese E-Mail im HTML-Format verschicken"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Diese Nachricht verschicken"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Die Priorität der Nachricht auf hoch setzen"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Diese Nachricht mit PGP signieren"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Blindkopie-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Kopie-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Von-Wähler anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Veröffentlichen-in-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Antwort-an-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "An-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "_Blindkopie-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Kopie-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "Alle _löschen"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "_Von-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "Ö_ffnen …"
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "V_eröffentlichen-in-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "Nachricht _priorisieren"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "An_twort-an-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Sicherheit"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Versandoptionen"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "A_n-Feld"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "S_chließen"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "_HTML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Speichern und schließen"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Speichern und s_chließen"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Die momentan geöffnete Datei speichern und das Fenster schließen"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Liste auffrischen"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Ordnerliste auffrischen"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Abonnieren"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Abbestellen"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Auswahl _umkehren"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr ""
-"Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu ändern"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Statusdetails"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Zeitzone"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "S_tatusdetails"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Die gewählten Aufgaben kopieren"
@@ -22454,11 +22903,11 @@ msgid "With _Status"
 msgstr "Mit _Status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -22475,8 +22924,8 @@ msgid "Select a Time Zone"
 msgstr "Eine Zeitzone wählen"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Zeitzonen-Auswahlliste"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22488,19 +22937,19 @@ msgstr ""
 "und wählen Sie eine Zeitzone.\n"
 "Mit der rechten Maustaste können Sie die Ansicht verkleinern."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Sammlung"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Ansichten für %s definieren"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -22510,17 +22959,17 @@ msgid "Define Views for \"%s\""
 msgstr "Ansichten für »%s« definieren"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabelle"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instanz"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Aktuelle Ansicht speichern"
 
@@ -22572,11 +23021,11 @@ msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 msgid "Create or edit views"
 msgstr "Ansicht er_stellen oder bearbeiten"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabrik"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Neue Ansicht definieren"
 
@@ -22592,17 +23041,17 @@ msgstr "Art der Ansicht"
 msgid "Type of view:"
 msgstr "Art der Ansicht:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Anlagenleiste"
 
-#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
-#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Datei konnte nicht beigelegt werden: %s: %s"
 
-#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Datei %s konnte nicht beigelegt werden: keine reguläre Datei"
@@ -22624,32 +23073,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Monatskalender"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Füllfarbe"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK-Füllfarbe"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Getüpfelt füllen"
 
@@ -22674,29 +23123,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Mindestbreite"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Mindestbreite"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Abstand"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Jetzt"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -22705,153 +23154,152 @@ msgstr "Die Zeit muss folgendes Format haben: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "Mitteleuropäisch"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Westeuropäisch"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "Westeuropäisch, neu"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Vereinfacht"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
 # CHECK
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unbekannter Zeichensatz: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "Weitere …"
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "_Zeichenkodierung"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Eingabefeld für das Datum"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Diesen Knopf drücken, um den Kalender anzuzeigen"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "Auswahlliste für die Zeit"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_Jetzt"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Heute"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Ungültiges Datum"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Ungültige Zeitangabe"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Ausgeklappt"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Ist der Ausklapper ausgeklappt?"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Text der Ausklapperbeschriftung"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Unterstrich verwenden"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22859,39 +23307,39 @@ msgstr ""
 "Legt fest, ob ein Unterstrich im Text anzeigt, dass das nächste Zeichen als "
 "Kürzelbuchstabe verwendet werden soll"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Zwischen die Beschriftung und das Kind einzufügende Polsterung"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Beschriftungs-Widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Ein Widget, das anstatt der normalen Ausklapperbeschriftung angezeigt werden "
 "soll"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "Ausklappergröße"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "Größe des Ausklapppfeils"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Indikator-Polsterung"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Polsterung um Aufklapppfeil"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -22936,23 +23384,33 @@ msgstr "Derzeitiger Ordner"
 msgid "Current Message"
 msgstr "Derzeitige Nachricht"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Bild wählen"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Weltkarte"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
+#, fuzzy
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "Mausbasiertes interaktives Kartenobjekt zur Auswahl der Zeitzone. "
 "Tastaturbenutzer sollten die Zeitzone stattdessen mit der Auswahlliste im "
 "unteren Bereich festlegen."
 
+#: ../widgets/misc/e-online-button.c:112
+#, fuzzy
+msgid "Online"
+msgstr "Eingebettet"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synchronisieren mit:"
@@ -22977,61 +23435,61 @@ msgstr "Rückfluss-Modell"
 msgid "Column width"
 msgstr "Spaltenbreite"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Suchen"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Verwerfen"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "Objektkennung"
 
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Text"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1018
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "An_zeigen: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "S_uchen: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1047
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " _in "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Cursor-Zeile"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Cursor-Spalte"
@@ -23048,7 +23506,7 @@ msgstr "Markierungsmodus"
 msgid "Cursor Mode"
 msgstr "Cursor-Modus"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "Wenn ge_löscht:"
 
@@ -23072,10 +23530,6 @@ msgstr "<b>Statusverfolgung</b>"
 msgid "A_uto-delete sent item"
 msgstr "Gesendetes Element a_utomatisch löschen"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Einstufung"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Ein gesendetes _Element erstellen, um Informationen zu verfolgen"
@@ -23182,14 +23636,14 @@ msgid "_When opened:"
 msgstr "_Wenn geöffnet:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (…)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
@@ -23234,23 +23688,23 @@ msgstr "Fokussierte Spalte"
 msgid "Unselected Column"
 msgstr "Nicht markierte Spalte"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Durchgestrichene Spalte"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Unterstrichene Spalte"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Fette Spalte"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Farbige Spalte"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Spalte für Hintergrundfarbe"
 
@@ -23288,7 +23742,7 @@ msgid "A_vailable Fields:"
 msgstr "_Verfügbare Felder:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -23301,7 +23755,7 @@ msgid "Clear _All"
 msgstr "Alles _entfernen"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -23364,14 +23818,14 @@ msgstr "_Sortieren …"
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "Ziehen und Ablegen-Code"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Alle Kopfzeilen"
 
@@ -23405,295 +23859,492 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Objekt)"
 msgstr[1] "%s (%d Objekt)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Wechselnde Zeilenfarben"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Horizontales Zeichengitter"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Vertikales Zeichengitter"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Fokus zeichnen"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Cursor-Modus"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Markierungsmodell"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Längenschwellwert"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Einheitliche Zeilenhöhe"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Eingefroren"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Nicht sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Nach Fäc_hern gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "Spalte hin_zufügen …"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Spalten for_matieren …"
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "A_ktuelle Ansicht anpassen …"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Schriftbeschreibung"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Sortierinfos"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Baum"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Tabellenkopf"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Tabellenvorlage"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Cursor-Zeile"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Immer suchen"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Klick zum Hinzufügen verwenden"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
 msgid "ETree table adapter"
 msgstr "ETree-Tabellenadapter"
 
 # CHECK
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
 msgid "Retro Look"
 msgstr "Retro-Look"
 
 # CHECK
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
 msgid "Draw lines and +/- expanders."
 msgstr "Linien und »+/-«-Ausklapper anzeigen."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Ereignisprozessor"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Fett"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Durchgestrichen"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Verankerung"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Ausrichtung"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Clip-Breite"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Clip-Höhe"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Clip-Rechteck füllen"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X-Versatz"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y-Versatz"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Textbreite"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Texthöhe"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Ellipse verwenden"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Ellipse"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Zeilenumbruch"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Zeichen umbrechen"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Max. Zeilen"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Rahmen zeichnen"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Zeilenumbruchzeichen erlauben"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Hintergrund zeichnen"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Knopf zeichnen"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Cursor-Position"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "EM-Kontext"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Handle-Popup"
 
+#, fuzzy
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "»{0}« ist ein schreibgeschützter Kalender. Wechseln Sie zur "
+#~ "Kalenderansicht und wählen Sie einen Kalender aus, der Termine "
+#~ "akzeptieren kann."
+
+#~ msgid "Unknown reason"
+#~ msgstr "Unbekannter Grund"
+
+#~ msgid "Open File"
+#~ msgstr "Datei öffnen"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "Die Datei »{0}« konnte nicht geöffnet werden."
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "Geben Sie einen Namen für diese Signatur ein."
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie alle gelöschten Nachrichten endgültig aus dem "
+#~ "Ordner »{0}« entfernen wollen?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "»{0}« löschen?"
+
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "Nachrichten im Suchordner »{0}« löschen?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "Nur im der_zeitigen Ordner"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Anlagenerinnerung-Plugin aktivieren"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Anlagenerinnerung aktivieren."
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "An vergessene Anlagen _erinnern"
+
+#~ msgid "_Continue Editing"
+#~ msgstr "Nachricht _bearbeiten"
+
+#, fuzzy
+#~ msgid "All instances"
+#~ msgstr "Alle Instanzen"
+
+#, fuzzy
+#~ msgid "This instance"
+#~ msgstr "Nur diese Instanz"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "Für dieses Plugin bestehen keine Konfigurationsoptionen."
+
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr ""
+#~ "Bereitstellung einer Möglichkeit zum Drucken von E-Mails aus dem Editor "
+#~ "heraus."
+
+#~ msgid "Print Message"
+#~ msgstr "Nachricht drucken"
+
+#~ msgid "Prints the message"
+#~ msgstr "Nachricht drucken"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Eine Textbeschreibung der derzeitigen Druckereinstellungen."
+
+#~ msgid "No folder name specified."
+#~ msgstr "Kein Ordnername angegeben."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Ordnername darf das Slash-Zeichen »/« nicht enthalten."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' und '..' sind reservierte Ordnernamen."
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "Auswahl in die Zwischenablage kopieren"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "Auswahl in die Zwischenablage verschieben"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "Inhalt der Zwischenablage einfügen"
+
+#~ msgid "All Day Event"
+#~ msgstr "Ganztägiges Ereignis"
+
+#~ msgid "Send _Options"
+#~ msgstr "_Sendeoptionen"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "Alles außer Signatur löschen"
+
+#~ msgid "For_mat"
+#~ msgstr "_Format"
+
+#~ msgid "HT_ML"
+#~ msgstr "_HTML"
+
+#~ msgid "Open a file"
+#~ msgstr "Eine Datei öffnen"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "Mit PGP verschlüsseln"
+
+#~ msgid "PGP Sign"
+#~ msgstr "Mit PGP signieren"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "Mit S/MIME verschlüsseln"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "Mit S/MIME signieren"
+
+#~ msgid "Save As"
+#~ msgstr "Speichern unter"
+
+#~ msgid "Save Draft"
+#~ msgstr "Entwurf speichern"
+
+#~ msgid "Save in folder..."
+#~ msgstr "In Ordner speichern …"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Die Nachricht in einem bestimmten Ordner speichern"
+
+#~ msgid "Send"
+#~ msgstr "Abschicken"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Diese E-Mail im HTML-Format verschicken"
+
+#~ msgid "_Delete all"
+#~ msgstr "Alle _löschen"
+
+#~ msgid "_Open..."
+#~ msgstr "Ö_ffnen …"
+
+#~ msgid "C_lose"
+#~ msgstr "S_chließen"
+
+#~ msgid "H_TML"
+#~ msgstr "_HTML"
+
+#~ msgid "Save and _Close"
+#~ msgstr "Speichern und s_chließen"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Die momentan geöffnete Datei speichern und das Fenster schließen"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
+
+#~ msgid "Refresh List"
+#~ msgstr "Liste auffrischen"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Ordnerliste auffrischen"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
+
+#~ msgid "Subscribe"
+#~ msgstr "Abonnieren"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Abbestellen"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "Auswahl _umkehren"
+
+#~ msgid "Status Details"
+#~ msgstr "Statusdetails"
+
+#~ msgid "Time Zone"
+#~ msgstr "Zeitzone"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "Zeitzonen-Auswahlliste"
+
 #~ msgid "Permission Denied."
 #~ msgstr "Erlaubnis verweigert."
 
@@ -23717,27 +24368,3 @@ msgstr "Handle-Popup"
 
 #~ msgid "_Versandoptionen"
 #~ msgstr "_Sendeoptionen"
-
-#~ msgid "Adds custom header to outgoing messages."
-#~ msgstr ""
-#~ "Fügt ausgehenden Nachrichten eine benutzerdefinierte Kopfzeile hinzu."
-
-#~ msgid "Custom Header"
-#~ msgstr "Benutzerdefinierte Kopfzeile"
-
-#~ msgid "_Custom Header"
-#~ msgstr "Benutzerdefinierte _Kopfzeile"
-
-#~ msgid "List of custom headers"
-#~ msgstr "Liste der benutzerdefinierten Kopfzeilen"
-
-#~ msgid ""
-#~ "The key specifies the list of custom headers that you can add to an "
-#~ "outgoing message. The format for specifying a Header and Header value is: "
-#~ "Name of the custom header followed by \"=\" and the values separated by "
-#~ "\";\""
-#~ msgstr ""
-#~ "Diese Liste legt die benutzerdefinierten Kopfzeilen fest, die ausgehenden "
-#~ "Nachrichten hinzugefügt werden können. Das Format für eine Kopfzeile und "
-#~ "ihren Wert ist: Name der Kopfzeile gefolgt von »=« und die Werte, die "
-#~ "durch ein Semikolon (»;«) getrennt werden"
diff --git a/po/es.po b/po/es.po
index c530402f07..dc8eb4c181 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-09 08:16+0000\n"
-"PO-Revision-Date: 2008-07-09 23:26+0200\n"
+"POT-Creation-Date: 2008-08-07 16:19+0000\n"
+"PO-Revision-Date: 2008-08-07 18:34+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -344,12 +344,12 @@ msgstr "activar"
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"«{0}» es una fuente de libreta de direcciones de sólo lectura. Cambie a la "
-"vista de contactos y resalte una libreta de direcciones que pueda aceptar "
-"contactos."
+"«{0}» es una libreta de direcciones de sólo lectura y no se puede modificar. "
+"Seleccione una libreta de direcciones diferente de la barra lateral en la "
+"vista de contactos."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -398,12 +398,12 @@ msgstr "No es posible eliminar la libreta de direcciones."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Actualmente sólo puede acceder a la libreta de direcciones del sistema de "
-"GroupWise desde Evolution. Debe usar algún cliente de correo de GroupWise "
-"una sola vez, para obtener sus Contactos Frecuentes de GroupWise y las "
-"carpetas personales de contactos de GroupWise."
+"GroupWise desde Evolution. Use algún cliente de correo de GroupWise una sola "
+"vez para obtener sus Contactos frecuentes de GroupWise y las carpetas "
+"personales de contactos de GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -527,10 +527,8 @@ msgstr ""
 "actualizarse a una versión soportada"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "You do not have enough permissions to delete contact in this Address Book."
-msgstr ""
-"No tiene suficientes permisos para borrar este contacto en esta Libreta de "
-"direcciones."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "No tiene permisos para borrar este contacto en esta Libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -569,7 +567,7 @@ msgstr "_Usar tal cual es"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -657,8 +655,9 @@ msgstr "Gestione sus certificados S/MIME aquí"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "En este equipo"
 
@@ -675,7 +674,7 @@ msgstr "En este equipo"
 #: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
 #: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1055
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Privado"
 
@@ -686,6 +685,7 @@ msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
 #: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
@@ -694,6 +694,7 @@ msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
@@ -702,11 +703,12 @@ msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1192
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
 msgid "Address _Book"
 msgstr "Libreta de _direcciones"
 
@@ -718,72 +720,72 @@ msgstr "Crea una libreta de direcciones nueva"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../addressbook/gui/component/addressbook-config.c:517
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:618
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
-#: ../addressbook/gui/component/addressbook-config.c:967
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:366
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
-#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../addressbook/gui/widgets/e-addressbook-view.c:556
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../addressbook/gui/component/addressbook-config.c:972
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:974
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../addressbook/gui/component/addressbook-config.c:977
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
-#: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: ../addressbook/gui/component/addressbook-config.c:980
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/addressbook-config.c:1204
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrando…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando «%s»:"
@@ -866,10 +868,10 @@ msgstr "Guardar como vCard…"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
 #: ../calendar/gui/calendar-component.c:620
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/e-calendar-table.c:1596
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -901,6 +903,7 @@ msgstr "Introduzca la contraseña para %s (usuario %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:498
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1008,71 +1011,76 @@ msgstr "Siempre"
 msgid "Anonymously"
 msgstr "Anónimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "_Examinar esta libreta hasta llegar al final"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Nombre distintivo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Dirección de correo-e"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 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:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Buscar bases de búsqueda posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nunca"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sin cifrado"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Uno"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 #: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtro de búsqueda"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_Base de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Filtro de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtro de búsqueda"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1082,7 +1090,7 @@ msgstr ""
 "la búsqueda. Si esto no se modifica, la búsqueda por omisión se realizará "
 "sobre la clase de objetos de tipo «person»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1090,7 +1098,7 @@ msgstr ""
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1098,7 +1106,7 @@ msgstr ""
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 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 "
@@ -1108,23 +1116,23 @@ msgstr ""
 "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
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de búsqueda soportadas"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 #: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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 "
@@ -1134,7 +1142,7 @@ msgstr ""
 "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:38
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 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 "
@@ -1146,7 +1154,7 @@ msgstr ""
 "«sub» incluirá todas las entradas por debajo de 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:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1154,7 +1162,7 @@ msgstr ""
 "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
 "com»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1162,7 +1170,7 @@ msgstr ""
 "Este es el máximo número de entradas para descargar.  Si pone este número "
 "demasiado alto ralentizará su libreta de direcciones."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1172,7 +1180,7 @@ msgstr ""
 "establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1180,7 +1188,7 @@ msgstr ""
 "Este nombre que identificará este servidor en la lista de carpetas de "
 "Evolution. Es sólo para poder mostrarlo en pantalla. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 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 "
@@ -1190,35 +1198,35 @@ msgstr ""
 "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:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Usando «Nombre Distintivo» (ND)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Añadir libreta de direcciones"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Buscar bases de búsqueda posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:226
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1226,39 +1234,39 @@ msgstr "Método de _inicio de sesión:"
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "Á_mbito de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Tiempo de expiración:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "Usar _conexión segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "tarjetas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:715
 msgid "minutes"
 msgstr "minutos"
 
@@ -1364,7 +1372,7 @@ msgstr "Teléfono"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Trabajo"
 
@@ -1386,9 +1394,9 @@ msgid "_Birthday:"
 msgstr "_Cumpleaños:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -1491,7 +1499,7 @@ msgstr "Dirección"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2816,7 +2824,7 @@ msgstr "_Miembros"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Libro"
 
@@ -2861,14 +2869,15 @@ msgstr ""
 "El nombre o la dirección de correo-e de este contacto ya existe\n"
 "en esta carpeta.  ¿Quiere añadirlo de todos modos?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "Combinar contacto"
-
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
 #: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "Co_mbinar"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Combinar contacto"
+
 #: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
@@ -2910,7 +2919,7 @@ msgstr[1] "%d contactos"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Consulta"
 
@@ -2921,7 +2930,7 @@ msgstr "Error al obtener la vista de libro"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2953,8 +2962,8 @@ msgid "Save as vCard..."
 msgstr "Guardar como vCard…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -3005,19 +3014,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver a la libreta de direcciones…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Cor_tar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2045
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
@@ -3214,11 +3222,11 @@ msgstr "Sitio web"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Anchura"
@@ -3229,11 +3237,11 @@ msgstr "Anchura"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Altura"
@@ -3263,7 +3271,17 @@ msgstr "Longitud máx. del campo"
 msgid "Column Width"
 msgstr "Anchura de columna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Buscando contactos..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3277,7 +3295,7 @@ msgstr ""
 "\n"
 "o pulse dos veces aquí para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3291,7 +3309,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquí para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3301,7 +3319,7 @@ msgstr ""
 "\n"
 "Buscar contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3311,7 +3329,7 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptador"
 
@@ -3341,7 +3359,7 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
@@ -3405,8 +3423,7 @@ msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
@@ -3428,13 +3445,13 @@ msgid "Web Log"
 msgstr "Diario web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Cumpleaños"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -3481,7 +3498,7 @@ msgstr "No hay definido un contacto para sí mismo"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -3506,8 +3523,8 @@ msgstr "Protocolo no implementado"
 #: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3978,7 +3995,7 @@ msgstr "Escala de grises"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1055
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4105,20 +4122,20 @@ msgstr "Error no tratado"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"«{0}» es una fuente de calendario de sólo lectura. Cambie el Calendario a uno "
-"que pueda aceptar citas."
+"«{0}» es un calendario de sólo lectura y no se puede modificar. Seleccione un "
+"calendario diferente de la barra lateral en la vista del calendario."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"«{0}» es una fuente de calendario de sólo lectura. Cambie a la vista de "
-"calendario y resalte un calendario que pueda aceptar citas."
+"«{0}» es calendario de sólo lectura y no se puede modificar. Seleccione un "
+"calendario diferente que pueda aceptar citas."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4371,8 +4388,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "El calendario no está marcado para usarse sin conexión."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "La lista de notas no está marcada para usarse sin conexión"
+msgid "The memo list is not marked for offline usage."
+msgstr "La lista de notas no está marcada para usarse sin conexión."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4461,12 +4478,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Sus tareas no estarán disponibles hasta que reinicie Evolution."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
 #: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
-#: ../ui/evolution-editor.xml.h:23
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -4475,7 +4491,7 @@ msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Enviar"
@@ -4531,7 +4547,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "No es posible escribir el bloque de aplicación ToDo del Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
@@ -4585,8 +4601,8 @@ msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
 #: ../calendar/gui/tasks-component.c:540
 #: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
@@ -4625,7 +4641,7 @@ msgstr[1] "minutos"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:716
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hora"
@@ -4642,10 +4658,10 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -4654,14 +4670,15 @@ msgid "Snooze _time:"
 msgstr "_Posponer durante:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4673,32 +4690,32 @@ msgstr "_Posponer"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "Tiene %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4710,7 +4727,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4727,7 +4744,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
@@ -5022,12 +5039,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar el panel de vista previa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar el panel de vista previa."
 
@@ -5306,7 +5323,7 @@ msgstr "Purgar acontecimientos anteriores a"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:717
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "días"
@@ -5338,14 +5355,14 @@ msgstr "Calendario _nuevo"
 
 #: ../calendar/gui/calendar-component.c:617
 #: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2090
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copiar…"
 
 #: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:2034
 #: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propiedades"
@@ -5372,6 +5389,7 @@ msgid "New appointment"
 msgstr "Cita nueva"
 
 #: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
@@ -5384,6 +5402,7 @@ msgid "New meeting"
 msgstr "Reunión nueva"
 
 #: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "_Reunión"
 
@@ -5396,6 +5415,7 @@ msgid "New all day appointment"
 msgstr "Cita nueva para todo el día"
 
 #: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
@@ -5408,6 +5428,7 @@ msgid "New calendar"
 msgstr "Calendario nuevo"
 
 #: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
@@ -5468,7 +5489,7 @@ msgid "Competition"
 msgstr "Completado"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:340
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Confidencial"
@@ -5561,20 +5582,19 @@ msgid "Phone Calls"
 msgstr "Llamadas de teléfono"
 
 #: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:339
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
 #: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:338 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
+#: ../calendar/gui/dialogs/event-editor.c:298
 msgid "Recurrence"
 msgstr "Repetición"
 
@@ -5596,7 +5616,7 @@ msgstr "Estrategias"
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/tasktypes.xml.h:40
 #: ../plugins/save-calendar/csv-format.c:361
 msgid "Summary"
 msgstr "Resumen"
@@ -5662,7 +5682,7 @@ msgstr "Permiso denegado para abrir el calendario"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Editar alerta"
 
@@ -5765,7 +5785,10 @@ msgstr "veces adicionales cada"
 msgid "hour(s)"
 msgstr "hora(s)"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -5784,7 +5807,6 @@ msgstr "Aña_dir"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alertas"
 
@@ -5862,7 +5884,7 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "viernes"
@@ -5878,7 +5900,7 @@ msgstr ""
 "días"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "lunes"
@@ -5902,7 +5924,7 @@ msgstr ""
 "domingo"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Elija un color"
 
@@ -5912,7 +5934,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "sábado"
@@ -5930,7 +5952,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:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "domingo"
@@ -5949,7 +5971,7 @@ msgid "Template:"
 msgstr "Plantilla:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "jueves"
@@ -5964,13 +5986,13 @@ msgid "Time format:"
 msgstr "Formato de la hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "martes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "miércoles"
@@ -6147,39 +6169,39 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr "(Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Vence "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaje adjunto: %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1772
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
 #: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
@@ -6187,117 +6209,259 @@ msgid_plural "%d attached messages"
 msgstr[0] "Mensaje adjunto"
 msgstr[1] "%d mensajes adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Editar cita"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunión: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tarea asignada: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Tarea: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Nota - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Sin resumen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Pulse aquí para cerrar la ventana actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Copia el texto seleccionado al portapapeles"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Corta el texto seleccionado al portapapeles"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Pulse aquí para ver la ayuda disponible"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Pega texto desde el portapapeles"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Pulse aquí para guardar la vista actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Selecciona todo el texto"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "_Clasificación"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Archivo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "_Insertar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Opciones"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Ver"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Adjunto…"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Pulse aquí para adjuntar un archivo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Categorías"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Conmuta cuando se muestran las categorías"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "_Zona horaria"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Conmuta cuando se muestra la «Zona horaria»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Pú_blico"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Clasificar como público"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Clasificar como privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Clasificar como confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Campo «_Rol»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Rol»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_Confirmar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Confirmar»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Campo de _estado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Estado»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Campo de _tipo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Docu_mentos recientes"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Adjuntar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> adjunto"
 msgstr[1] "<b>%d</b> adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
-#: ../mail/em-format-html-display.c:2196
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2194
 msgid "Show Attachments"
 msgstr "Mostrar adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Pulse la barra espaciadora para cambiar la barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Editar cita"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Reunión: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tarea asignada: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Tarea: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Nota - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Sin resumen"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 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:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
@@ -6378,127 +6542,178 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alertas"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Pulse aquí para poner o quitar alertas para este acontecimiento"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Repetición"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Convertir en acontecimiento repetitivo"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Opciones de envío"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Opciones de envío avanzadas"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Acontecimiento para todo el _día"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Se activa cuando se tiene un «Acontecimiento para todo el día»"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Mostrar hora como _ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Se activa cuando se deben mostrar la hora como ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Disponibilidad"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Consultar información de disponibilidad para los participantes"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "La fecha de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "La hora de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Añadir"
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando en nombre de <b>%s</b>"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes de la cita"
 msgstr[1] "%d días antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes de la cita"
 msgstr[1] "%d horas antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6578,17 +6793,17 @@ msgstr "_Contactos…"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No es posible abrir las notas en «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1562
-#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1561
+#: ../mail/em-format-html.c:1619 ../mail/em-format-html.c:1645
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
@@ -6608,7 +6823,7 @@ msgid "_Description:"
 msgstr "_Descripción:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -6649,17 +6864,17 @@ msgstr "Esta instancia y las futuras"
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición es inválida"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "en"
 
@@ -6667,7 +6882,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "primer"
 
@@ -6676,7 +6891,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "segundo"
 
@@ -6684,7 +6899,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "tercer"
 
@@ -6692,7 +6907,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "cuarto"
 
@@ -6700,13 +6915,13 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "último"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Otra fecha"
 
@@ -6714,7 +6929,7 @@ msgstr "Otra fecha"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "del 1 al 10"
 
@@ -6722,7 +6937,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -6730,45 +6945,45 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "día"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Añadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selección que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selección que borrar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -6819,12 +7034,12 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Página web"
 
@@ -6842,18 +7057,18 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Terminado"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:360 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Alta"
 
@@ -6862,22 +7077,22 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "En proceso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:362 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1061
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Baja"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
@@ -6885,8 +7100,8 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Sin comenzar"
@@ -6900,7 +7115,7 @@ msgid "Stat_us:"
 msgstr "_Estado:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -6917,25 +7132,37 @@ msgstr "_Prioridad:"
 msgid "_Web Page:"
 msgstr "Página _web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Detalles de _estado"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Opciones de _envío"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Detalles"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
@@ -7037,14 +7264,13 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
-#: ../shell/e-shell-folder-title-bar.c:586
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Sin título"
 
@@ -7082,7 +7308,7 @@ msgstr "Fecha de vencimiento:"
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estado:"
 
@@ -7100,12 +7326,12 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Ocupada"
@@ -7142,12 +7368,12 @@ msgstr "No"
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
+#: ../plugins/itip-formatter/itip-formatter.c:2047
 #: ../plugins/plugin-manager/plugin-manager.c:73
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Desconocido"
@@ -7164,7 +7390,7 @@ msgstr "Asignado"
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 
@@ -7173,9 +7399,9 @@ msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
@@ -7193,126 +7419,152 @@ msgstr "_Guardar seleccionados"
 msgid "Open in %s..."
 msgstr "Abrir en %s…"
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Sin resumen *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizador: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Empieza: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Vence: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:879
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1163
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1348
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1571
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1577
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1583
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar tareas seleccionadas como incompletas"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -7405,7 +7657,7 @@ msgstr "Reenviar como i_Calendar…"
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7423,26 +7675,14 @@ msgstr "Borrar esta _repetición"
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizador: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizador: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7482,19 +7722,19 @@ msgstr "divisiones de %02i minutos"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
@@ -7612,12 +7852,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
@@ -7625,7 +7865,7 @@ msgstr "Aceptado provisionalmente"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -7944,49 +8184,49 @@ msgstr "Participantes"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Participante requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "No participan"
 
@@ -8005,7 +8245,7 @@ msgstr "Provisional"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -8189,7 +8429,7 @@ msgstr "Seleccione la zona horaria"
 #. 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/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%e de %B"
 
@@ -8385,6 +8625,7 @@ msgid "New memo"
 msgstr "Nota nueva"
 
 #: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "_Nota"
 
@@ -8397,6 +8638,7 @@ msgid "New shared memo"
 msgstr "Nota nueva compartida"
 
 #: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
@@ -8409,6 +8651,7 @@ msgid "New memo list"
 msgstr "Lista de notas nueva"
 
 #: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Lista de notas"
 
@@ -8421,7 +8664,7 @@ msgid "Print Memos"
 msgstr "Imprimir notas"
 
 #: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days'"
+msgid "Next 7 Days"
 msgstr "Próximos 7 días"
 
 #: ../calendar/gui/migration.c:157
@@ -8626,60 +8869,60 @@ msgstr "Vi"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Tarea"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contactos: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Eventos próximos"
 
 #: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
-msgstr "_Lista de tareas nueva"
+msgstr "Lista de tareas _nueva"
 
 #: ../calendar/gui/tasks-component.c:536
 #, c-format
@@ -8711,6 +8954,11 @@ msgstr "Selector de origen de tareas"
 msgid "New task"
 msgstr "Tarea nueva"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarea"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
@@ -8720,6 +8968,7 @@ msgid "New assigned task"
 msgstr "Nueva tarea asignada"
 
 #: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
@@ -8732,8 +8981,9 @@ msgid "New task list"
 msgstr "Lista de tareas nueva"
 
 #: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
-msgstr "_Lista de tareas"
+msgstr "Lista de ta_reas"
 
 #: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
@@ -8751,7 +9001,7 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
@@ -10368,16 +10618,12 @@ msgstr "_Adjuntar"
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
-#: ../composer/e-composer-actions.c:472 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Adjunto…"
-
 #: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
 #: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -10385,7 +10631,7 @@ msgstr "_Cerrar"
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1343
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
@@ -10426,10 +10672,6 @@ msgstr "_Enviar"
 msgid "Send this message"
 msgstr "Enviar este mensaje"
 
-#: ../composer/e-composer-actions.c:528 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Opciones de _envío"
-
 #: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Insertar opciones de envío"
@@ -10554,10 +10796,6 @@ msgstr "Campo «_Para»"
 msgid "Toggles whether the To field is displayed"
 msgstr "Conmutador que indica si se muestra el campo «Para»"
 
-#: ../composer/e-composer-actions.c:700 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Adjuntar"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
@@ -10644,8 +10882,8 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
-#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1912
+#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10803,23 +11041,27 @@ msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar una cuenta antes de poder escribir correo."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continuar editando"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_No recuperar"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Guardar mensaje"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Guardar _borrador"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Correo y calendario de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
@@ -11101,56 +11343,56 @@ msgstr "Elija un archivo"
 msgid "Test"
 msgstr "Prueba"
 
-#: ../filter/filter-rule.c:851
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Nombre de la _regla:"
 
-#: ../filter/filter-rule.c:879
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Buscar elementos que cumplen con estos criterios"
 
-#: ../filter/filter-rule.c:913
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "_Añadir regla de filtrado"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Si se cumplen todos los criterios"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Si se cumple algún criterio"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Todas las relacionadas"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Respuestas y antecesores"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Sin respuesta o antecesor"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_ncluir conversaciones"
 
-#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -11264,7 +11506,7 @@ msgstr "la fecha que especifique"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:718
 msgid "weeks"
 msgstr "semanas"
 
@@ -11334,10 +11576,10 @@ msgstr "Control de preferencias de Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Control de configuración de red de Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
@@ -11396,46 +11638,46 @@ msgstr "Preguntar por cada mensaje"
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay correo _nuevo cada"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Seguridad"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
-#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
@@ -11469,18 +11711,18 @@ msgstr "Añadir un script de firma"
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: ../mail/em-composer-utils.c:1007 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: ../mail/em-composer-utils.c:1819
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. 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:1866
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11488,7 +11730,7 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
@@ -11589,7 +11831,7 @@ msgstr "Expresión"
 msgid "Follow Up"
 msgstr "Seguimiento"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Importante"
 
@@ -11801,11 +12043,11 @@ msgstr "Mensajes importantes"
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Búsqueda en la cuenta"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Búsqueda en todas las cuentas"
 
@@ -11828,7 +12070,16 @@ msgstr[1] "Mensajes en total:"
 msgid "Quota usage"
 msgstr "Uso de cuota"
 
-#: ../mail/em-folder-properties.c:385
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
@@ -11856,27 +12107,19 @@ msgstr "Carpetas de búsqueda"
 msgid "UNMATCHED"
 msgstr "NO COINCIDENTE"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Borradores"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "Bandeja de entrada"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Correo enviado"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Cargando…"
 
@@ -11895,85 +12138,79 @@ msgstr "Cargando…"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:371
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Árbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No es posible dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/em-folder-tree.c:2082 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Ver"
-
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "Carpeta _nueva…"
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Mover…"
 
-#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "A_ctualizar"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -11982,13 +12219,13 @@ msgstr "_Vaciar papelera"
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando «%s» a «%s»"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -12010,199 +12247,204 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Ha fallado el borrado del correo"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No tiene suficientes permisos para borrar este correo."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Reen_viar"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta…"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Marcar como no _importante"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no SPAM"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Ninguna"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "Etiqueta _nueva"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Carpeta de búsqueda según el a_sunto"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Carpeta de búsqueda según el re_mitente"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Carpeta de búsqueda según los des_tinatarios"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Carpeta de búsqueda según la _lista de correo"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#: ../plugins/google-account-setup/google-source.c:301
+#: ../plugins/google-account-setup/google-source.c:586
+#: ../plugins/google-account-setup/google-source.c:772
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Obteniendo mensaje…"
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "Ll_amar a…"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:472
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:616
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: ../mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_Coincidir con capitalización"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12210,11 +12452,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Valid signature"
 msgstr "Firma válida"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12222,11 +12464,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:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12234,11 +12476,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma válida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12246,11 +12488,11 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave pública"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12258,11 +12500,11 @@ msgstr ""
 "Este mensaje está firmado con una firma pero no existe una clave pública "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:659
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12270,11 +12512,11 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12284,11 +12526,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:962 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12296,11 +12538,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:963 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12310,87 +12552,87 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:1079
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1370
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1378
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1381
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1459
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1460
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1461
 msgid "_Fit to Width"
 msgstr "_Ajustar al ancho"
 
-#: ../mail/em-format-html-display.c:1464
+#: ../mail/em-format-html-display.c:1462
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _original"
 
-#: ../mail/em-format-html-display.c:1984
+#: ../mail/em-format-html-display.c:1982
 msgid "Save attachment as"
 msgstr "Guarda los adjuntos como"
 
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:1986
 msgid "Select folder to save all attachments"
 msgstr "Seleccione la carpeta donde guardar todos los adjuntos"
 
-#: ../mail/em-format-html-display.c:2039
+#: ../mail/em-format-html-display.c:2037
 msgid "_Save Selected..."
 msgstr "_Guardar seleccionados…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2106
+#: ../mail/em-format-html-display.c:2104
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d a_djunto"
 msgstr[1] "%d a_djuntos"
 
-#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+#: ../mail/em-format-html-display.c:2111 ../mail/em-format-html-display.c:2200
 msgid "S_ave"
 msgstr "_Guardar"
 
-#: ../mail/em-format-html-display.c:2124
+#: ../mail/em-format-html-display.c:2122
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../mail/em-format-html-display.c:2198
+#: ../mail/em-format-html-display.c:2196
 msgid "No Attachment"
 msgstr "Sin adjunto"
 
-#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:2341
+#: ../mail/em-format-html-display.c:2339
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:2396
+#: ../mail/em-format-html-display.c:2394
 msgid "O_pen With"
 msgstr "Abrir _con"
 
-#: ../mail/em-format-html-display.c:2467
+#: ../mail/em-format-html-display.c:2465
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12403,84 +12645,84 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Obteniendo «%s»"
 
-#: ../mail/em-format-html.c:925
+#: ../mail/em-format-html.c:924
 msgid "Unknown external-body part."
 msgstr "Parte externa al cuerpo del mensaje desconocida."
 
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:932
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:963
+#: ../mail/em-format-html.c:962
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:974
+#: ../mail/em-format-html.c:973
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) válido en el sitio «%s»"
 
-#: ../mail/em-format-html.c:976
+#: ../mail/em-format-html.c:975
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:997
+#: ../mail/em-format-html.c:996
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1008
+#: ../mail/em-format-html.c:1007
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: ../mail/em-format-html.c:1236
+#: ../mail/em-format-html.c:1235
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
-#: ../mail/em-format-html.c:1410
+#: ../mail/em-format-html.c:1409
 msgid "Formatting Message..."
 msgstr "Formateando el mensaje…"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1626
+#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1632
+#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1743 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Transporte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1771
+#: ../mail/em-format-html.c:1770
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1776
+#: ../mail/em-format-html.c:1775
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1906
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Este mensaje lo envió <b>%s</b> en nombre de <b>%s</b>"
@@ -12511,43 +12753,43 @@ msgstr "Grupos de noticias"
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: ../mail/em-format.c:1198
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
 
-#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
 
-#: ../mail/em-format.c:1343
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado no soportado para multipart/encrypted"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "No es posible interpretar el mensaje PGP/MIME"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No es posible interpretar el mensaje PGP/MIME: Error desconocido"
 
-#: ../mail/em-format.c:1510
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Formato de firma no soportado"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Error al verificar la firma"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Error desconocido al verificar la firma"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "No es posible interpretar el mensaje PGP"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No es posible interpretar el mensaje PGP: Error desconocido"
 
@@ -12608,68 +12850,85 @@ msgid "No Junk plugin available"
 msgstr "No hay complemento para SPAM disponible"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Más tarde"
 
-#: ../mail/em-migrate.c:1210
-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 ""
-"El lugar y jerarquía de las carpetas de buzones de correo ha cambiado desde "
-"Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrando «%s»:"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "No es posible crear la carpeta nueva: «%s»: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "No es posible copiar el la carpeta «%s» a «%s»: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "No es posible buscar buzones existentes en «%s»: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+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 ""
+"El lugar y jerarquía de las carpetas de buzones de correo ha cambiado desde "
+"Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "No es posible abrir los datos antiguos POP keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Fallo al crear directorio de datos POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "No es posible copiar los datos POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "No es posible crear el almacén de correo local «%s»: %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El formato de resúmenes de las carpetas del buzón de Evolution se ha movido "
+"a sqlite desde Evolution 2.24.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "No es posible crear las carpetas de correo local en: «%s»: %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12817,10 +13076,18 @@ msgstr ""
 "en address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Controla la frecuencia con la que los cambios locales se sincronizan con el "
+"servidor de correo-e remoto. El intervalo debe ser de al menos 30 segundos."
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12828,59 +13095,59 @@ msgstr ""
 "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
 "elementos son cadenas con el formato \"headername=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Altura predeterminada de la ventana del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predeterminada del diálogo de suscripción."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para el estado de expansión de la conversación"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Anchura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Anchura predeterminada de la ventana de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Anchura predeterminada del diálogo de suscripción."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
@@ -12888,13 +13155,13 @@ msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sólo en la "
 "libreta de direcciones local"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
 "direcciones"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12906,11 +13173,11 @@ msgstr ""
 "libretas marcadas para autocompletado. Puede ser lento si se han marcado "
 "para autocompletado libretas de direcciones remotas (como LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12920,7 +13187,7 @@ msgstr ""
 "SPAM. Si esta opción está activada y las cabeceras se mencionan, se mejorará "
 "la velocidad de comprobado de correo basura."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12928,63 +13195,63 @@ msgstr ""
 "Determina si se debe usar la misma tipografía para las líneas «De» y «Asunto» "
 "en la columna «Mensajes» de la vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio para cargar/adjuntar archivos en el editor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directorio para guardar archivos enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
 "Desactivar o activar la elipsis de los nombres de las carpetas en el árbol "
 "de carpetas"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Dibujar indicadores de errores tipográficos en las palabras mientras se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Vaciar las carpetas SPAM al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Activa o desactiva la barra espaciadora mágica"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Activa o desactiva la característica de búsqueda al teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Activar las carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Activar las carpetas de búsqueda al inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12996,7 +13263,7 @@ msgstr ""
 "fácilmente una carpeta en esa barra lateral tan sólo tecleando el nombre de "
 "la carpeta y la selección salta automáticamente a esa carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13004,27 +13271,27 @@ msgstr ""
 "Activar esto para usar la barra espaciadora para desplazarse en la vista "
 "previa del mensaje, lista de mensajes y carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Activar para mostrar la parte de texto del mensaje de tamaño limitado."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la vista previa por carpeta y elimina la selección"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13032,7 +13299,7 @@ msgstr ""
 "Si el usuario intenta abrir diez o más mensajes al mismo tiempo, preguntar "
 "al usuario si quiere realmente hacerlo."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13040,7 +13307,7 @@ msgstr ""
 "Si el panel de «Vista previa» está activado, entonces lo muestra en el "
 "lateral en vez de verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 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 "
@@ -13051,7 +13318,7 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de GNOME puede usarse para "
 "mostrar el contenido."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13059,7 +13326,7 @@ msgstr ""
 "Altura inicial de la ventana «Enviar y recibir correo». El valor se actualiza "
 "según el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13073,7 +13340,7 @@ msgstr ""
 "no se puede maximizar. Esta clave existe sólo como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13081,11 +13348,11 @@ msgstr ""
 "Anchura inicial de la ventana «Enviar y recibir correo». El valor se "
 "actualiza según el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Desactiva/activa la pregunta cuando se marcan varios mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13093,7 +13360,7 @@ msgstr ""
 "Habilita/deshabilita la característica donde la pregunta de si se requiere "
 "sincronización antes de pasar al modo trabajar desconectado se repite."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13103,31 +13370,31 @@ msgstr ""
 "mensajes de una carpeta de búsqueda borra permanentemente el mensaje, no "
 "sólo los elimina de los resultados de la búsqueda."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Última vez que se vació el SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel más allá del cuál el mensaje se debe registrar."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13136,15 +13403,15 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceras personalizadas y si están activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Lista de los códigos de diccionario usados para la corrección ortográfica."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 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."
@@ -13153,200 +13420,204 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de componentes bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imágenes para mensajes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
 "Cargar imágenes de los mensajes HTML sobre http(s). Los valores posibles "
-"son: 0: Nunca cargar imágenes desde la red; 1: Cargar imágenes si el "
-"remitente está en la libreta de direcciones; 2: Siempre cargar imágenes "
+"son: «0»: Nunca cargar imágenes desde la red; «1»: Cargar imágenes si el "
+"remitente está en la libreta de direcciones; «2»: Siempre cargar imágenes "
 "desde la red."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la «vista previa» del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Altura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Anchura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización del mensaje (\"normal\", \"full headers\" (cabeceras "
 "completas), \"source\" (fuente))"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Días mínimos entre el vaciado del SPAM a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre el vaciado de la papelera a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado del SPAM a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado de la papelera a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de direcciones a mostrar en PARA/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente compactar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Preguntar para comprobar si el usuario quiere desconectarse inmediatamente"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar al borrar mensajes en carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cuando el usuario intente abrir diez o más mensajes a la vez"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al enviar mensajes en HTML a contactos quizá no los quieran."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cuando se marquen varios mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Directorio donde guardar"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Buscar la foto del remitente en libretas de direcciones locales"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Envía el correo en HTML por omisión."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correo-e del remitente en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Intervalo de sincronización con el servidor"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Muestra las imágenes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Muestra los mensajes borrados (tachados) en la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Muestra los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Mostrar la foto del remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13354,67 +13625,67 @@ msgstr ""
 "Muestra el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Muestra la foto del remitente en el panel de lectura de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Color de la corrección ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Comprobación ortográfica de idiomas"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Límite de la parte de texto del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "La última vez que se vació el SPAM, en días desde la época."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "La última vez que se vació la papelera, en días desde la época."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "La tipografía de terminal para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "La tipografía de anchura variable para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Esto puede tener tres valores posibles. 0 para errores. 1 para avisos. 2 "
+"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» "
 "para mensajes de depuración."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13423,7 +13694,7 @@ msgstr ""
 "bajo Evolution. Lo predeterminado son 4 Mib/4096 KiB y está especificado en "
 "términos de KiB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13433,16 +13704,16 @@ msgstr ""
 "varios complementos activados. Si el complemento predeterminado listado está "
 "desactivado, entonces no usará los otros complementos disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 "Esta clave es de una sola lectura y después de leerla se establece a «false». "
 "Esto deselecciona el correo en la lista y elimina la vista previa para esa "
 "carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 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;"
@@ -13454,7 +13725,7 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt;: poner a activado si la cabecera se "
 "debe mostrar en la vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
@@ -13465,11 +13736,11 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opción ayudará a mejorar la velocidad de obtención."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13477,7 +13748,7 @@ msgstr ""
 "Esto establece el número de direcciones a mostrar en la vista de lista de "
 "mensajes predeterminada, más allá de los cuales se muestra un «…»."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13486,7 +13757,7 @@ msgstr ""
 "deberían estar en estado expandido o contraído. Evolution necesita "
 "reiniciarse."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13496,33 +13767,18 @@ msgstr ""
 "último mensaje de cada conversación, en lugar de por la fecha del mensaje. "
 "Evolution necesita un reinicio."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Agrupar la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Agrupar la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-"Intervalo de tiempo, en segundos, para la frecuencia con la que subir los "
-"cambios de almacenamiento al servidor."
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-"Intervalo de tiempo, en segundos, para la frecuencia con la que subir los "
-"cambios de almacenamiento al servidor. El valor actual no puede ser inferior "
-"a 30 segundos."
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tiempo para marcar un mensaje como visto"
@@ -13725,142 +13981,150 @@ msgstr "Lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Plantillas"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, 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:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:917
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "Carpeta de correo nueva"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:925
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falló al actualizar la configuración de correo o carpetas."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Error"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Errores"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Avisos y errores"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensajes de error, avisos y depuración"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Mostrar _errores en la barra de estado para"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1745
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Mensajes de sucesos:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "Nivel de sucesos"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2429
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Cierra esta ventana"
@@ -14111,10 +14375,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Firmar digitalmente los mensajes s_alientes (por omisión)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr ""
-"No formatear contenidos de texto en los correos si el _tamaño del texto "
-"excede"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "No formatear mensajes si el ta_maño del texto excede"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
@@ -14252,18 +14514,24 @@ msgid ""
 msgstr "Nota: No se le pedirá una contraseña hasta que conecte por primera vez"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Esta opción se omitirá si se encuentra alguna coincidencia para una cabecera "
+"de SPAM personalizada."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Contraseña:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14271,7 +14539,7 @@ msgstr ""
 "Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
 "Este nombre se usará sólo para mostrarlo."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14280,7 +14548,7 @@ msgstr ""
 "no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 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 "
@@ -14290,115 +14558,115 @@ msgstr ""
 "«opcionales» no hace falta que los rellene, a menos que quiera incluir esta "
 "información en el correo-e que envíe."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Por favor seleccione entre las siguientes opciones"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al enviar mensajes que tan sólo tengan definido el _Cco"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Recordar contraseña"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Recordar _contraseña"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "Equipo S_OCKS:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_eleccionar…"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "_Enviar confirmaciones de mensajes:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Tabla de firmas"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14406,7 +14674,7 @@ msgstr ""
 "La lista de idiomas de aquí refleja únicamente los idiomas para los cuáles "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14416,12 +14684,6 @@ msgstr ""
 "firma. El nombre que especifique se usará\n"
 "únicamente para mostrarlo por pantalla. "
 
-#: ../mail/mail-config.glade.h:151
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Esta opción se omitirá si se encuentra alguna coincidencia para una cabecera "
-"de SPAM personalizada."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14439,7 +14701,8 @@ msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:678
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_Usuario:"
 
@@ -14518,7 +14781,7 @@ msgid "_Path:"
 msgstr "R_uta:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
 #: ../mail/mail-config.glade.h:179
@@ -14615,43 +14878,43 @@ msgstr "_Discriminar según capitalización"
 msgid "Co_mpleted"
 msgstr "_Terminado"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Buscar:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Buscar en el mensaje"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Suscripciones de carpetas"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Acuerdo de licencia"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ninguno seleccionado"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Información de seguridad"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Carpetas específicas"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14659,19 +14922,19 @@ 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:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Aceptar licencia"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Vence el:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
@@ -14815,7 +15078,7 @@ msgstr[1] "Descargando %d mensajes"
 #: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
@@ -14917,11 +15180,6 @@ msgstr "El usuario canceló la operación."
 msgid "_Save and Close"
 msgstr "_Guardar y cerrar"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Archivo"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Editar firma"
@@ -15589,78 +15847,79 @@ msgstr "C_ompactar"
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %e %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%e %b %Y"
 
-#: ../mail/message-list.c:3884
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3888 ../mail/message-list.c:4324
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4170
+#: ../mail/message-list.c:4179
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15668,7 +15927,7 @@ msgstr ""
 "Ningún mensaje satisface su criterio de búsqueda. Limpie el criterio de "
 "selección con el elemento del menú Buscar->Limpiar o cámbielo."
 
-#: ../mail/message-list.c:4172
+#: ../mail/message-list.c:4181
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -15786,6 +16045,7 @@ msgstr ""
 "el cuerpo de un mensaje."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -16021,8 +16281,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Seleccione un archivo de respaldo válido para restaurar."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "La carpeta seleccionada no tiene suficientes permisos para crear el archivo"
+msgid "The selected folder is not writable."
+msgstr "No se puede escribir en la carpeta seleccionada."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -16057,10 +16317,10 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
-"Crear entradas _automáticamente en la libreta de direcciones cuando se "
-"responda al correo"
+"Crear entradas _automáticamente en la libreta de direcciones al responder "
+"correos"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -16072,12 +16332,10 @@ msgstr "Contactos de mensajería instantánea"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar periódicamente la información de contacto y las imágenes desde "
-"la lista de amigos de Pidgin"
+"Sincronizar información e imágenes de contactos desde la lista de contactos "
+"de Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -16161,7 +16419,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:671
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
@@ -16183,7 +16441,7 @@ msgstr "Proporciona funcionalidad básica para calendarios locales."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:695
 msgid "Re_fresh:"
 msgstr "A_ctualizar:"
 
@@ -16323,10 +16581,29 @@ msgstr ""
 "Proporciona funcionalidad para marcar un calendario o una libreta de "
 "direcciones como el o la predeterminada."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
 msgstr "_Cabeceras personalizadas"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Clave"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Valores"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"El formato para especificar el valor de una clave de cabecera personalizada "
+"es:\n"
+"Valores clave del nombre de la cabecera personalizada separados por «;»."
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "Cabeceras personalizadas del correo-e"
@@ -16341,7 +16618,7 @@ msgid "Custom Header"
 msgstr "Cabecera personalizada"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "Lista de cabeceras personalizadas"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16457,33 +16734,33 @@ msgstr "Tamaño de las carpetas"
 msgid "Exchange Settings"
 msgstr "Configuración de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:674
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:700
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:721
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
 msgstr "_Buzón:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:922
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Comprobar tipos soportados "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1048
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KiB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1050
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16704,7 +16981,7 @@ msgstr "Tamaño de la carpeta"
 msgid "User"
 msgstr "_Usuario"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Subscribirse a la carpeta de otro usuario"
@@ -17034,10 +17311,16 @@ msgid "Could not update out-of-office state"
 msgstr "No es posible actualizar el estado de disponibilidad"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Evolution requiere reiniciarse para cargar el buzón de correo del usuario "
+"suscrito"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "La cuenta de Exchange está desconectada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17064,32 +17347,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Falló al actualizar delegados:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "La carpeta ya existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "La carpeta no existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Carpeta desconectada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Error genérico"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "No es posible llegar al Servidor de Catálogo Global"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17097,73 +17380,73 @@ msgstr ""
 "Si OWA se está ejecutando en una ruta diferente, debe especificarla en el "
 "diálogo de configuración de cuenta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "El buzón de {0} no está en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Asegúrese de que la URL es correcta e intente de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Asegúrese de que el nombre del servidor esté escrito correctamente e "
 "inténtelo de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "No hay un servidor de Catálogo Global configurado para esta cuenta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "No hay buzón para el usuario {0} en {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "No existe ese usuario {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Contraseña cambiada con éxito."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "Introduzca la Id del delegado o deseleccione la opción Enviar como delegado."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Asegúrese de que el nombre del Servidor de Catálogo Global es correcto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Por favor, reinicie Evolution para que los cambios tengan efecto"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Seleccione un usuario."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "El servidor rechazó la contraseña porque es demasiado débil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "La cuenta de Exchange se desactivará cuando salga de Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "La cuenta de Exchange se eliminará cuando salga de Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "El servidor Exchange no es compatible con Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17171,7 +17454,7 @@ msgstr ""
 "El servidor está funcionando con Exchange 5.5. Exchange Connector\n"
 "sólo soporta Microsoft Exchange 2000 y 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17185,57 +17468,58 @@ msgstr ""
 "\n"
 "O quizá tan sólo ha escrito mal la contraseña."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Inténtelo con una contraseña diferente."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "No puede añadirse el usuario a la lista de control de acceso:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Imposible editar delegados."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Error desconocido al buscar {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:597
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Tipo desconocido"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Operación no soportada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Está cerca de su cuota disponible para almacenar correo en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Le está permitido mandar un mensaje en nombre de a un solo delegado cada vez."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "No puede hacerse así mismo su propio delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Ha excedido su cuota para almacenar correo en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Sólo puede configurar una sola cuenta de Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17243,13 +17527,13 @@ msgstr ""
 "Su uso actual es: {0} Kib. Intente hacer algo de espacio borrando algunos "
 "mensajes."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "Su uso actual es: {0} Kib. No podrá ni enviar ni recibir correo ahora."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17257,19 +17541,19 @@ msgstr ""
 "Su uso actual es: {0} Kib. No podrá enviar correo hasta que haga algo de "
 "espacio borrando algunos mensajes."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Su contraseña ha caducado."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} no puede añadirse a la lista de control de acceso"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} ya es un delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} ya está en la lista"
 
@@ -17327,8 +17611,8 @@ msgstr ""
 "complemento. Inténtelo estableciendo un editor diferente."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Redactar en un editor externo"
+msgid "Compose in _External Editor"
+msgstr "Redactar en un editor _externo"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
@@ -17392,14 +17676,60 @@ msgstr "Desuscribirse de carpetas"
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:90
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:493
+msgid "Please enter user name first."
+msgstr "Introduzca el nombre de usuario primero."
+
+#: ../plugins/google-account-setup/google-source.c:497
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Introduzca la contraseña para que el usuario %s acceda a la lista de "
+"calendarios suscritos."
+
+#: ../plugins/google-account-setup/google-source.c:597
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"No se pueden leer los datos del servidor de Google.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:747
+msgid "Cal_endar:"
+msgstr "Cal_endario:"
+
+#: ../plugins/google-account-setup/google-source.c:782
+msgid "Retrieve _list"
+msgstr "Obtener _lista"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Servidor</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Usuario:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+msgid "Update every"
+msgstr "Actualizar cada"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Un complemento para configurar el calendario de Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Un complemento para configurar el calendario y los contactos de Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17510,12 +17840,6 @@ msgstr "Retractar correo"
 msgid "Add Send Options to groupwise messages"
 msgstr "Añadir opciones de envío a los mensajes de Groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Opciones de envío"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Un complemento para las características en las cuentas Groupwise."
@@ -17567,25 +17891,29 @@ msgstr "La cuenta ya existe"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
 "El inicio de sesion como &quot;{0}&quot; en el proxy ha fallado. Compruebe "
-"el ID del correo-e y compruebe de nuevo."
+"su dirección de correo-e e inténtelo de nuevo."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "Esta es una cita repetitiva"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "¿Qué desearía {0}?"
+msgid "Would you like to accept it?"
+msgstr "¿Quiere aceptarlo?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "¿Quiere rechazarlo?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "No puede compartir la carpeta con el usuario especificado &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Tiene que especificar el nombre de usuario que quiere añadir a la lista"
 
@@ -18093,31 +18421,31 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -18549,42 +18877,42 @@ msgid "_Update"
 msgstr "_Actualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Hora de fin:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Mandar _actualizaciones a los participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Notas:"
 
@@ -18643,7 +18971,9 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Genera un mensaje D-BUS cuando llega un mensaje de correo nuevo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If true, then beep, otherwise will play sound file when new messages arrive."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
 "Si está activado pitará, de otra manera reproducirá un archivo de sonido "
 "cuando lleguen mensajes nuevos."
@@ -18696,12 +19026,20 @@ msgstr ""
 "Indica si se deben notificar sólo los mensajes en la carpeta bandeja de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Generar un mensaje _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "Notificación de correo de Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "Propiedades de la notificación de correo"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18716,55 +19054,55 @@ msgstr[1] ""
 "Ha recibido %d mensajes nuevos\n"
 "en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ha recibido %d mensaje nuevo."
 msgstr[1] "Ha recibido %d mensajes nuevos."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Nuevo correo-e"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "Mostrar icono en el área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "Icono pa_rpadeante en el área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "_Mensaje emergente junto con el icono"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "Re_producir un sonido cuando llegue correo nuevo"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "_Pitar"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "Reproducir archivo de _sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "Reprod_ucir"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar nuevos mensajes sólo para la _bandeja de entrada"
 
@@ -19001,16 +19339,16 @@ msgid "_Unsubscribe from List"
 msgstr "_Desuscribirse de la lista"
 
 #: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "¿Desea marcar todos los mensajes en las subcarpetas como leídos?"
+msgid "Also mark messages in subfolders?"
+msgstr "¿Marcar también los mensajes en las subcarpetas?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "¿Desea realizar esta operación también en las subcarpetas?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:85
-msgid "Mark All Messages as Read"
-msgstr "Marcar todos los mensajes como leídos"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"¿Quiere marcar los mensajes como leídos sólo en la carpeta actual o en la capeta actual "
+"y todas sus subcarpetas?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:162
 msgid "Current Folder and _Subfolders"
@@ -19363,7 +19701,6 @@ msgid "MIME Type"
 msgstr "Tipo MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Guardar"
 
@@ -19497,12 +19834,12 @@ msgid "Show _only this Task List"
 msgstr "Mostrar _sólo esta lista de tareas"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that manages the Startup wizard."
-msgstr "Un complemento que gestiona el asistente de inicio."
+msgid "Guides you through your initial account setup."
+msgstr "Le guía a través de su configuración inicial de cuenta."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Asistente de inicio"
+msgid "Setup Assistant"
+msgstr "Asistente de configuración"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -19570,6 +19907,30 @@ msgstr "Agrupar mensajes según el asunto"
 msgid "F_all back to threading messages by subject"
 msgstr "Agrupar los mensajes por _asunto"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Lista de pares de palabras clave y valores para que el complemento de "
+"plantillas sustituya en el cuerpo del mensaje."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Sin título"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Guardar como plan_tilla"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Guardar como plantilla"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Borradores basados en el complemento de plantillas"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Un complemento sencillo que usa ytnef para decodificar adjuntos TNEF."
@@ -19578,6 +19939,28 @@ msgstr "Un complemento sencillo que usa ytnef para decodificar adjuntos TNEF."
 msgid "TNEF Attachment decoder"
 msgstr "Decodificador de adjuntos TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Un complemento para configurar contactos WebDAV."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contactos WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Evitar IfMatch (necesario en Apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Intérprete de Evolution"
@@ -19653,13 +20036,14 @@ msgstr "Id o alias del componente que se mostrará al iniciar."
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 "Si es «true» entonces las conexiones con el proxy requerirán autenticación. "
-"El combo usuario/contraseña está definido en \"/apps/evolution/shell/"
-"network_config/authentication_user\" y la contraseña se almacena ocalmente "
-"en .gnome2_private/."
+"El usuario se obtiene de la clave de GConf \"/apps/evolution/shell/"
+"network_config/authentication_user\" y la contraseña de gnome-keyring o bien "
+"del archivo de contrasñeas ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
@@ -19953,29 +20337,9 @@ msgstr "Importar un _único archivo"
 msgid "Evolution Preferences"
 msgstr "Preferencias de Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "No ha especificado un nombre de carpeta."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "El nombre de la carpeta no puede contener el carácter «/»."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "El nombre de la carpeta no puede contener el carácter «#»."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' y '..' son nombres reservados de carpetas."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20000,7 +20364,7 @@ msgstr "No es posible ejecutar Bug Buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2008\n"
@@ -20011,39 +20375,47 @@ msgstr ""
 "Eneko Lacunza <enlar@iname.com>, 2001-2002\n"
 "Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Página web de Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Error al abrir la página web de P+F."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: ../shell/e-shell-window.c:384
-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:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution está conectado.\n"
+"Pulse este botón para trabajar desconectado."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está en proceso de desconectarse."
 
-#: ../shell/e-shell-window.c:398
-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:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution está desconectado.\n"
+"Pulse este botón para trabajar conectado."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:782
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
@@ -20073,9 +20445,9 @@ msgstr "No es posible registrar en OAF"
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Nuevo"
 
@@ -20084,6 +20456,7 @@ msgid "New Test"
 msgstr "Prueba nueva"
 
 #: ../shell/test/evolution-test-component.c:108
+msgctxt "New"
 msgid "_Test"
 msgstr "_Prueba"
 
@@ -20979,7 +21352,7 @@ msgstr "Renombra la carpeta seleccionada"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "G_uarda la libreta de direcciones como VCard"
+msgstr "G_uardar la libreta de direcciones como VCard"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
@@ -20997,7 +21370,7 @@ msgstr "Guarda los contactos de la carpeta seleccionada como VCard"
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
@@ -21066,7 +21439,7 @@ msgstr "_Mover contacto a…"
 msgid "_Move Folder Contacts To"
 msgstr "_Mover contactos de la carpeta a"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nuevo"
 
@@ -21204,193 +21577,6 @@ msgstr "Semana laboral"
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Pulse aquí para adjuntar un archivo"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Pulse aquí para cerrar la ventana actual"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Pulse aquí para guardar la vista actual"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Pulse aquí para ver la ayuda disponible"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Cerrar"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copia el texto seleccionado al portapapeles"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Corta el texto seleccionado al portapapeles"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "_Insertar"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Pega texto desde el portapapeles"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Selecciona todo el texto"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "Ay_uda"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opciones"
-
-# 'Acontecimiento para todo el día' no cabe
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Todo el día"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Acontecimiento para todo el _día"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Clasificar como confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Clasificar como privado"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Clasificar como público"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Pulse aquí para poner o quitar alertas para este acontecimiento"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Opciones de envío avanzadas"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Convertir en acontecimiento repetitivo"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Consultar información de disponibilidad para los participantes"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Campo «_Rol»"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Opciones de envío"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Mostrar hora como _ocupada"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Zona horaria"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Cambia indicando si se muestra el campo «Tipo de participante»"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Conmuta cuando se muestra el campo «Confirmar»"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Conmuta cuando se muestra el campo «Rol»"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Conmuta cuando se muestra el campo «Estado»"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Conmuta cuando se muestra la «Zona horaria»"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Conmuta cuando se muestran las categorías"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Se activa cuando se tiene un «Acontecimiento para todo el día»"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Se activa cuando se deben mostrar la hora como ocupada"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alertas"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorías"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Clasificación"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Disponibilidad"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privado"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_Confirmar"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Repetición"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Campo de _estado"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Campo de _tipo"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancela la operación de correo actual"
@@ -22094,6 +22280,10 @@ msgstr "_Ampliar"
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Cerrar"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
@@ -22130,22 +22320,6 @@ msgstr "Ver la nota seleccionada"
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Pulse para cambiar / ver los detalles del estado de la tarea"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Detalles del estado"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Zona horaria"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Detalles de _estado"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copia las tareas seleccionadas"
@@ -22341,50 +22515,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Ver/Ocultar la barra de estado"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Trabajar _desconectado"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Olvidar contraseñas"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Preguntas más frecuentes"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Ocultar botones"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Sólo _iconos"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Opciones de _sincronización…"
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Ventana"
 
@@ -22599,36 +22777,10 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KiB"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MiB"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GiB"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barra de adjuntos"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-msgid "Recent Docu_ments"
-msgstr "Docu_mentos recientes"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22707,16 +22859,16 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Ancho mínimo"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Ancho mínimo"
 
@@ -22981,6 +23133,14 @@ msgstr ""
 "horaria. Los usuarios que sólo dispongan de teclado pueden, en su lugar, "
 "seleccionar la zona horaria desde la caja combinada desplegable inferior."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "En línea"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "El botón de estado está en línea"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Sincronizar con:"
@@ -23005,35 +23165,35 @@ msgstr "Modelo de reflujo"
 msgid "Column width"
 msgstr "Anchura de columna"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Pulse aquí para cambiar el tipo de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Buscar"
 
 # En conflicto con _Buscar del menu principal
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 # Conflicto con _Ver del menú principal
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "Vacia_r"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texto"
@@ -23041,19 +23201,19 @@ msgstr "Texto"
 # #En conflicto con _Mensaje
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "M_ostrar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "_Buscar: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " e_n "
 
@@ -23209,14 +23369,14 @@ msgid "_When opened:"
 msgstr "_Al abrir:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (…)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
@@ -23432,81 +23592,81 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Alternar colores de las filas"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Dibujar rejilla horizontal"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Dibujar rejilla vertical"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Dibujar el foco"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Modo del cursor"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Modelo de selección"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Umbral de longitud"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Altura uniforme de la fila"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Congelado"
 
@@ -23582,24 +23742,24 @@ msgstr "Ordenar información"
 msgid "Tree"
 msgstr "Árbol"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Cabecera de la tabla"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modelo de la tabla"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Fila del cursor"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Buscar siempre"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Pulsar para añadir"
 
diff --git a/po/fr.po b/po/fr.po
index 902be38811..c2c7f864f9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,13 +21,14 @@
 # Myriam Malga <mmalga@redhat.com>, 2007.
 # Bruno Brouard <annoa.b@gmail.com>, 2008.
 #
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-07 18:43+0100\n"
-"PO-Revision-Date: 2008-03-07 22:33+0100\n"
-"Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
+"POT-Creation-Date: 2008-07-24 21:44+0200\n"
+"PO-Revision-Date: 2008-07-24 21:42+0200\n"
+"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,21 +37,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "carnet d'adresses d'Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -58,7 +59,6 @@ msgstr[0] "dossier actuel du carnet d'adresses %s possède %d carte"
 msgstr[1] "dossier actuel du carnet d'adresses %s possède %d cartes"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Ouvrir"
 
@@ -168,7 +168,7 @@ msgid "calendar view for one or more days"
 msgstr "vue du calendrier pour un ou plusieurs jours"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -179,20 +179,18 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -200,10 +198,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -213,17 +211,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Calendrier de GNOME"
 
@@ -335,35 +331,35 @@ msgstr "Calendrier : du %s au %s"
 msgid "evolution calendar item"
 msgstr "élément du calendrier d'Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Bouton déroulant"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Utiliser le défaut"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Menu contextuel"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Affiche/Masque la barre des pièces jointes"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "activer"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"« {0} » est une source de carnet d'adresses en lecture seule uniquement. "
-"Basculez en vue des contacts et mettez en évidence un carnet d'adresses qui "
-"puisse accepter les contacts."
+"« {0} » est un carnet d'adresses en lecture seule et il ne peut être modifié. "
+"Veuillez sélectionner un autre carnet d'adresses dans le panneau latéral en "
+"mode Contacts."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -413,11 +409,12 @@ msgstr "Impossible de supprimer le carnet d'adresses."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"Actuellement, Evolution ne permet d'accéder qu'au système d'adresses "
-"GroupWise. Utilisez un autre client de messagerie pour avoir accès aux "
-"contacts fréquents et au dossier de contacts personnels de GroupWise."
+"Actuellement, Evolution ne permet d'accéder qu'au carnet d'adresses système "
+"GroupWise. Utilisez une fois un autre client de messagerie Groupwise pour "
+"obtenir les contacts fréquents et les dossiers de contacts personnels de "
+"GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -437,7 +434,7 @@ msgstr "L'authentification sur le serveur LDAP a échoué."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "La suppression du contact a échoué."
 
@@ -450,31 +447,27 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "Le serveur a renvoyé des informations relatives au schéma non valides."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "Permission refusée."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Version du serveur"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Il est possible que certaines fonctionnalités ne fonctionnent pas "
 "correctement avec la version actuelle de votre serveur"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Le carnet d'adresses d'Evolution a quitté de façon inattendue."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "L'image que vous avez sélectionnée est grande. Voulez-vous la redimensionner "
 "avant de l'enregistrer ?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
 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 "
@@ -485,20 +478,20 @@ msgstr ""
 "Renseignez-vous auprès de votre administrateur sur les bases de recherche "
 "prises en charge."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "Ce carnet d'adresses sera définitivement supprimé."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "Ce carnet d'adresses ne peut pas être ouvert."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 "Le serveur de carnet d'adresses n'a aucune des bases de recherche suggérées."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -506,29 +499,29 @@ msgstr ""
 "Il se peut que le serveur de carnet d'adresses soit injoignable, que le nom "
 "du serveur contienne une faute ou bien que votre réseau soit coupé."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 "Ce serveur ne prend pas en charge les informations relatives au schéma "
 "LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Impossible d'effectuer une recherche."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Impossible d'enregistrer {0}."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Voulez-vous enregistrer les modifications ?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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?"
@@ -537,7 +530,7 @@ msgstr ""
 "mais il ne peut pas être supprimé de la source. Voulez-vous en faire une "
 "copie à la place ?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -548,6 +541,12 @@ msgstr ""
 "résultats, il est recommandé de mettre à niveau votre serveur vers une "
 "version supportée"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+"Vous ne disposez pas des droits nécessaires pour supprimer un contact dans "
+"ce carnet d'adresses."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -587,8 +586,8 @@ msgid "_Use as it is"
 msgstr "_Utiliser tel quel"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -597,17 +596,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Adresse de synchronisation par défaut :"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Impossible de charger le carnet d'adresses"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Impossible de lire les données de l'application Adresses du Pilot"
 
@@ -629,10 +628,10 @@ msgstr "Configurez la complétion automatique ici"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -641,8 +640,8 @@ msgid "Evolution Address Book"
 msgstr "Carnet d'adresses d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Pop-up d'adresse du carnet d'adresses d'Evolution"
+msgid "Evolution Address Book address popup"
+msgstr "Fenêtre surgissante d'adresse du carnet d'adresses d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -673,11 +672,12 @@ msgstr "Gérez vos certificats S/MIME ici"
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
@@ -690,15 +690,16 @@ msgstr "Sur cet ordinateur"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Personnel"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Sur les serveurs LDAP"
@@ -720,7 +721,7 @@ msgid "Create a new contact list"
 msgstr "Crée une nouvelle liste de contacts"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
@@ -738,72 +739,72 @@ msgstr ""
 "Échec lors de la mise à jour des paramètres ou des dossiers du carnet "
 "d'adresses."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Type :"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:618
 msgid "Copy _book content locally for offline operation"
 msgstr "Copier localement le contenu du _carnet pour les opérations hors ligne"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:967
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Général"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:972
 msgid "Server Information"
 msgstr "Informations sur le serveur"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:974
 msgid "Authentication"
 msgstr "Authentification"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:977
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Détails"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Recherche"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:980
 msgid "Downloading"
 msgstr "Téléchargement"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propriétés du carnet d'adresses"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migration..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migration de « %s » :"
@@ -859,48 +860,48 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en :"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Renommer le dossier"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Les noms des dossiers ne peuvent pas contenir le caractère « / »"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "_Nouveau carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "Enregistrer comme vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Sélecteur de source des contacts"
 
@@ -909,19 +910,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Saisissez le mot de passe"
@@ -1002,106 +1003,98 @@ msgid "<b>Authentication</b>"
 msgstr "<b>Authentification</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Affichage</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Téléchargement</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Recherche</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Informations sur le serveur</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Type :</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Ajouter carnet d'adresses"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Toujours"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonymement"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "Basique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "Nom distinctif"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "Adresse électronique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution utilisera cette adresse électronique pour vous authentifier auprès "
 "du serveur."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "Trouver les bases de recherche possibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "Co_nnexion :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Jamais"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sans chiffrement"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "Un"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Chiffrement SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "Filtre de recherche"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Ba_se de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "_Filtre de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "Filtre de recherche"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1111,7 +1104,7 @@ msgstr ""
 "celui-ci n'est pas modifié, la recherche par défaut sera effectuée sur la "
 "classe objet du type « personne »."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1119,7 +1112,7 @@ msgstr ""
 "Sélectionner cette option signifie que Evolution se connectera à votre "
 "serveur LDAP uniquement si votre serveur LDAP prend en charge SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1127,7 +1120,7 @@ msgstr ""
 "Sélectionner cette option signifie que Evolution se connectera à votre "
 "serveur LDAP uniquement si votre serveur LDAP prend en charge TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../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 "
@@ -1137,23 +1130,23 @@ msgstr ""
 "SSL ni TLS. Cela signifie que votre connexion ne sera pas sécurisée et que "
 "vous serez vulnérable aux failles de sécurité."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "Sous"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bases de recherche prises en charge"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Chiffrement TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 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 "
@@ -1163,7 +1156,7 @@ msgstr ""
 "recherches devront débuter. Si vous ne renseignez pas ce champ, la recherche "
 "débutera à la racine de l'arborescence du dossier."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 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 "
@@ -1175,7 +1168,7 @@ msgstr ""
 "les entrées sous la base de recherche. Un domaine de recherche « one » "
 "inclura les entrées se trouvant un niveau en dessous de la base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1183,7 +1176,7 @@ msgstr ""
 "Ceci représente le nom complet de votre serveur LDAP. Par exemple, « ldap."
 "monentreprise.com »."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1191,17 +1184,17 @@ msgstr ""
 "Ceci représente le nombre maximum d'entrées à télécharger. Un nombre trop "
 "élevé ralentira l'accès à votre carnet d'adresses."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 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 ""
 "Ceci est la méthode qui sera utilisée par Evolution pour vous authentifier. "
-"Notez que spécifier « Adresse électronique » implique l'accès anonyme à "
-"votre serveur LDAP."
+"Notez que spécifier « Adresse électronique » implique l'accès anonyme à votre "
+"serveur LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1209,7 +1202,7 @@ msgstr ""
 "Ceci représente le nom du serveur tel qu'il apparaîtra dans la liste des "
 "dossiers d'Evolution. Il est utilisé pour l'affichage uniquement."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 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 "
@@ -1219,75 +1212,75 @@ msgstr ""
 "connecter. Une liste de ports standard est fournie. Demandez à votre "
 "administrateur système le port à utiliser."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "_Ajouter carnet d'adresses"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "_Trouver les bases de recherche possibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "_Méthode d'identification :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "Domain_e de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "S_erveur :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "_Délai :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "_Utiliser une connexion sécurisée :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "cartes"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "minutes"
 
@@ -1328,7 +1321,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Bureau</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1340,16 +1333,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tégories..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -1362,7 +1355,7 @@ msgid "Image"
 msgstr "Image"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "Messagerie MSN"
 
@@ -1375,7 +1368,7 @@ msgid "Nic_kname:"
 msgstr "_Surnom :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1389,11 +1382,11 @@ msgstr "Téléphone"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Bureau"
 
@@ -1415,9 +1408,9 @@ msgid "_Birthday:"
 msgstr "Date de _naissance :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1848
 msgid "_Calendar:"
 msgstr "C_alendrier :"
 
@@ -1505,1119 +1498,1121 @@ msgstr "_Où :"
 msgid "_Zip/Postal Code:"
 msgstr "_Code postal :"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Modifiable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "États-Unis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algérie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Samoa (US)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antarctique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antigua et Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Arménie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Australie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Autriche"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbaïdjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahreïn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbade"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Biélorussie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Bénin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermudes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhoutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnie Herzégovine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Île Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brésil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Territoire britannique de l'océan Indien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Brunéi Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgarie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina-Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Cambodge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Cameroun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Cap Vert"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Îles Caïman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "République Centrafricaine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Tchad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chili"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Chine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Île Christmas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Îles Cocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colombie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, République démocratique du"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Îles Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Côte d'Ivoire"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croatie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Chypre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "République Tchèque"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Danemark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "République Dominicaine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Équateur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Égypte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Guinée Équatoriale"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Érythrée"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estonie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Éthiopie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Îles Malouines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Îles Féroé"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Îles Fidji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "France"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Guyane Française"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Polynésie Française"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Terres Australes Françaises"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Géorgie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Allemagne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Grèce"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenade"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernesey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinée"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "Guinée Bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
+msgstr "Guinée-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haïti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Îles Heard et McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Vatican"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hongrie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "Inde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israël"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaïque"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Jordanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corée, République démocratique populaire de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Corée (République de)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Koweït"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Lettonie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Liban"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libye"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lituanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macédoine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malaisie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldives"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Îles Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Maurice"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "Mexique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronésie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldavie (République de)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Maroc"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Birmanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Népal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Antilles Néerlandaises"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nouvelle Calédonie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nouvelle Zélande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Île Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Îles Marianes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norvège"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Territoire Palestinien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papouasie Nouvelle Guinée"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Pérou"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Philippines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Pologne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "La Réunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Roumanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Russie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "St Kitts et Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Sainte Lucie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint-Vincent-et-les-Grenadines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome et Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Arabie Saoudite"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Sénégal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Serbie et Monténégro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slovénie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Îles Salomon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Afrique du Sud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Géorgie du Sud et Îles Sandwich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Espagne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "St Hélène"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre et Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Soudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Îles Svalbard et Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Suisse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Syrie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzanie (République Unie de)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Thaïlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor oriental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad et Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunisie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turquie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkménistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Îles Turks et Caïques"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Ouganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Émirats Arabes Unis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Royaume-Uni"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "Îles isolées (US)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Ouzbékistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Vénézuéla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Îles Vierges britanniques"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "Îles Vierges américaines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Îles Wallis et Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Yémen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zambie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "Messagerie instantanée AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Messagerie Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Messagerie Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Service"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Domicile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Autre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Livre source"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Livre cible"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "Nouveau contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Champs modifiables"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "Champs requis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Modifié"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Éditeur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "Sélectionnez une image pour ce contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "_Aucune image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2625,47 +2620,47 @@ msgstr ""
 "La donnée sur le contact n'est pas valide :\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "« %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s « %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s « %s » est vide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "Contact non valide."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "Mo_difier entièrement"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Nom complet"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "_Adresse électronique"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Sélectionner le carnet d'adresses"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2674,7 +2669,7 @@ msgstr ""
 "Voulez-vous vraiment\n"
 "supprimer cette liste de contacts (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2682,7 +2677,7 @@ msgstr ""
 "Voulez-vous vraiment\n"
 "supprimer ces listes de contacts ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2691,7 +2686,7 @@ msgstr ""
 "Voulez-vous vraiment\n"
 "supprimer ce contact (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2835,12 +2830,17 @@ msgstr ""
 msgid "Contact List Members"
 msgstr "Membres de la liste de contacts"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "_Membres"
+
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Carnet"
 
@@ -2848,10 +2848,6 @@ msgstr "Carnet"
 msgid "Is New List"
 msgstr "Est une nouvelle liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Membres"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contact Modifié :"
@@ -2889,40 +2885,39 @@ msgstr ""
 "Le nom ou l'adresse électronique de ce contact existe déjà\n"
 "dans ce dossier. Voulez-vous quand même l'ajouter ?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
 msgid "Merge Contact"
 msgstr "Fusionner le contact"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Fusionner"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Adresse électronique"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Le nom commence par"
+msgid "Name contains"
+msgstr "Le nom contient"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2937,9 +2932,9 @@ msgstr[1] "%d contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Requête"
 
@@ -2950,9 +2945,9 @@ msgstr "Erreur d'obtention de l'affichage du carnet"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modèle"
 
@@ -2960,107 +2955,109 @@ msgstr "Modèle"
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "Le nom commence par"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Source"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "Enregistrer comme vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Nouveau contact..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "_Nouvelle liste de contacts..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Enregistrer comme vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Faire suivre le contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Faire suivre les contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Envoyer un _message au contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Envoyer un _message à la liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Envoyer un _message aux contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "Copier vers le carnet d'_adresses..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "_Déplacer vers le carnet d'adresses..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "_Couper"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "Co_pier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "C_oller"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "Toutes les catégories"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Autre erreur"
 
@@ -3095,7 +3092,7 @@ msgstr "Téléphone (voiture)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3196,9 +3193,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "Rôle"
 
@@ -3234,38 +3231,38 @@ msgid "Web Site"
 msgstr "Site Web"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Largeur"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Hauteur"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "A le focus"
 
@@ -3285,11 +3282,21 @@ msgstr "Modèle de texte"
 msgid "Max field name length"
 msgstr "Longueur max. du nom du champ"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "Largeur des colonnes"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Recherche des contacts..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3303,7 +3310,7 @@ msgstr ""
 "\n"
 "ou double-cliquez ici pour créer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3317,7 +3324,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour créer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3327,7 +3334,7 @@ msgstr ""
 "\n"
 "Rechercher le contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3337,40 +3344,41 @@ msgstr ""
 "\n"
 "Il n'y a aucun élément à afficher dans cette vue."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptateur"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Adresse électronique (travail)"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Adresse électronique (domicile)"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Autre adresse électronique"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Sélectionné"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "A le curseur"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir un lien dans le navigateur"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "Envoyer un nouveau _message à..."
 
@@ -3392,7 +3400,7 @@ msgid "map"
 msgstr "carte"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Membres de la liste"
 
@@ -3413,15 +3421,15 @@ msgid "Video Chat"
 msgstr "Vidéo-conférence"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3430,8 +3438,7 @@ msgstr "Calendrier"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Libre/Occupé"
 
@@ -3453,125 +3460,127 @@ msgid "Web Log"
 msgstr "Journal en ligne"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Date de naissance"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Anniversaire"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Fonction"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Page Web personnelle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Succès"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Moteur de traitement occupé"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Dépôt hors ligne"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 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:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "Aucun contact personnel défini"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permission refusée"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Contact non trouvé"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 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:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protocole non pris en charge"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Annulé"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "Impossible d'annuler"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Échec de l'authentification"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Authentification requise"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 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:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "Aucun message correspondant"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "Non disponible en mode hors ligne"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Version du serveur non valide"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3582,7 +3591,7 @@ msgstr ""
 "téléchargé pour une consultation hors ligne. Veuillez charger ce carnet "
 "d'adresses une fois en mode connecté pour télécharger son contenu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3591,7 +3600,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vérifiez que le chemin %s existe "
 "et que vous avez les permissions pour y accéder."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3599,7 +3608,7 @@ 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:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 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 "
@@ -3609,7 +3618,7 @@ msgstr ""
 "utiliser LDAP dans Evolution, vous devez installer un paquet d'Evolution "
 "avec support LDAP activé."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3617,7 +3626,7 @@ 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:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3630,7 +3639,7 @@ msgstr ""
 "recherche ou augmenter le nombre maximum de résultats dans\n"
 "les préférences du serveur d'annuaires de ce carnet d'adresses."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 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"
@@ -3643,49 +3652,49 @@ msgstr ""
 "temps dans les préférences du serveur d'annuaires de ce carnet \n"
 "d'adresses."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 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:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
 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:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 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:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
 msgstr "Erreur lors de l'ajout de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 #: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "Erreur lors de l'ajout du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "Erreur lors de la modification de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "Erreur lors de la modification du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "Erreur lors de la suppression de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 #: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "Erreur lors de la suppression du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3700,16 +3709,16 @@ msgstr[1] ""
 "L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres.\n"
 "Voulez-vous vraiment afficher ces contacts ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "_Ne pas afficher"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "Afficher _tous les contacts"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3718,7 +3727,7 @@ msgstr ""
 "%s existe déjà.\n"
 "Voulez-vous l'écraser ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "Écraser"
 
@@ -3761,27 +3770,27 @@ msgstr "Déplacer les contacts vers"
 msgid "Copy contacts to"
 msgstr "Copier les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "vCards multiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard pour %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, c-format
 msgid "Contact information"
 msgstr "Informations sur le contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informations sur le contact %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "Interrogation du carnet d'adresses..."
 
@@ -3809,43 +3818,43 @@ msgstr "Enregistrer dans le carnet d'adresses"
 msgid "Card View"
 msgstr "Affichage de la carte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importation..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importateur Outlook CSV et Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importateur Mozilla CSV et Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importateur Evolution CSV et Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Assistant d'importation LDIF d'Evolution"
 
@@ -3898,11 +3907,11 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "En-tête"
@@ -4005,7 +4014,7 @@ msgstr "Ombrage"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1055
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4024,7 +4033,7 @@ msgid "Top:"
 msgstr "Haut :"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Type :"
 
@@ -4135,14 +4144,24 @@ msgstr "Erreur non gérée"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"« {0} » est une source de calendrier en lecture seule. Basculez en vue du "
-"calendrier et mettez en évidence un calendrier qui puisse accepter les "
-"rendez-vous."
+"« {0} » est un calendrier en lecture seule et il ne peut être modifié. "
+"Veuillez sélectionner un autre calendrier dans le panneau latéral en mode "
+"Calendriers."
 
-#: ../calendar/calendar.error.xml.h:3
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"« {0} » est un calendrier en lecture seule et il ne peut être modifié. "
+"Veuillez sélectionner un autre calendrier qui puisse accepter les rendez-"
+"vous."
+
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4150,7 +4169,7 @@ msgstr ""
 "Ajouter un résumé compréhensible permet de donner à vos destinataires une "
 "idée sur le but de votre rendez-vous."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4158,19 +4177,19 @@ msgstr ""
 "Ajouter un résumé compréhensible permet de donner à vos destinataires une "
 "idée sur le but de votre tâche."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de ces mémos seront supprimées et ne pourront pas "
 "être restaurées."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de ce mémo seront supprimées et ne pourront pas être "
 "restaurées."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4178,129 +4197,133 @@ msgstr ""
 "Toutes les informations sur ces rendez-vous seront supprimées et ne pourront "
 "pas être restaurées."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de ces tâches seront supprimées et ne pourront pas "
 "être restaurées."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations sur ce rendez-vous seront supprimées et ne pourront "
 "pas être restaurées."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations sur cette réunion seront supprimées et ne pourront "
 "pas être restaurées."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de ce mémo seront supprimées et ne pourront pas être "
 "restaurées."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de cette tâche seront supprimées et ne pourront pas "
 "être restaurées."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Voulez-vous vraiment supprimer la tâche intitulée « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Voulez-vous vraiment supprimer le rendez-vous intitulé « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Voulez-vous vraiment supprimer le mémo « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Voulez-vous vraiment supprimer ces {0} rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Voulez-vous vraiment supprimer ces {0} mémos ?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Voulez-vous vraiment supprimer ces {0} tâches ?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Voulez-vous vraiment supprimer ce rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Voulez-vous vraiment supprimer cette réunion ?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Voulez-vous vraiment supprimer ce mémo ?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Voulez-vous vraiment supprimer cette tâche ?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Voulez-vous vraiment enregistrer le mémo sans résumé ?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Voulez-vous vraiment envoyer le rendez-vous sans résumé ?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Voulez-vous vraiment envoyer la tâche sans résumé ?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
-msgstr "Impossible de créer un nouvel évènement"
+msgstr "Impossible de créer un nouvel événement"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Impossible d'enregistrer l'événement"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Supprimer le calendrier « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Supprimer la liste des mémos « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Supprimer la liste des tâches « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "_Ne pas envoyer"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Téléchargement en cours. Voulez-vous enregistrer ce rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Téléchargement en cours. Voulez-vous enregistrer la tâche ?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "L'éditeur ne peut pas être chargé."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4308,26 +4331,26 @@ msgstr ""
 "Des invitations vont être envoyées par courriel à tous les participants, les "
 "autorisant à accepter cette tâche."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Des invitations vont être envoyées par courriel à tous les participants, les "
 "autorisant à répondre à celle-ci."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Erreur lors du chargement du calendrier"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Erreur lors du chargement de la liste des mémos"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Erreur lors du chargement de la liste des tâches"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4335,7 +4358,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que la réunion a été annulée."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4343,7 +4366,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que le mémo a été supprimé."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4351,7 +4374,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que la tâche a été supprimée."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4359,7 +4382,7 @@ msgstr ""
 "L'envoi d'informations à jour permet aux autres participants de maintenir à "
 "jour leurs calendriers."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4367,7 +4390,7 @@ msgstr ""
 "L'envoi d'informations à jour permet aux autres participants de maintenir à "
 "jour leurs listes de tâches."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4375,7 +4398,7 @@ msgstr ""
 "Des pièces jointes ont été téléchargées mais l'enregistrement du rendez-vous "
 "sera effectué, sans les pièces jointes, auxquelles il est associé."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4383,89 +4406,89 @@ msgstr ""
 "Des pièces jointes ont été téléchargées mais l'enregistrement de la tâche "
 "sera effectué, sans les pièces jointes, auxquelles elle est associée."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Certaines fonctionnalités peuvent ne pas fonctionner correctement avec la "
 "version actuelle de votre serveur."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Le calendrier d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Le memo d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Le gestionnaire de tâches d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "Le calendrier n'est pas marqué pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
 msgstr "La liste des mémos n'est pas marquée pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "La liste des tâches n'est pas marquée pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "Ce calendrier sera définitivement supprimé."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "Cette liste des mémos sera définitivement supprimée."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "Cette liste des tâches sera définitivement supprimée."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Voulez-vous enregistrer les modifications apportées à ce rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "Voulez-vous enregistrer les modifications apportées à ce mémo ?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "Voulez-vous enregistrer les modifications apportées à cette tâche ?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Voulez-vous envoyer un avis d'annulation pour ce mémo ?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Voulez-vous envoyer un avis d'annulation à tous les participants ?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Voulez-vous envoyer des invitations pour la réunion aux participants ?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "Voulez-vous envoyer cette tâche aux participants ?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Voulez-vous envoyer des informations mises à jour sur la réunion aux "
 "participants ?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Voulez-vous envoyer des informations mises à jour sur la tâche aux "
 "participants ?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4476,114 +4499,113 @@ msgstr ""
 "meilleurs résultats, il est recommandé de mettre à niveau votre serveur vers "
 "une version prise en charge."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Les modifications de ce rendez-vous n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "Les modifications de cette tâche n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Les modifications de ce mémo n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Vos calendriers ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Vos mémos ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Vos tâches ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "A_bandonner les modifications"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "_Enregistrer les modifications"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 #: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "_Envoyer un avis"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Partager les événements sur plusieurs jours :"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Impossible de démarrer evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "Impossible de lire les données de l'application « Calendrier » du pilot."
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Impossible de lire les données de l'application « Mémo » du pilot."
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Impossible d'écrire les données de l'application « Mémo » du pilot."
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Priorité par défaut :"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossible de lire les données de l'application « À faire » du pilot."
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Impossible d'écrire les données de l'application « À faire » du pilot."
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Calendrier et tâches"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Calendriers"
 
@@ -4626,25 +4648,25 @@ msgid "Memo_s"
 msgstr "Mémo_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Mémos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tâches"
@@ -4662,25 +4684,25 @@ msgstr "_Tâches"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Service de notification d'alarme du calendrier d'Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Heure de début"
 
@@ -4691,10 +4713,10 @@ msgstr "Rendez-vous"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1002
 msgid "Location:"
 msgstr "Lieu :"
 
@@ -4703,17 +4725,15 @@ msgid "Snooze _time:"
 msgstr "_Durée du report :"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "É_dition"
 
@@ -4725,32 +4745,32 @@ msgstr "_Reporter"
 msgid "location of appointment"
 msgstr "lieu du rendez-vous"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Aucun résumé disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No location information available."
 msgstr "Aucune information sur le lieu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d alarmes sont présentes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4763,7 +4783,7 @@ msgstr ""
 "un courriel. Evolution affichera une fenêtre\n"
 "d'avertissement classique à la place."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4780,15 +4800,15 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "Ne plus m'interroger à propos de ce programme."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Impossible d'initialiser Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4801,7 +4821,7 @@ msgid "invalid time"
 msgstr "Heure non valide"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4810,7 +4830,7 @@ msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4821,7 +4841,7 @@ msgstr[1] "%d minutes"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -5081,12 +5101,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Afficher le champ état dans l'éditeur d'événement/tâche/réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show the \"Preview\" pane"
 msgstr "Afficher le panneau « Aperçu »"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show the \"Preview\" pane."
 msgstr "Afficher le panneau « Aperçu »."
 
@@ -5298,66 +5318,66 @@ msgstr "Minute à laquelle les jours ouvrés commencent"
 msgid "daylight savings time"
 msgstr "ajustement de l'heure d'été"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "La catégorie est"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "L'emplacement contient"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "Différent"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "Tâches des 7 prochains jours"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "Tâches actuelles"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "Tâches en retard"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "Tâches terminées"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "Tâches avec des pièces jointes"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "Rendez-vous actuels"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "Rendez-vous des 7 prochains jours"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimer"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5367,16 +5387,16 @@ msgstr ""
 "que la date sélectionnée. Si vous continuez, vous ne pourrez plus récupérer "
 "ces événements."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Nettoyer les événements plus vieux que"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:403
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "jours"
 
@@ -5384,107 +5404,107 @@ msgstr "jours"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "Sur le Web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Météo"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Nouveau calendrier"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2090
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Échec de la mise à jour des calendriers."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir le calendrier « %s » pour créer des événements et des "
 "réunions"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Il n'y a pas de calendrier disponible pour créer des événements et des "
 "réunions"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Sélecteur de source de calendrier"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nouveau rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Crée un nouveau rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "_Réunion"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Crée une nouvelle demande de réunion"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nouveau rendez-vous toute la journée"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "Rendez-vous toute la _journée"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Crée un nouveau rendez-vous toute la journée"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "_Calendrier"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Crée un nouveau calendrier"
 
@@ -5505,15 +5525,219 @@ msgid "Month View"
 msgstr "Vue mensuelle"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "N'importe quel champ"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Pièces jointes"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Participant"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Travail"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Catégorie"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Classification"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Compétition"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Confidentiel"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Description"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "La description contient"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "N'existe pas"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existe"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favoris"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Cadeaux"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Buts/Objectifs"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Vacances"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Cartes de vacances"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Contacts importants"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Idées"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "International"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Client clé"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Prochains 7 jours"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organisateur"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Appels téléphoniques"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privé"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Public"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Récurrence"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "État"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Stratégies"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Résumé"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Le résumé contient"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Fournisseurs"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Charges horaires"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "En attente"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contient"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "ne contient pas"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "est"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "n'est pas"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Erreur lors de l'ouverture du calendrier"
@@ -5526,11 +5750,11 @@ msgstr "Méthode non prise en charge pour l'ouverture du calendrier"
 msgid "Permission denied to open the calendar"
 msgstr "Vous n'avez pas les droits suffisants pour ouvrir le calendrier."
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Éditer l'alarme"
 
@@ -5563,17 +5787,17 @@ msgid "Mes_sage:"
 msgstr "_Message :"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Jouer un son"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Afficher une alerte"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Lancer un programme"
 
@@ -5586,7 +5810,7 @@ msgid "Send To:"
 msgstr "Envoyer à :"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Envoyer un courriel"
 
@@ -5634,6 +5858,7 @@ msgid "hour(s)"
 msgstr "heure(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -5641,7 +5866,7 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "Début du rendez-vous"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "Action/Activation"
 
@@ -5652,16 +5877,15 @@ msgstr "A_jouter"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggérer l'affichage automatique de la pièce jointe"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "Joindre des fichiers"
 
@@ -5731,8 +5955,8 @@ msgid "Display"
 msgstr "Affichage"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -5747,8 +5971,8 @@ msgstr ""
 "Jours"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Lundi"
 
@@ -5771,7 +5995,7 @@ msgstr ""
 "Dimanche"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:112
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
@@ -5781,8 +6005,8 @@ msgid "S_un"
 msgstr "_Dim"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -5799,8 +6023,8 @@ 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:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -5818,8 +6042,8 @@ msgid "Template:"
 msgstr "Modèle :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -5833,14 +6057,14 @@ msgid "Time format:"
 msgstr "Format de date :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Mardi"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -5920,320 +6144,471 @@ msgstr "M_er"
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu du calendrier pour les opérations hors ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu de la liste des tâches pour les opérations "
 "hors ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu de la liste des mémos pour les opérations hors "
 "ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "C_ouleur :"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "Couleu_r :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Liste des mémos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Propriétés du calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Propriétés de la liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "Nouvelle liste de tâches"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "Propriétés de la liste des mémos"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
-msgstr "Nouvelle liste des mémos"
+msgstr "Nouvelle liste de mémos"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Cet événement a été supprimé."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Cette tâche a été supprimée."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "Ce mémo a été supprimé."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Vous avez effectué des modifications. Voulez-vous les annuler et fermer "
 "l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 "%s  Vous n'avez effectué aucune modification. Voulez-vous fermer l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Cet événement a été modifié."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Cette tâche a été modifiée."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "Ce mémo a été modifié."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Vous avez effectué des modifications. Voulez-vous les annuler et mettre "
 "à jour l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 "%s  Vous n'avez effectué aucune modification. Voulez-vous mettre à jour "
 "l'éditeur ?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erreur de validation : %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " À "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (terminé "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Terminé "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (date d'échéance "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Message joint - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Message joint"
 msgstr[1] "%d messages joints"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
 #: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Déplacer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Annuler le _déplacement"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Éditer le rendez-vous"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Réunion - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Rendez-vous - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tâche attribuée - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Tâche - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Mémo - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Aucun résumé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Cliquez ici pour fermer la fenêtre actuelle"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Copie le texte sélectionné dans le presse-papiers"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Coupe le texte sélectionné vers le presse-papiers"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Cliquez ici pour voir l'aide disponible"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Colle le texte depuis le presse-papiers"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Cliquez ici pour enregistrer la fenêtre actuelle"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Sélectionne tout le texte"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "C_lassification"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_Fichier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "I_nsertion"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Options"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2082
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "_Affichage"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Pièce jointe..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Cliquez ici pour joindre un fichier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Catégories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "L'état indique si les catégories sont affichées"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Fu_seau horaire"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "L'état indique si le champ Fuseau horaire est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Pu_blic"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Classer comme public"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Classer comme privé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Confidentiel"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Classer comme confidentiel"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Champ _Rôle"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "L'état indique si le champ Rôle est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "L'état indique si le champ RSVP est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Champ _État"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "L'état indique si le champ État est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Champ _Type"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "L'état indique si le champ Type de participant est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Docu_ments récents"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Joindre"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> pièce jointe"
 msgstr[1] "<b>%d</b> pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Masquer la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Afficher la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "A_jouter une pièce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Afficher les pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Appuyez sur la barre espace pour basculer la barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Éditer le rendez-vous"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Réunion - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Rendez-vous - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tâche attribuée - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Tâche - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Mémo - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "Aucun résumé"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les modifications effectuées sur cet élément peuvent être annulées en cas de "
 "réception d'une mise à jour"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version actuelle !"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Impossible d'ouvrir la source"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Impossible d'ouvrir la destination"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "La destination est en lecture seule"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "_Supprimer cet élément de toutes les autres boîtes à lettres des "
 "destinataires ?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'événement à cause d'une erreur CORBA."
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "Impossible de supprimer la tâche à cause d'une erreur CORBA."
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Impossible de supprimer le mémo à cause d'une erreur CORBA."
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'élément à cause d'une erreur CORBA."
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Impossible de supprimer l'événement à cause de permissions insuffisantes."
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "Impossible de supprimer la tâche à cause de permissions insuffisantes."
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Impossible de supprimer le mémo à cause de permissions insuffisantes."
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Impossible de supprimer l'élément à cause de permissions insuffisantes."
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "Impossible de supprimer l'événement à cause d'une erreur."
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "Impossible de supprimer la tâche à cause d'une erreur."
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "Impossible de supprimer le mémo à cause d'une erreur."
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "Impossible de supprimer l'élément à cause d'une erreur."
 
@@ -6242,7 +6617,7 @@ msgid "Contacts..."
 msgstr "Contacts..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Déléguer à :"
 
@@ -6250,135 +6625,182 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alarmes"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Cliquez ici pour définir ou annuler les alarmes de cet événement"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Récurrence"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Transforme en événement récurrent"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Options d'envoi"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Insère les options avancées d'envoi"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Toute la _journée"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "L'état indique si défini comme « Événement toute la journée »"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Afficher la période comme _occupée"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "L'état indique si la période est affichée comme occupée"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Libre/Occupé"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr ""
+"Interroge les personnes attendues sur leur disponibilité (libre/occupé)"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Rendez-vous"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Récurrence"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Cet événement possède des alarmes"
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisateur :"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Délégués"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "Participa_nts"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Événement sans date de début"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Événement sans date de fin"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "La date de début est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "La date de fin est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "L'heure de début est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "L'heure de fin est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "L'organisateur sélectionné n'a plus de compte."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Ajouter "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossible d'ouvrir le calendrier « %s »."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Vous intervenez pour le compte de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d jour avant le rendez-vous"
 msgstr[1] "%d jours avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d heure avant le rendez-vous"
 msgstr[1] "%d heures avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute avant le rendez-vous"
 msgstr[1] "%d minutes avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Personnaliser"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "Aucune"
 
@@ -6450,28 +6872,24 @@ msgstr "_Changer l'organisateur"
 msgid "Co_ntacts..."
 msgstr "Co_ntacts..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organisateur"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organisateur :"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Mémo"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Impossible d'ouvrir les mémos dans « %s »."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "À"
 
@@ -6489,65 +6907,65 @@ msgid "_Description:"
 msgstr "_Description :"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Groupe :"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement un événement récurrent. Que souhaitez-vous "
 "modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Vous déléguez actuellement un événement récurrent. Que souhaitez-vous "
 "déléguer ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement une tâche récurrente. Que souhaitez-vous "
 "modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement un mémo récurrent. Que souhaitez-vous modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Seulement cette occurrence"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Cette occurrence et les précédentes"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Cette instance et celles à venir"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Toutes les occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 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:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "La date de la récurrence est non valide"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "le"
 
@@ -6555,7 +6973,7 @@ msgstr "le"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "première"
 
@@ -6564,7 +6982,7 @@ msgstr "première"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "seconde"
 
@@ -6572,7 +6990,7 @@ msgstr "seconde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "troisième"
 
@@ -6580,7 +6998,7 @@ msgstr "troisième"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "quatrième"
 
@@ -6588,13 +7006,13 @@ msgstr "quatrième"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "dernier"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Autre date"
 
@@ -6602,7 +7020,7 @@ msgstr "Autre date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1er au 10"
 
@@ -6610,7 +7028,7 @@ msgstr "1er au 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11 au 20"
 
@@ -6618,47 +7036,47 @@ msgstr "11 au 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21 au 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "jour"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "le"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "occurrences"
 
 # pas certain de la traduction. ça peut être aussi exclusion ...
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Ajouter une exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Impossible d'obtenir une sélection à modifier."
 
 # idem add exception
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modifier l'exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Impossible d'obtenir une sélection à détruire."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Date/Heure"
 
@@ -6709,12 +7127,12 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "année(s)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "La date d'achèvement est erronée."
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Page Web"
 
@@ -6729,51 +7147,55 @@ msgstr "<span weight=\"bold\">État</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:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Achevée"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Haute"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "En cours"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Basse"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normale"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Non démarrée"
 
@@ -6786,7 +7208,7 @@ msgid "Stat_us:"
 msgstr "É_tat :"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Indéfinie"
 
@@ -6795,7 +7217,7 @@ msgid "_Date completed:"
 msgstr "_Date d'achèvement :"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Priorité :"
 
@@ -6803,25 +7225,38 @@ msgstr "_Priorité :"
 msgid "_Web Page:"
 msgstr "Page _Web :"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Détails de l'é_tat"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Cliquer pour modifier ou afficher les détails de l'état de la tâche"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Options d'_envoi"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "_Tâche"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Détails de la tâche"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sateur :"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "La date d'échéance est erronée"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tâches dans « %s »."
@@ -6847,7 +7282,7 @@ msgid "_Due date:"
 msgstr "_Date d'échéance :"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6855,142 +7290,126 @@ msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Action inconnue à exécuter"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s avant le début du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s après le début du rendez-vous"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s au début du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s avant la fin du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s après la fin du rendez-vous"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s à la fin du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s à %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Date de début :"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Description :"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Page Web :"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Résumé :"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Date d'échéance :"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Status:"
 msgstr "État :"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Priorité :"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Public"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privé"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Confidentiel"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Date de fin"
@@ -7000,21 +7419,14 @@ msgstr "Date de fin"
 msgid "Start Date"
 msgstr "Date de début"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "Résumé"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Occupé"
 
@@ -7029,34 +7441,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Oui"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -7068,159 +7480,185 @@ msgstr "Récurrent"
 msgid "Assigned"
 msgstr "Attribué"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
 msgid "Select folder to save selected attachments..."
 msgstr "Choisir le dossier où enregistrer les pièces jointes sélectionnées..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
 msgstr "image_sansnom.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "Définir comme _arrière-plan"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Enregistrer la sélection"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:330
+msgid "* No Summary *"
+msgstr "* Aucun résumé *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisateur : %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisateur : %s"
+
+#: ../calendar/gui/e-calendar-table.c:400
+msgid "Start: "
+msgstr "Début : "
+
+#: ../calendar/gui/e-calendar-table.c:412
+msgid "Due: "
+msgstr "Échéance : "
+
+#: ../calendar/gui/e-calendar-table.c:581
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:583
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:584
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:585
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:586
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:587
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1563
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Nouvelle _tâche"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site Web"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1569
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Imprimer..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "C_oller"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Attribuer une tâche"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1581
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1582
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches sélectionnées comme terminées"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1583
 msgid "_Mark as Incomplete"
 msgstr "_Marquer comme incomplet"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1584
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marquer les tâches sélectionnées comme incomplètes"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Delete Selected Tasks"
 msgstr "_Supprimer les tâches sélectionnées"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1826
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -7243,7 +7681,8 @@ msgid "Due date"
 msgstr "Date d'échéance"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Priorité"
 
@@ -7251,112 +7690,93 @@ msgstr "Priorité"
 msgid "Start date"
 msgstr "Date de début"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "État"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Déplacement d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "Copie d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "Nouveau re_ndez-vous..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "Nouvel évén_ement toute la journée"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "Nouvelle _réunion"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "Vue a_ctive"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "Sélectionner au_jourd'hui"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "_Sélectionner une date..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "_Imprimer..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le c_alendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le calendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "Déléguer une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurrence _déplaçable"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisateur : %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisateur : %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Lieu : %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Heure : %s %s"
@@ -7384,7 +7804,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions par minute"
@@ -7395,46 +7815,34 @@ msgstr "%02i divisions par minute"
 #. 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:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Oui. (Récurrence complexe)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Tous les jours"
 msgstr[1] "Tous les %d jours"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7442,9 +7850,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Toutes les semaines"
 msgstr[1] "Toutes les %d semaines"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7452,51 +7858,35 @@ msgstr[0] "Toutes les semaines le "
 msgstr[1] "Toutes les %d semaines le "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " et "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "Le %s jour de "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "Le %s %s de "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "tous les mois"
 msgstr[1] "tous les %d mois"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Tous les ans"
 msgstr[1] "Tous les %d ans"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7504,47 +7894,47 @@ msgstr[0] " un total de %d fois"
 msgstr[1] " un total de %d fois"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", finissant le "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Débuts"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Fins"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Échéance"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7552,28 +7942,28 @@ msgstr ""
 "<br> Vérifiez les informations suivantes puis sélectionner une action du "
 "menu ci-dessous."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Accepté"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Refusé"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7581,267 +7971,267 @@ msgstr ""
 "La réunion a été annulée mais elle ne peut pas être trouvée dans vos "
 "calendriers"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tâche a été annulée mais elle ne peut pas être trouvée dans vos listes de "
 "tâches"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, 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:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, 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:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, 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:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> souhaite être intégré à une réunion existante."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, 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:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, 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:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> a annulé une réunion."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Annulation de réunion"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, 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:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Message de réunion incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, 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:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, 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:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, 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:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> souhaite être intégré à une tâche existante."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, 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:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> a répondu à une attribution de tâche."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Réponse à une tâche"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> a annulé une tâche."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Annulation de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Message de tâche incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, 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:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Information Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, 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:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Demande Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, 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:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Message Libre/Occupé incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 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:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Le message ne contient que des requêtes non prises en charge."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 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:1712
+#: ../calendar/gui/e-itip-control.c:1735
 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:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objet n'est pas valide et ne peut pas être mis à jour\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 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:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "L'état du participant n'a pas pu être mis à jour à cause d'un état non "
 "valide !\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "État du participant mis à jour\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "L'état du participant ne peut pas être mis à jour car l'élément n'existe plus"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Élément envoyé !\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Impossible d'envoyer l'élément !\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Accepter provisoirement"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Mettre à jour l'état de l'interlocuteur"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
@@ -7870,112 +8260,112 @@ msgstr "Chargement du calendrier..."
 msgid "Server Message:"
 msgstr "Message du serveur :"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Participants attendus"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Participants optionnels"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Ressources"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "Individuel"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
 #: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Groupe"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
 #: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "Salle"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
 #: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "Président"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "Participant attendu"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "Non participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "Nécessite une action"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "Provisoire"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Délégué"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Participant                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -7983,85 +8373,81 @@ msgstr "%A %d %B %Y"
 #. 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.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Absent du bureau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Aucune information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Par_ticipants..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Afficher Zoom a_rrière"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Mettre à jour Libre/Occupé"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Toutes les _personnes et une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Personnes atte_ndues"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Personnes attendues et _une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "Heure de _début :"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "Heure de _fin :"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Participant"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Cliquez ici pour ajouter un participant"
@@ -8094,8 +8480,8 @@ msgstr "_Supprimer les mémos sélectionnés"
 msgid "Click to add a memo"
 msgstr "Cliquez ici pour ajouter un mémo"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8104,85 +8490,84 @@ msgstr ""
 "Erreur sur %s :\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Chargement des mémos"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ouverture des mémos de %s"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Chargement des tâches"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "Sélectionner un fuseau horaire"
 
 #. 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/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "Mise à jour de la requête"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "Vue _personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "_Enregistrer la vue personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "_Définir les vues..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Chargement des mémos à %s"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "Nettoyage"
 
@@ -8242,138 +8627,142 @@ msgstr "Septembre"
 msgid "_Select Today"
 msgstr "_Sélectionner aujourd'hui"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Un organisateur doit être défini."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nécessaire."
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Informations de l'événement"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Informations du mémo"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Information Libre/Occupé"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Informations du calendrier"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Actualiser"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Information Libre/Occupé (%s à %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Information iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Nouvelle liste des mémos"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d mémo"
 msgstr[1] "%d mémos"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d sélectionné"
 msgstr[1] ", %d sélectionnés"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "La mise à jour des mémos a échoué."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir la liste des mémos « %s » pour créer des événements et "
 "des réunions"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Il n'y a pas de calendrier disponible pour créer des mémos"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Sélecteur de source de mémos"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nouveau mémo"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Mem_o"
 msgstr "Mém_o"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Crée un nouveau mémo"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nouveau mémo partagé"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "_Shared memo"
 msgstr "Mémo _partagé"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Crée un nouveau mémo partagé"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nouvelle liste de mémos"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Memo li_st"
 msgstr "L_iste de mémos"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Crée une nouvelle liste de mémos"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Imprimer les mémos"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days'"
+msgstr "Prochains 7 jours"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8385,7 +8774,7 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8398,7 +8787,7 @@ msgstr ""
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
@@ -8406,21 +8795,21 @@ msgstr ""
 "xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Impossible de migrer le calendrier « %s »"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Impossible de migrer les tâches « %s »"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "Notes"
 
@@ -8628,69 +9017,69 @@ msgstr "Contacts : "
 msgid "Upcoming Appointments"
 msgstr "Prochains rendez-vous"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Nouvelle liste de tâches"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tâche"
 msgstr[1] "%d tâches"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "La mise à jour des tâches a échoué."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir la liste de tâches « %s » pour créer des événements et "
 "des réunions"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 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:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Sélecteur de source de tâche"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crée une nouvelle tâche"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nouvelle tâche attribuée"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Assigne_d Task"
 msgstr "Tâche _attribuée"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Crée une nouvelle tâche attribuée"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nouvelle liste de tâches"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Tas_k list"
 msgstr "_Liste de tâches"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Crée une nouvelle liste de tâches"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8702,49 +9091,70 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Ne plus poser la question."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% effectué"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Annulé"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "En cours"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "est supérieur à"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "est inférieur à"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Rendez-vous et réunions"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "Ouverture du calendrier"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "Fichiers iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Assistant d'importation iCalendar d'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Rappel !"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "Fichiers vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Assistant d'importation vCalendar d'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Événements du calendrier"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Assistant d'importation intelligent du calendrier d'Evolution"
 
@@ -10278,56 +10688,214 @@ msgstr "Pacifique/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Cliquez ici pour le carnet d'adresses"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "Impossible d'ouvrir le fichier d'enregistrement automatique"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Destination d'envoi"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Impossible de récupérer le message depuis l'éditeur"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Choisissez les dossiers auxquels envoyer ce message."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Insertion d'une pièce jointe"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Cliquez ici pour sélectionner les dossiers de destination"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "_Joindre"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "Si_gnature :"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "Message sans sujet"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "_De :"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "Joindre un fichier"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "_Répondre à :"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Fermer"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "_À :"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "Ferme le fichier actuel"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Imprimer..."
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "_Aperçu avant impression"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "Enregistre le fichier actuel"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "Enregistrer _sous..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "Enregistre le fichier actuel avec un nom différent"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "Enregistrer le _brouillon"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "Enregistre comme brouillon"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "E_nvoyer"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "Envoie ce message"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "Insére les options d'envoi"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Nouveau _message"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Ouvre la fenêtre Nouveau message"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "_Codage des caractères"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "Séc_urité"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "_Chiffrer avec PGP"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "Chiffre ce message avec PGP"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "_Signer avec PGP"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "Signe ce message avec votre clé PGP"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "_Prioriser le message"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "Affecte une priorité élevée au message"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "D_emander un accusé de lecture"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "Obtenir un avertissement quand votre message est lu"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "C_hiffrer avec S/MIME"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Chiffre ce message avec votre certificat de chiffrement S/MIME"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S_igner avec S/MIME"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Signe ce message avec votre certificat de signature S/MIME"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "Champ Cc_i"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Indique si le champ Cci est affiché"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "Champ _Cc"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "Indique si le champ Cc est affiché"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "Champ _De"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Indique si le champ De est affiché"
+
+# voir les toggles au dessus !
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "Champ En_voyé à"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Indique si le champ Envoyé à est affiché"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "Champ _Répondre à"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Indique si le champ Répondre à est affiché"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "Champ _Sujet"
+
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Indique si le champ Sujet est affiché"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "Champ _À"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "Indique si le champ À est affiché"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Cc :"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "Cc_i :"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-composer-header-table.c:71
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10335,30 +10903,70 @@ msgstr ""
 "Saisissez les adresses qui recevront une copie du message sans apparaître "
 "dans la liste des destinataires du message"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "_De :"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "_Répondre à :"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_À :"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc :"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "Cc_i :"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_Poster à :"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "_Sujet :"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "_Joindre"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Si_gnature :"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Insertion d'une pièce jointe"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "Destination d'envoi"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Choisissez les dossiers auxquels envoyer ce message."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "Cliquez ici pour sélectionner les dossiers de destination"
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "_Documents récents"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "Afficher la barre des pièces _jointes"
+
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossible de signer le message sortant : aucun certificat de signature "
 "défini pour ce compte"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10366,42 +10974,23 @@ msgstr ""
 "Impossible de chiffrer le message sortant : aucun certificat de chiffrement "
 "défini pour ce compte"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Pièce jointe"
+msgstr[1] "Pièces jointes"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "Masquer la barre des pièces _jointes"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "Afficher la barre des pièces _jointes"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Raison inconnue"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Impossible d'ouvrir le fichier"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Impossible de récupérer le message depuis l'éditeur"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Message sans sujet"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Ouvrir un fichier"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Rédaction d'un message"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10435,8 +11024,7 @@ msgstr ""
 "À cause de « {0} », il se peut que vous ayez besoin de choisir d'autres "
 "options de messagerie."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "À cause de « {1} »."
 
@@ -10560,7 +11148,7 @@ msgstr "Vous devez configurer un compte avant de pouvoir rédiger un courriel."
 msgid "_Do not Recover"
 msgstr "_Ne pas récupérer"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Récupérer"
 
@@ -10572,7 +11160,7 @@ msgstr "_Enregistrer le message"
 msgid "Evolution Mail and Calendar"
 msgstr "Messagerie et calendrier d'Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Suite de travail collaboratif"
 
@@ -10589,51 +11177,74 @@ msgstr "carte de visite"
 msgid "calendar information"
 msgstr "Informations du calendrier"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Erreur d'Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Avertissement d'Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Information d'Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Requête d'Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erreur interne, erreur inconnue « %s » demandée"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Composant"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "Nom du composant en cours de journalisation"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "Activé"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Indique si le greffon est activé"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Erreur durant l'impression"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 "Le système d'impression a rapporté les informations suivantes sur cette "
 "erreur :"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 "Le système d'impression n'a pas rapporté d'informations supplémentaires sur "
 "cette erreur."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "À cause de « {1} »."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
 msgstr "Impossible d'ouvrir le fichier « {0} »."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
 msgstr "Impossible d'enregistrer le fichier « {0} »."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10641,7 +11252,7 @@ msgid "Do you wish to overwrite it?"
 msgstr "Voulez-vous l'écraser ?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
 msgstr "Fichier existant « {0} »."
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10652,49 +11263,62 @@ msgstr "Écraser le fichier ?"
 msgid "_Overwrite"
 msgstr "É_craser"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "I_mportant"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Bureau"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Personnel"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "À _faire"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "Plus _tard"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
-msgstr "_Nom du libellé :"
+msgstr "_Nom de l'étiquette :"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
-msgstr "Modifier le libellé"
+msgstr "Modifier l'étiquette"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
-msgstr "Ajouter un libellé"
+msgstr "Ajouter une étiquette"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
-msgstr "Un nom de libellé ne peut pas être vide."
+msgstr "Un nom d'étiquette ne peut pas être vide."
+
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+"Ce nom d'étiquette est déjà utilisé sur ce serveur. Veuillez choisir un "
+"autre nom d'étiquette."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "Erreur GConf : %s"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-msgstr "Un libellé avec la même étiquette existe déjà. Renommez votre libellé."
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "Toutes les erreurs futures seront affichées seulement sur le terminal."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10812,65 +11436,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Sélectionnez une heure pour la comparaison"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:851
 msgid "R_ule name:"
 msgstr "Nom de la _règle :"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:879
 msgid "Find items that meet the following criteria"
 msgstr "Chercher les éléments qui correspondent aux critères suivants"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:913
 msgid "A_dd Filter Criteria"
 msgstr "A_jouter un critère au filtre"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If all criteria are met"
 msgstr "Si tous les critères sont remplis"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If any criteria are met"
 msgstr "Si un des critères est rempli"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:921
 msgid "_Find items:"
 msgstr "_Trouver les éléments :"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "All related"
 msgstr "Tous ceux relatifs"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies"
 msgstr "Réponses"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies and parents"
 msgstr "Réponses et parents"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "No reply or parent"
 msgstr "Pas de réponse ou parent"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:945
 msgid "I_nclude threads"
 msgstr "I_nclure les fils de discussion"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrant"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Sortant"
 
@@ -10894,7 +11518,7 @@ msgstr "Date manquante."
 msgid "Missing file name."
 msgstr "Nom de fichier manquant."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Nom manquant."
 
@@ -10970,7 +11594,7 @@ msgstr "dans le futur"
 msgid "months"
 msgstr "mois"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "secondes"
 
@@ -10982,9 +11606,9 @@ msgstr "la date actuelle"
 msgid "the time you specify"
 msgstr "une date que vous spécifiez"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "semaines"
 
@@ -11000,7 +11624,7 @@ msgstr "Ajouter une règle"
 msgid "Edit Rule"
 msgstr "Éditer la règle"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Nom de la règle"
 
@@ -11026,57 +11650,69 @@ msgid "Configure your email accounts here"
 msgstr "Configurez ici vos comptes de messagerie."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "Configurez ici les paramètres de votre connexion réseau"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Messagerie d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../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:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Composant Messagerie d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Éditeur de courriel d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Configuration de l'éditeur de courriel d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Préférences de la messagerie d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Configuration réseau d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Courriel"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Comptes de messagerie"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "Préférences du courriel"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Préférences réseau"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Courriel"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Accord de licence %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11089,116 +11725,110 @@ msgstr ""
 "affiché ci-dessous pour « %s »\n"
 "et cochez la case pour l'accepter\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "Générée automatiquement"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Demander à chaque message"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identité"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
 msgid "Receiving Email"
 msgstr "Réception du courriel"
 
 # Toutes les n minutes (Stéphane)
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2041
 msgid "Check for _new messages every"
 msgstr "Vérifier les _nouveaux messages toutes les"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2049
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
 msgid "Sending Email"
 msgstr "Envoi du courriel"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Valeurs par défaut"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sécurité"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
 msgid "Receiving Options"
 msgstr "Options de réception"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
 msgid "Checking for New Messages"
 msgstr "Recherche de nouveaux messages"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Éditeur de comptes"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
-msgstr "[Défaut]"
-
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Activé"
+msgstr "[Par défaut]"
 
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Sans nom"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Langues"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Ajouter un script de signature"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Signatures"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transféré --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
 #. 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:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11206,11 +11836,11 @@ msgstr ""
 "Le ${WeekdayName} ${Day} ${MonthName} ${Year} à ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} a écrit :"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Message initial --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "Règles de _filtrage"
 
@@ -11227,10 +11857,6 @@ msgstr "Attribuer une couleur"
 msgid "Assign Score"
 msgstr "Attribuer un score"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Pièces jointes"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cci"
@@ -11248,10 +11874,6 @@ msgstr "Cc"
 msgid "Completed On"
 msgstr "Terminé "
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contient"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
@@ -11265,7 +11887,7 @@ msgid "Date sent"
 msgstr "Date d'envoi"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11276,10 +11898,6 @@ msgstr "Supprimer"
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ne contient pas"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ne finit pas par"
@@ -11300,10 +11918,6 @@ msgstr "ne ressemble pas à"
 msgid "does not start with"
 msgstr "ne commence pas par"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "N'existe pas"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Brouillon"
@@ -11312,10 +11926,6 @@ msgstr "Brouillon"
 msgid "ends with"
 msgstr "finit par"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existe"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existe"
@@ -11328,14 +11938,10 @@ msgstr "Expression"
 msgid "Follow Up"
 msgstr "Donner suite"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Important"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "est"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "est après"
@@ -11348,18 +11954,6 @@ msgstr "est avant"
 msgid "is Flagged"
 msgstr "est marqué"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "est supérieur à"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "est inférieur à"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "n'est pas"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "n'est pas marqué"
@@ -11372,7 +11966,7 @@ msgstr "n'est pas défini"
 msgid "is set"
 msgstr "est défini"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Pourriel"
@@ -11381,9 +11975,9 @@ msgstr "Pourriel"
 msgid "Junk Test"
 msgstr "Test pourriel"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
-msgstr "Libellé"
+msgstr "Étiquette"
 
 #: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
@@ -11423,7 +12017,7 @@ msgstr "Jouer le son"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lu"
 
@@ -11465,7 +12059,7 @@ msgstr "Expéditeur"
 
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
-msgstr "Définir le libellé"
+msgstr "Définir l'étiquette"
 
 #: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
@@ -11495,10 +12089,9 @@ msgstr "débute par"
 msgid "Stop Processing"
 msgstr "Arrêter le traitement"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11509,11 +12102,11 @@ msgid "Unset Status"
 msgstr "État non défini"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Alors"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Ajouter une ac_tion"
 
@@ -11531,7 +12124,7 @@ msgstr "Messages non lus"
 
 #: ../mail/em-folder-browser.c:217
 msgid "No Label"
-msgstr "Aucun libellé"
+msgstr "Aucune étiquette"
 
 #: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
@@ -11558,17 +12151,17 @@ msgid "Messages Not Junk"
 msgstr "Messages non pourriels"
 
 # Vérifier cette traduction dans l'interface
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Rechercher un compte"
 
 # Vérifier cette traduction dans l'interface
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Rechercher tous les comptes"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Messages non lus :"
@@ -11576,31 +12169,36 @@ msgstr[1] "Messages non lus :"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total des messages :"
 msgstr[1] "Total des messages :"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "Consommation de quotas"
+
+#: ../mail/em-folder-properties.c:385
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propriétés du dossier"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sélectionner un dossier>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "C_réer"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Dossiers de recherche"
 
@@ -11609,27 +12207,27 @@ msgstr "Dossiers de recherche"
 msgid "UNMATCHED"
 msgstr "CORRESPONDPAS"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Brouillons"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
+#: ../mail/mail-component.c:160
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Boîte d'envoi"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Envoyés"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
 msgid "Loading..."
 msgstr "Chargement..."
 
@@ -11648,7 +12246,7 @@ msgstr "Chargement..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:371
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
@@ -11667,12 +12265,12 @@ msgstr "Déplacement du dossier %s"
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers le dossier %s"
@@ -11690,45 +12288,37 @@ msgstr "_Copier vers le dossier"
 msgid "_Move to Folder"
 msgstr "_Déplacer vers le dossier"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Affichage"
-
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2083
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2088
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2091
 msgid "_Move..."
 msgstr "_Déplacer..."
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2099
 msgid "Re_fresh"
 msgstr "Ac_tualiser"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2100
 msgid "Fl_ush Outbox"
 msgstr "Vi_der la boîte d'envoi"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
@@ -11737,13 +12327,13 @@ msgstr "_Vider la corbeille"
 msgid "Copying `%s' to `%s'"
 msgstr "Copie de « %s » vers « %s »"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "C_opier"
 
@@ -11765,208 +12355,200 @@ msgstr "Création d'un dossier"
 msgid "Specify where to create the folder:"
 msgstr "Précisez l'emplacement de création du dossier :"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Impossible de supprimer le courriel"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 "Vous ne disposez pas des droits nécessaires pour supprimer ce courriel."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Faire suivre"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "É_diter comme un nouveau message..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Imprimer..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "_Déplacer vers le dossier..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Marquer comme non im_portant"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Marquer comme _pourriel"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Marquer comme non _pourriel"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Marquer pour _donner suite..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "É_tiquette"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Aucun"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
-msgstr "_Nouveau libellé"
+msgstr "_Nouvelle étiquette"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Créer une règle à partir du _message"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Dossier de recherche sur le _sujet"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Dossier de recherche sur l'e_xpéditeur"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Dossier de recherche sur les de_stinataires"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Dossier de recherche sur la _liste de diffusion"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filtre sur le su_jet"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filtre sur l'expé_diteur"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filtre sur les de_stinataires"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Impossible de récupérer le message"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Récupération du message..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "A_ppel à..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Créer un nouveau dossier de _recherche"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_De cette adresse"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_À cette adresse"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer pour envoyer un courriel à %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Cliquer pour appeler %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Cliquer pour masquer/afficher les adresses"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "Correspond : %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:616
 msgid "Fin_d:"
 msgstr "_Rechercher :"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:640
 msgid "_Previous"
 msgstr "_Précédent"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:645
 msgid "_Next"
 msgstr "_Suivant"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:650
 msgid "M_atch case"
 msgstr "Respecter la _casse"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Non signé"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11974,11 +12556,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:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Signature valide"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11986,11 +12568,11 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Signature non valide"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11998,11 +12580,11 @@ msgstr ""
 "La signature de ce message ne peut pas être vérifiée, il se peut qu'il ait "
 "été altéré lors de la transmission."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Signature valide, mais impossible de vérifier l'expéditeur"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12010,22 +12592,22 @@ msgstr ""
 "Ce message est signé avec une signature valide, mais l'expéditeur du message "
 "ne peut pas être vérifié."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "La signature existe, mais elle requiert une clé publique"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Ce message est signé avec une signature dont la clé publique est absente."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Non chiffré"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12033,11 +12615,11 @@ msgstr ""
 "Ce message n'est pas chiffré. Son contenu peut être lu lors de son passage "
 "sur Internet."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Chiffré, faiblement"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12047,11 +12629,11 @@ msgstr ""
 "sera difficile, mais pas impossible, pour une tierce personne de voir le "
 "contenu de ce message dans une période de temps raisonnable."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12059,11 +12641,11 @@ msgstr ""
 "Ce message est chiffré. Il sera difficile pour une tierce personne de voir "
 "le contenu de ce message."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Chiffré, fortement"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:963
 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 "
@@ -12073,94 +12655,89 @@ msgstr ""
 "vraiment difficile, pour une tierce personne, de voir le contenu de ce "
 "message dans une période de temps raisonnable."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1079
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Achevé le %d %B %Y à %H:%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "Retard :"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "le %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1461
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1462
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1463
 msgid "_Fit to Width"
 msgstr "Adapter à la _largeur"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1464
 msgid "Show _Original Size"
 msgstr "Afficher à la taille d'_origine"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Pièce jointe"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1984
 msgid "Save attachment as"
 msgstr "Enregistrer les pièces jointes sous"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
 msgstr "Sélectionner le dossier pour enregistrer toutes les pièces jointes"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
 msgstr "Enregi_strer la sélection..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2106
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d pièce joi_nte"
 msgstr[1] "%d pièces joi_ntes"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
 msgid "S_ave"
 msgstr "Enregi_strer"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2124
 msgid "S_ave All"
 msgstr "_Tout enregistrer"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2198
 msgid "No Attachment"
 msgstr "Aucune pièce jointe"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Afficher _sans mise en forme"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2341
 msgid "Hide _Unformatted"
 msgstr "Masquer _non formaté"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2396
 msgid "O_pen With"
 msgstr "_Ouvrir avec"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2467
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "Evolution ne peut pas afficher ce courriel car il trop volumineux pour être "
@@ -12172,286 +12749,299 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Page %d sur %d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Récupération de « %s »"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Partie externe au corps inconnue."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Partie externe au corps mal formée."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, 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:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (type « %s »)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Formatage des messages"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Formatage du message..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Cci"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Client de messagerie"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Date"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Groupes de discussion"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Ce message a été envoyé par <b>%s</b> pour le compte de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Répondre à"
 
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "Date"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Groupes de discussion"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "pièce jointe %s"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Type de chiffrement non pris en charge pour multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message"
 msgstr "Impossible d'analyser le message PGP/MIME"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message PGP/MIME : erreur inconnue"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "Format de signature non pris en charge"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "Erreur lors de la vérification de la signature"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "Erreur inconnue lors de la vérification de la signature"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message"
 msgstr "Impossible d'analyser le message PGP"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Impossible d'analyser le message PGP : erreur inconnue"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "À chaque fois"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Une fois par jour"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Une fois par semaine"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Une fois par mois"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Ajouter des en-têtes de pourriels personnalisés"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "_Nom de l'en-tête :"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "La valeur de l'en-tête contient :"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Contient la valeur"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Couleur"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Étiquette"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Le greffon %s est disponible et le paquet binaire est installé."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "Le greffon %s n'est pas disponible. Vérifiez si le paquet est installé."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Aucun greffon de pourriel disponible"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Plus tard"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"L'emplacement et la hiérarchie des dossiers des boîtes à lettres ont changé "
-"depuis Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migration de « %s » :"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Impossible de créer le nouveau dossier « %s » : %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Impossible de copier le dossier « %s » vers « %s » : %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Impossible de rechercher les boîtes à lettres existant dans « %s » : %s"
+
+#: ../mail/em-migrate.c:1868
+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 ""
-"Impossible de rechercher les boîtes à lettres existant dans « %s » : %s"
+"L'emplacement et la hiérarchie des dossiers des boîtes à lettres ont changé "
+"depuis Evolution 1.x.\n"
+"\n"
+"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Impossible d'ouvrir les anciennes données POP conservées sur le serveur « %"
 "s » : %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Impossible de créer un dossier pour les données POP3 restées sur le serveur "
 "« %s » : %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 "Impossible de copier les données POP3 restées sur le serveur « %s »  : %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 "La création du dossier de stockage de courriel local « %s » a échoué : %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Le format de résumé des dossiers de courriel d'Evolution utilise SQLite "
+"depuis Evolution 2.24.\n"
+"\n"
+"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
-"Impossible de créer les dossiers de stockage de courriel local sur « %s » : %"
-"s"
+"Impossible de créer les dossiers de stockage de courriel local sur « %s » : %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12459,64 +13049,67 @@ msgstr ""
 "Impossible de lire les paramètres de l'installation d'Evolution précédente, "
 "« evolution/config.xmldb » n'existe pas ou est corrompu."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "_Ajouter dans le carnet d'adresses"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Soit ce stockage ne prend pas en charge les abonnements, soit ils ne sont "
 "pas activés."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Dossier"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Sélectionnez un serveur."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné."
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_Ne plus afficher ce message."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Filtres de messages"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "message"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Enregistrer le message..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Ajouter adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
@@ -12530,55 +13123,67 @@ msgid "Search Folder source"
 msgstr "Source du dossier de recherche"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Hauteur de la fenêtre « Envoi et réception du courriel »"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "État de maximisation de la fenêtre « Envoi et réception du courriel »"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Largeur de la fenêtre « Envoi et réception du courriel »"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr ""
 "Permet à Evolution d'afficher des extraits de texte d'une taille limitée"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Toujours demander un accusé de lecture"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Durée d'affichage en secondes de l'erreur dans la barre d'état."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Reconnaître automatiquement les frimousses"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Reconnaître automatiquement les liens"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Vérifier si les messages entrants sont des pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Couleur de surbrillance des citations"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Couleur de surbrillance des citations."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Hauteur par défaut de la fenêtre d'édition"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Largeur par défaut de la fenêtre d'édition"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Répertoire de l'éditeur pour charger/joindre"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compresser l'affichage des adresses dans À/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12586,65 +13191,85 @@ msgstr ""
 "Compresser l'affichage des adresses dans À/Cc/Cci au nombre indiqué dans "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Custom headers to use while checking for junk."
+msgstr "En-têtes personnalisés à utiliser pour la détection des pourriels."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"En-têtes personnalisés à utiliser pour la détection des pourriels. Les "
+"éléments de la liste sont des chaînes au format « nom_entête=valeur »."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default charset in which to compose messages"
 msgstr "Jeu de caractère par défaut pour la rédaction des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages."
 msgstr "Jeu de caractère par défaut pour la rédaction des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to display messages"
 msgstr "Jeu de caractère par défaut pour l'affichage des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages."
 msgstr "Jeu de caractère par défaut pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default forward style"
 msgstr "Style de transfert par défaut"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default height of the Composer Window."
 msgstr "Hauteur par défaut de la fenêtre d'édition."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the message window."
 msgstr "Hauteur par défaut de la fenêtre des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the subscribe dialog."
 msgstr "Hauteur par défaut du dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default reply style"
 msgstr "Style de réponse par défaut"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default value for thread expand state"
 msgstr "Valeur par défaut pour l'état d'expansion des fils de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default width of the Composer Window."
 msgstr "Largeur par défaut de la fenêtre d'édition."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the message window."
 msgstr "Largeur par défaut de la fenêtre des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the subscribe dialog."
 msgstr "Largeur par défaut de la boîte de dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+"Indique s'il faut vérifier les adresses pour le filtrage des pourriels "
+"seulement dans le carnet d'adresses local"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Indique s'il faut consulter le carnet d'adresses pour l'expéditeur du "
 "courriel"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12657,13 +13282,13 @@ msgstr ""
 "l'opération peut être lente si vous utilisez des carnets d'adresses distants "
 "(tel que LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Indique s'il faut utiliser des en-têtes personnalisés pour la détection des "
 "pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12673,7 +13298,7 @@ msgstr ""
 "pourriels. Si cette option est active et que des en-têtes sont renseignés, "
 "la détection des pourriels sera plus rapide."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12681,57 +13306,63 @@ msgstr ""
 "Indique s'il faut utiliser les mêmes polices pour les lignes « De » et "
 "« Sujet » dans la colonne « Messages » en affichage verticale."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Directory for loading/attaching files to composer."
 msgstr "Répertoire pour charger/joindre des fichiers dans l'éditeur."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for saving mail component files."
 msgstr "Répertoire pour enregistrer les fichiers joints aux courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+"Activer ou désactiver les points de suspension dans les noms de dossier de "
+"l'arborescence des dossiers"
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Afficher les indicateurs de fautes d'orthographe au fil de la saisie."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Empty Junk folders on exit"
 msgstr "Vider les dossiers Pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Trash folders on exit"
 msgstr "Vider les dossiers Corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vider tous les dossiers Pourriels en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vider tous les dossiers Corbeille en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Activer la lecture au curseur, ainsi vous pouvez voir un curseur quand vous "
 "lisez vos mails."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable or disable magic space bar"
 msgstr "Activer ou désactiver la barre d'espace magique"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable type ahead search feature"
 msgstr "Activer ou désactiver la fonctionnalité de recherche interactive."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable search folders"
 msgstr "Activer les dossiers de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders on startup."
 msgstr "Active les dossiers de recherche au démarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12743,7 +13374,7 @@ msgstr ""
 "barre latérale saisissez simplement son nom et la sélection ira "
 "automatiquement sur ce dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12751,27 +13382,27 @@ msgstr ""
 "Activez ceci pour défiler avec la barre Espace dans l'aperçu des messages, "
 "les listes de messages et les dossiers."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable to render message text part of limited size."
 msgstr "Activer l'affichage partiel du texte selon une limite de taille."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable/disable caret mode"
 msgstr "Activer/désactiver la lecture au curseur"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Height of the message-list pane"
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane."
 msgstr "Hauteur du panneau de la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Masque l'aperçu par dossier et supprime la sélection"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12779,7 +13410,7 @@ msgstr ""
 "Si un utilisateur essaye d'ouvrir 10 messages ou plus en une seule fois, lui "
 "demander si c'est réellement ce qu'il désire."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12787,7 +13418,7 @@ msgstr ""
 "Si le panneau de prévisualisation est activé, il sera affiché côte à côte "
 "plutôt que verticalement."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
 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 "
@@ -12798,13 +13429,43 @@ msgstr ""
 "qui est attribué à un afficheur de composant bonobo, dans la base des types "
 "MIME GNOME, peut être utilisé pour l'affichage du contenu."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Hauteur initiale de la fenêtre « Envoi et réception du courriel ». La valeur "
+"est mise à jour si l'utilisateur redimensionne la fenêtre verticalement."
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"État maximisé initial de la fenêtre « Envoi et réception du courriel ». La "
+"valeur est mise à jour si l'utilisateur maximise ou démaximise la fenêtre. "
+"Notez que cette valeur particulière n'est pas utilisée par Evolution puisque "
+"la fenêtre « Envoi et réception du courriel » ne peut pas être maximisée. "
+"Cette clé n'est qu'un détail d'implémentation."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Largeur initiale de la fenêtre « Envoi et réception du courriel ». La valeur "
+"est mise à jour si l'utilisateur redimensionne la fenêtre horizontalement."
+
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Ceci active ou désactive la confirmation lors du marquage de messages "
 "multiples."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12812,7 +13473,7 @@ msgstr ""
 "Ceci active ou désactive les messages de confirmation répétés qui demandent "
 "si la synchronisation hors ligne est requise avant de basculer dans ce mode."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12822,31 +13483,31 @@ msgstr ""
 "suppression de messages du dossier de recherche supprime définitivement ces "
 "messages, et ne les supprime pas simplement des résultats de recherche."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Last time empty junk was run"
 msgstr "Dernière fois où les pourriels ont été vidés"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty trash was run"
 msgstr "Dernière fois où la corbeille a été vidée"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Level beyond which the message should be logged."
 msgstr "Niveau au-delà duquel les messages doivent être journalisés."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "List of Labels and their associated colors"
-msgstr "Liste des libellés et des couleurs qui leur sont associées"
+msgstr "Liste des étiquettes et des couleurs qui leur sont associées"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of accepted licenses"
 msgstr "Liste des licences acceptées"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accounts"
 msgstr "Liste de comptes"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12855,33 +13516,39 @@ msgstr ""
 "liste contient des chaînes désignant les noms des sous-dossiers relatifs à /"
 "apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste des en-têtes personnels et de leur activation."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+"Liste des codes de langue des dictionnaires utilisés pour la vérification "
+"orthographique."
+
+#: ../mail/evolution-mail.schemas.in.h:76
 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 ""
-"Liste des libellés connus pour le client de messagerie d'Evolution. Cette "
-"liste contient des chaînes de type nom:couleur où les couleurs utilisent "
-"l'encodage hexadécimal HTML."
+"Liste des étiquettes connues pour le client de messagerie d'Evolution. Cette "
+"liste contient des chaînes de type nom:couleur où les couleurs utilisent le "
+"codage hexadécimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste des types MIME à vérifier pour les composants bonobo de visualisation"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste des noms de protocoles dont la licence a été acceptée."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Load images for HTML messages over http"
 msgstr "Charger les images pour les messages HTML en utilisant http"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net. 1 - Load images in messages from contacts. 2 - "
@@ -12892,112 +13559,111 @@ msgstr ""
 "charger les images si l'expéditeur est dans le carnet d'adresses et 2 - "
 "toujours charger les images à partir du net."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Log filter actions"
 msgstr "Enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions to the specified log file."
 msgstr ""
 "Enregistre les actions des filtres dans le fichier de journal spécifié."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Logfile to log filter actions"
 msgstr "Fichier de journal où enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions."
 msgstr "Fichier de journal où enregistrer les actions des filtres."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Mark as Seen after specified timeout"
 msgstr "Marquer comme lu après le délai spécifié"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout."
 msgstr "Marquer comme lu après le délai spécifié."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marquer les citations dans le message « Preview »"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message « Preview »."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Message Window default height"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default width"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
-"Style d'affichage des messages (« normal », « en-têtes complets », "
-"« source »)"
+"Style d'affichage des messages (« normal », « en-têtes complets », « source »)"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Nombre minimum de jours entre les vidages de pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Nombre minimum de jours entre les vidages de corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Durée minimum en jours entre les vidages de pourriels en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Durée minimum en jours avant de vider la corbeille en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adresses à afficher pour À/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt on empty subject"
 msgstr "Demander pour les sujets vides"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Demander à l'utilisateur quand il ou elle essaie de nettoyer un dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans sujet."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Demander à l'utilisateur s'il désire passer immédiatement en mode hors ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
 "De_mander lors de la suppression de messages dans un dossier de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when user expunges"
 msgstr "Demander quand l'utilisateur nettoie"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Demander lors de l'envoi de 10 messages ou plus à la fois"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13005,77 +13671,77 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "pas."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires sans À ou Cc "
 "définis"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Demander lorsque l'utilisateur essaye d'envoyer des message HTML non désirés"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt while marking multiple messages"
 msgstr "Demander lors du marquage de messages multiples"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 "Reconnaître les frimousses dans le texte et les remplacer par des images."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize links in text and replace them."
 msgstr "Reconnaître les liens dans le texte et les remplacer."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Run junk test on incoming mail."
 msgstr "Lancer le test de pourriel sur les messages entrants."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Save directory"
 msgstr "Répertoire de sauvegarde"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Chercher la photo de l'expéditeur dans les carnets d'adresses locaux"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Send HTML mail by default"
 msgstr "Envoyer par défaut le courriel au format HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default."
 msgstr "Envoyer par défaut le courriel au format HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "Colonne du courriel de l'expéditeur dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Show animated images as animations."
 msgstr "Afficher les images animées comme une animation."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Afficher les messages supprimés (comme barrés) dans la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show deleted messages in the message-list"
 msgstr ""
 "Afficher les messages marqués comme supprimés dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show photo of the sender"
 msgstr "Afficher la photo de l'expéditeur"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13083,64 +13749,60 @@ msgstr ""
 "Afficher le courriel de l'expéditeur dans une colonne à part dans la liste "
 "des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Afficher la photo de l'expéditeur dans le volet de lecture de message."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "Indique l'en-tête à contrôler pour détecter le pourriel."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Indique l'en-tête à contrôler pour détecter le pourriel. Le format est "
-"nom_en-tête=valeur dans gconf."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Spell checking color"
+msgstr "Couleur du correcteur orthographique"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell checking languages"
+msgstr "Langues du correcteur orthographique"
+
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Subscribe dialog default height"
 msgstr "Hauteur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Subscribe dialog default width"
 msgstr "Largeur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Text message part limit"
 msgstr "Limite de la partie texte du message"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "The default plugin for Junk hook"
 msgstr "Le greffon par défaut pour le traitement du pourriel"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Dernier vidage des pourriels, en jours depuis le 1/1/1970."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "La dernière fois que la corbeille a été vidée, en jours depuis le 1/1/1970."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The terminal font for mail display."
 msgstr "La police de terminal pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The variable width font for mail display."
 msgstr "La police à largeur variable pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -13148,7 +13810,7 @@ msgstr ""
 "Cette option peut prendre les valeurs suivantes : 0 pour les erreurs, 1 pour "
 "les avertissements et 2 pour les messages de débogage."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13157,7 +13819,7 @@ msgstr ""
 "sous Evolution. La taille par défaut est 4 096 Kio (4 Mio) et est renseignée "
 "en Kio."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13167,7 +13829,7 @@ msgstr ""
 "soient activés. Si le greffon listé par défaut est désactivé, les autres "
 "greffons disponibles ne prendront pas le relais."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This key is read only once and reset to false after read. This unselects the "
 "mail in the list and removes the preview for that folder."
@@ -13175,7 +13837,7 @@ msgstr ""
 "Cette clé est lue une fois, puis définie à faux après la lecture. Cela "
 "désélectionne le message dans la liste et supprime l'aperçu pour ce dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 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;"
@@ -13187,11 +13849,22 @@ msgstr ""
 "XML est &lt;header enabled&gt; - activé si l'en-tête est affiché dans la vue "
 "du courriel."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"Cette option est relative à la clé « lookup_addressbook » et est utilisée "
+"pour savoir s'il faut vérifier les adresses seulement dans le carnet "
+"d'adresses local pour exclure du filtrage pourriel les courriels envoyés par "
+"des contacts connus."
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "This option would help in improving the speed of fetching."
 msgstr "Cette option peut aider à accélérer la vitesse de chargement."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13199,7 +13872,7 @@ msgstr ""
 "Cela définit le nombre d'adresses à afficher dans la vue de la liste de "
 "messages par défaut, au-delà duquel « ... » est affiché."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13207,7 +13880,7 @@ msgstr ""
 "Ce paramètre indique si les fils de discussion doivent être dans un état "
 "étendu ou compact par défaut. Evolution nécessite un redémarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13217,109 +13890,136 @@ msgstr ""
 "dernier message de chaque fil de discussion, plutôt que par date. Evolution "
 "nécessite un redémarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Thread the message list."
 msgstr "Liste de messages par fil de discussion."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Thread the message-list"
 msgstr "Liste de messages par fil de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message-list based on Subject"
 msgstr "Liste de messages basée sur les sujets"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Time interval, in seconds, how often upload store changes to server."
+msgstr ""
+"Intervalle de temps en secondes spécifiant la fréquence d'envoi des "
+"modifications du stockage vers le serveur"
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Time interval, in seconds, how often upload store changes to server. The "
+"actual value cannot be less than 30 seconds."
+msgstr ""
+"Intervalle de temps en secondes spécifiant la fréquence d'envoi des "
+"modifications du stockage vers le serveur. La valeur ne peut être inférieure "
+"à 30 secondes."
+
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Délai avant de marquer les messages comme vus"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Délai avant de marquer les messages comme vus."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "Chaîne UID pour le compte par défaut."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+"Couleur de soulignement des mots mal orthographiés lors de la vérification "
+"orthographique en cours de frappe."
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Utiliser le démon et le client Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Utiliser le démon et le client Spamassassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Utiliser des polices personnalisées"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Utiliser des polices personnalisées pour afficher le courriel."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Utiliser seulement des tests de pourriels locaux."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Utiliser seulement des tests de pourriels locaux (pas de DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Utiliser l'agencement côte à côte ou large"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Largeur de polices variable"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "L'élément du menu Affichage/Cci est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "L'élément du menu Affichage/Cci est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "L'élément du menu Affichage/Cc est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "L'élément du menu Affichage/Cc est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "L'élément du menu Affichage/De est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "L'élément du menu Affichage/De est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "L'élément du menu Affichage/Envoyer À est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "L'élément du menu Affichage/Envoyer À est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "L'élément du menu Affichage/Répondre À est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "L'élément du menu Affichage/Répondre À est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indique si une demande d'accusé de lecture doit être ajoutée à chaque "
 "message par défaut."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+"Indique s'il faut désactiver la fonctionnalité de coupure des noms de "
+"dossier dans l'arborescence des dossiers."
+
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13327,45 +14027,45 @@ msgstr ""
 "Retomber ou pas sur le tri par sujet quand les messages ne contiennent pas "
 "d'en-têtes In-Reply-To ou References."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indique si les fils de discussion doivent êtres triés suivant le dernier "
 "message de leur fil."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Largeur du panneau de la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Largeur du panneau de la liste des messages."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importation des données Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Assistant d'importation Elm d'Evolution"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Importation des boîtes à lettres de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Dossier de destination :"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Sélectionnez un dossier pour l'importation"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Boîte à lettres Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importe les dossiers au format de boîte à lettres Berkeley"
 
@@ -13373,7 +14073,7 @@ msgstr "Importe les dossiers au format de boîte à lettres Berkeley"
 msgid "Importing mailbox"
 msgstr "Importation des boîtes à lettres"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importation de « %s »"
@@ -13383,15 +14083,15 @@ msgstr "Importation de « %s »"
 msgid "Scanning %s"
 msgstr "Examen de %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importation des données de Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Assistant d'importation Pine d'Evolution"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importation des boîtes à lettres de Pine."
 
@@ -13419,139 +14119,152 @@ msgstr "Liste de diffusion %s"
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Modèles"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d sélectionné, "
 msgstr[1] "%d sélectionnés, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d supprimé"
 msgstr[1] "%d supprimés"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d pourriel"
 msgstr[1] "%d pourriels"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d brouillon"
 msgstr[1] "%d brouillons"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d envoyé"
 msgstr[1] "%d envoyés"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non envoyé"
 msgstr[1] "%d non envoyés"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d non lu,"
 msgstr[1] "%d non lus,"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "Nouveau message"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "Rédiger un nouveau courriel"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "Nouveau dossier pour le courriel"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "_Dossier de courriel"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "Crée un nouveau dossier pour le courriel"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Échec lors de la mise à jour des dossiers ou paramètres de courriel."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "Erreur"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "Erreurs"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "Avertissements et erreurs"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "Débogage"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "Messages d'erreur, d'avertissement et de débogage"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "Journaux de débogage"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "Afficher les _erreurs dans la barre d'état pendant"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
-msgstr "secondes."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1743
+msgid "second(s)."
+msgstr "seconde(s)."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "Journal des messages :"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "Niveau du journal"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Heure"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Ferme cette fenêtre"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Vérifier les types pris en charge "
@@ -13565,7 +14278,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL n'est pas pris en charge dans cette compilation d'Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Photo de l'expéditeur</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13610,7 +14323,7 @@ msgstr "<span weight=\"bold\">Afficher les _en-têtes des messages</span>"
 
 #: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">Libellés</span>"
+msgstr "<span weight=\"bold\">Étiquettes</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13646,75 +14359,75 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Polices d'impression</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Réglages du serveur mandataire</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informations requises</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sécurité</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Messages envoyés et brouillons</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuration du serveur</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Type d'_authentification</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Ajouter une _nouvelle signature..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Ajouter un sc_ript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 "_Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Chiffrer également pour _moi-même lors de l'envoi de messages chiffrés"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) à :"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Toujours envoyer une copie cachée (Cc_i) à :"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Toujours faire _confiance aux clés de mon trousseau lors du chiffrement"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Toujours chiffrer pour _moi-même lors de l'envoi de messages chiffrés"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "Toujours demander un accusé de _lecture"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Joindre le message d'origine"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "Insérer automatiquement les images de frimou_sses"
@@ -13732,13 +14445,13 @@ msgid "C_haracter set:"
 msgstr "Jeu de _caractères :"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "Détecter les pourriels en utilisant les _en-têtes personnalisés"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Vérifier les types pris en charge "
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "Détecter les pourriels en utilisant des en-têtes per_sonnalisés"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "Détecter les pourriels dans les _messages entrants"
@@ -13799,20 +14512,20 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer numériquement les messages _sortants (par défaut)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr ""
-"Ne _pas marquer les messages comme pourriel si l'expéditeur est présent dans "
-"le carnet d'adresses"
-
-#: ../mail/mail-config.glade.h:72
 msgid "Do not format text contents in messages if the text si_ze exceeds"
 msgstr ""
 "Ne pas mettre en forme le contenu du texte dans les messages quand la taille "
 "du texte excède"
 
+#: ../mail/mail-config.glade.h:72
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr ""
+"Ne _pas marquer les messages comme pourriel si l'expéditeur est présent dans "
+"mon carnet d'adresses"
+
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "Ne pas citer le message d'origine"
+msgid "Do not quote"
+msgstr "Ne pas citer"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13875,57 +14588,65 @@ msgid "HTML Messages"
 msgstr "Messages HTML"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "Serveur mandataire H_TTP :"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "En-têtes"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Dans le corps"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "Message initial dans le corps (style Outlook)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "Dans le corps (style Outlook)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "Kio"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
-msgstr "Libellés"
+msgstr "Étiquettes"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Langues"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "En-têtes des messages"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Emplacement de la boîte à lettres"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Éditeur de messages"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "Pas de serveur mandataire _pour :"
+
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
-"Note : le tiret bas dans les libellés est utilisé comme raccourci dans le "
+"Note : le tiret bas dans les étiquettes est utilisé comme raccourci dans le "
 "menu."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13933,15 +14654,19 @@ msgstr ""
 "Note : vous n'aurez pas à fournir de mot de passe avant votre première "
 "connexion"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid "Or_ganization:"
 msgstr "Or_ganisation :"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:110
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clé PGP/GPG :"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
+msgid "Pass_word:"
+msgstr "_Mot de passe :"
+
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13949,7 +14674,7 @@ msgstr ""
 "Saisissez un nom descriptif pour ce compte dans l'espace ci-dessous.\n"
 "Ce nom sera seulement utilisé à des fins d'affichage."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13958,7 +14683,7 @@ msgstr ""
 "doute, adressez-vous à votre administrateur système ou à votre fournisseur "
 "d'accès Internet."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:116
 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 "
@@ -13968,111 +14693,119 @@ msgstr ""
 "« optionnels » ci-dessous n'ont pas besoin d'être remplis, à moins que vous "
 "ne désiriez inclure ces informations dans les messages que vous envoyez."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:117
 msgid "Please select among the following options"
 msgstr "Sélectionnez une option parmi les suivantes"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
+msgid "Port:"
+msgstr "Port :"
+
+#: ../mail/mail-config.glade.h:119
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "_Demander lors de l'envoi de messages où seuls des destinataires Cci sont "
 "définis"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "Citer le message d'origine"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid "Quoted"
 msgstr "Cité"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 msgid "Re_member password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:122
 msgid "Re_ply-To:"
 msgstr "Ré_pondre à :"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Remember _password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:125
+msgid "S_OCKS Host:"
+msgstr "Hôte S_OCKS :"
+
+#: ../mail/mail-config.glade.h:126
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr ""
 "R_echercher la photo de l'expéditeur uniquement dans les carnets d'adresses "
 "locaux"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:127
 msgid "S_elect..."
 msgstr "S_électionner..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:128
 msgid "S_end message receipts:"
 msgstr "_Envoie des accusés de réception des messages :"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:129
 msgid "S_tandard Font:"
 msgstr "Police par _défaut :"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:131
 msgid "Select HTML fixed width font"
 msgstr "Sélection d'une police HTML à largeur fixe"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font for printing"
 msgstr "Sélection d'une police HTML à largeur fixe pour l'impression"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML variable width font"
 msgstr "Sélection d'une police HTML à largeur variable"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font for printing"
 msgstr "Sélection d'une police HTML à largeur variable pour l'impression"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:136
 msgid "Sending Mail"
 msgstr "Envoi de courriels"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:137
 msgid "Sent _Messages Folder:"
 msgstr "Dossier des _messages envoyés :"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:138
 msgid "Ser_ver requires authentication"
 msgstr "Le _serveur requiert une authentification"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:139
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:140
 msgid "Sig_ning certificate:"
 msgstr "Certificat de _signature :"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:141
 msgid "Signat_ure:"
 msgstr "Signat_ure :"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:142
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures Table"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:144
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:145
+msgid "Start _typing at the bottom on replying"
+msgstr "_Commencer la rédaction en bas lors des réponses"
+
+#: ../mail/mail-config.glade.h:146
 msgid "T_ype: "
 msgstr "T_ype : "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14080,7 +14813,7 @@ msgstr ""
 "La liste des langues ne contient que les langues pour lesquelles un "
 "dictionnaire a été installé."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14090,14 +14823,14 @@ msgstr ""
 "signature. Le nom spécifié ne sera utilisé\n"
 "que pour l'affichage. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "This option will be overridden if a match for custom junk headers is found."
 msgstr ""
-"Cette option sera surdéfinie si une correspondance avec un en-tête de "
-"pourriel personnalisé est trouvé."
+"Cette option a une priorité plus faible que la détection de pourriels par en-"
+"têtes personnalisés."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14105,16 +14838,24 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par exemple : « Travail » ou « Personnel »"
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "_Nom d'utilisateur :"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "Utiliser l'_authentification"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "_Largeur variable :"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14124,103 +14865,127 @@ msgstr ""
 "\n"
 "Cliquez sur « Suivant » pour commencer. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "A_jouter une signature"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "_Toujours charger les images à partir d'Internet"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "_URL de configuration  automatique du serveur mandataire :"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Greffon pourriel par défaut :"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "Connexion _directe à Internet"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne pas signer les de_mandes de réunion (compatibilité Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Style de _transfert :"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 "C_onserver la signature au-dessus du message d'origine lors des réponses"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Afficher les images dans les messages des contacts"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local addressbook only"
+msgstr "Rechercher seulement dans le carnet d'adresses _local"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "En faire _mon compte par défaut"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "Configuration _manuelle du serveur mandataire :"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marquer les messages comme lus après"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Ne jamais charger les images à partir d'Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Demander l'autorisation lors de l'envoi de messages HTML à des contacts qui "
 "n'en veulent pas"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "De_mander lors de l'envoi de messages dépourvus de sujet"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Style de _réponse  :"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script :"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "_Serveur mandataire HTTP sécurisé :"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Sélectionner..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Afficher les animations"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Afficher la photo de l'expéditeur dans l'aperçu du courriel"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Réduire les en-têtes À / Cc / Cci à"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Utiliser une connexion sécurisée :"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "_Utiliser les réglages par défaut du système"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Utiliser les mêmes polices que dans les autres applications"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "adresses"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "couleur"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "description"
 
@@ -14268,7 +15033,7 @@ msgstr "Re_chercher :"
 msgid "Find in Message"
 msgstr "Rechercher dans le message"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Marquer pour donner suite"
 
@@ -14320,7 +15085,7 @@ msgstr "_Marqueur :"
 msgid "_Tick this to accept the license agreement"
 msgstr "Cochez ici pour accepter les _termes de la licence"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
@@ -14367,11 +15132,11 @@ msgstr "Envoi du message %d sur %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Échec lors de l'envoi de %d sur %d messages"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Annulé."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Terminé."
 
@@ -14400,66 +15165,71 @@ msgstr "Ouverture du dossier %s"
 
 #: ../mail/mail-ops.c:1270
 #, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Récupération des informations de quota pour le dossier %s"
+
+#: ../mail/mail-ops.c:1339
+#, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "Suppression du dossier %s"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "Actualisation du dossier"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans « %s »"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Récupération de %d message"
 msgstr[1] "Récupération de %d messages"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Enregistrement de %d message"
 msgstr[1] "Enregistrement de %d messages"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14468,11 +15238,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14481,51 +15251,51 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Préparation du compte « %s  » pour utilisation hors ligne."
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "Annulation..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "Envoi et réception du courriel"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Recherche de nouveau courriel"
@@ -14553,28 +15323,27 @@ msgstr "Saisissez le mot de passe"
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Éditer la signature"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Enregistrer et fermer"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Saisissez un nom pour cette signature."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Éditer la signature"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Nom :"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "Nom de la _signature :"
 
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Impossible de créer le dossier spool « %s » : %s"
 
-# ??? je ne comprends pas
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Essaye de movemail une source non mbox « %s »"
+msgstr "Tentative de movemail d'une source non mbox « %s »"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14605,55 +15374,50 @@ msgstr "Mise à jour des dossiers de recherche pour « %s:%s »"
 msgid "Updating Search Folders for '%s'"
 msgstr "Mise à jour des dossiers de recherche pour « %s »"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Éditer un dossier de recherche"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Nouveau dossier de recherche"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
-"Un dossier nommé &laquo;&nbsp;{0}&nbsp;&raquo; existe déjà. Veuillez "
-"utiliser un nom différent."
+"Un dossier nommé « {0} » existe déjà. Veuillez utiliser un nom différent."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
-"Un dossier nommé &laquo;&nbsp;{1}&nbsp;&raquo; existe déjà. Veuillez "
-"utiliser un nom différent."
+"Un dossier nommé « {1} » existe déjà. Veuillez utiliser un nom différent."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"Un dossier non vide existe déjà sur &laquo;&nbsp;{1}&nbsp;&raquo;.\n"
+"Un dossier non vide existe déjà sur « {1} ».\n"
 "\n"
 "Vous pouvez choisir d'ignorer ce dossier, d'écraser ou ajouter son contenu, "
 "ou de quitter."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
-"Un accusé de réception a été demandé pour la lecture de &laquo;&nbsp;{1}"
-"&nbsp;&raquo;. Voulez-vous envoyer l'accusé de réception à {0}&nbsp;?"
+"Un accusé de réception a été demandé pour la lecture de « {1} ». Voulez-vous "
+"envoyer l'accusé de réception à {0} ?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
-"Une signature nommée &laquo;&nbsp;{0}&nbsp;&raquo; existe déjà. Veuillez "
-"utiliser un nom différent."
+"Une signature nommée « {0} » existe déjà. Veuillez indiquer un nom différent."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14691,7 +15455,7 @@ msgstr ""
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement tous les messages effacés dans "
 "le dossier « {0} » ?"
@@ -14710,11 +15474,11 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Voulez-vous vraiment envoyer un message sans sujet ?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "À cause de « {0} »."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "À cause de « {2} »."
 
 #: ../mail/mail.error.xml.h:21
@@ -14722,70 +15486,69 @@ msgid "Blank Signature"
 msgstr "Signature vide"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Impossible d'ajouter le dossier de recherche « {0} »."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Impossible de copier le dossier « {0} » vers « {1} »."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Impossible de copier le dossier « {0} » vers « {1} »."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Impossible de créer le dossier « {0} »."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Impossible de créer le dossier « {0} »."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Impossible de créer de dossier de sauvegarde temporaire."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Impossible de créer le dossier de sauvegarde parce que « {1} »"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier « {0} »."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier système « {0} »."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
-"Impossible d'éditer le dossier de recherche « {0} » puisqu'il n'existe pas."
+"Impossible de modifier le dossier de recherche « {0} » puisqu'il n'existe pas."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Impossible de déplacer le dossier « {0} » vers « {1} »."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "Impossible d'ouvrir la source « {1} »"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "Impossible d'ouvrir la source « {2} »."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "Impossible d'ouvrir la cible « {2} »."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 "Impossible de lire le fichier de licence « {0} » à cause d'un problème "
 "d'installation. Vous ne serez pas capable d'utiliser ce fournisseur jusqu'à "
 "ce que vous acceptiez sa licence."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Impossible de renommer le dossier « {0} » en « {1} »."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Impossible de renommer « {0} » en « {1} »."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Impossible de renommer ou déplacer le dossier système « {0} »."
 
 #: ../mail/mail.error.xml.h:37
@@ -14793,18 +15556,22 @@ msgid "Cannot save changes to account."
 msgstr "Impossible d'enregistrer les modifications au compte."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "Impossible d'enregistrer dans le dossier « {0} »."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "Impossible d'enregistrer dans le fichier « {0} »."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Impossible d'utiliser le script de signature « {0} »."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Impossible de définir le script de signature « {0} »."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "Échec de la détection des pourriels"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14813,49 +15580,42 @@ msgstr ""
 "que beaucoup de mots de passe sont sensibles à la casse ; le verrouillage "
 "majuscules est peut-être actif."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Impossible d'enregistrer le fichier de signature."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
 msgstr "Supprimer « {0} » ?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Supprimer le compte ?"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr ""
-"Supprimer les messages du dossier de recherche &laquo;&nbsp;{0}&nbsp;&raquo;"
-"&nbsp;?"
-
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Supprimer les messages du dossier de recherche « {0} » ?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Supprimer les messages du dossier de recherche ?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Abandonner les modifications ?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Ne pas s_upprimer"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Ne pas supprimer"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Ne pas désactiver"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr ""
-"Voulez-vous que l'opération soit aussi effectuée dans les sous-dossiers ?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14964,36 +15724,27 @@ msgid "Mark all messages as read"
 msgstr "Marquer tous les messages comme lus"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr ""
-"Marquer tous les messages dans ce dossier et ses sous-dossiers comme lus ?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Dossier manquant."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Aucune source n'a été sélectionnée."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Seulement dans le _dossier actuel"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ouvrir trop de messages en une fois peut prendre un long moment."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Vérifiez les paramètres de votre compte et essayez à nouveau."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Activez le compte ou bien effectuez l'envoi en utilisant un autre compte."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 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."
@@ -15002,7 +15753,7 @@ msgstr ""
 "rechercher des adresses électroniques en cliquant sur le bouton « À : » à "
 "côté de la boîte de saisie."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15012,35 +15763,43 @@ msgstr ""
 "courriel HTML :\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Saisissez un nom unique pour identifier cette signature."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Veuillez patienter."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problème lors de la migration de l'ancien dossier de courriel « {0} »."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Interrogation du serveur"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Questionne le serveur pour obtenir une liste des mécanismes "
 "d'authentification pris en charge."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Accusé de réception demandé."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Réellement supprimer le dossier « {0} » et tous ses sous-dossiers ?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "Échec du signalement de pourriel"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Réellement supprimer le dossier « {0} » et tous ses sous-dossiers ?"
+msgid "Report Not Junk Failed"
+msgstr "Échec du signalement de non pourriel"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -15094,28 +15853,28 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Les dossiers de recherche suivants :\n"
 "{0}\n"
 "utilisaient le dossier maintenant supprimé :\n"
 "    « {1} »\n"
-"et ont été mis à jour."
+"Ils ont été mis à jour."
 
 #: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Les règles de filtrage suivantes :\n"
 "{0}\n"
 "utilisaient le dossier maintenant supprimé :\n"
 "    « {1} »\n"
-"et ont été mises à jour."
+"Elles ont été mises à jour."
 
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
@@ -15232,9 +15991,9 @@ msgstr ""
 "tous les dossiers locaux, tous les dossiers distants, ou les deux."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
-"Votre identification sur le serveur « {0} » en temps que « {0} » a échoué."
+"Votre identification sur le serveur « {0} » en tant que « {0} » a échoué."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15256,77 +16015,90 @@ msgstr "Ne_ttoyer"
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "dans le dossier actuel et ses _sous-dossiers"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Non vu"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Vu"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Répondu"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "Transféré"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Plus bas"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Plus haut"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3849
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Aucun message ne remplit vos critères de recherche. Effacez la recherche "
+"avec le menu Recherche->Effacer ou modifiez les critères."
+
+#: ../mail/message-list.c:4178
+msgid "There are no messages in this folder."
+msgstr "Il n'y a aucun message dans ce dossier."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Date d'échéance"
@@ -15356,39 +16128,39 @@ msgstr "Messages envoyés"
 msgid "Size"
 msgstr "Taille"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Appel"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Aucune réponse nécessaire"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Répondre"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Revoir"
 
@@ -15425,14 +16197,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Fournit la fonctionnalité à la base des carnets d'adresses locaux."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Active le greffon d'oubli des pièces jointes"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Active le greffon d'oubli des pièces jointes."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15440,7 +16204,7 @@ msgstr ""
 "Liste d'indices que le greffon d'oubli des pièces jointes doit rechercher "
 "dans le corps d'un message"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
@@ -15448,14 +16212,11 @@ msgstr ""
 "Liste d'indices que le greffon d'oubli des pièces jointes doit rechercher "
 "dans le corps d'un message."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Signaler les pièces jointes _manquantes"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
@@ -15481,9 +16242,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Message sans pièce jointe"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Continuer l'édition"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "É_diter le message"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15497,27 +16258,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Greffon audio"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "Sélectionnez le nom de l'archive Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "_Redémarrer Evolution après l'archivage"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Sélectionnez le nom de l'archive d'Evolution à restaurer"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "_Redémarrer Evolution après la restauration"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "Restaurer à partir de l'archive"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15528,98 +16289,124 @@ msgstr ""
 "Il restaure également tous vos paramètres personnels, filtres de courriel, "
 "etc."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurer Evolution à partir de l'archive"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Sélectionnez une archive d'Evolution pour la restauration :"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "Choisissez un fichier à restaurer"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Répertoire d'archive d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Répertoire de restauration d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Contrôle l'archive Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Redémarre Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "Avec interface graphique"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Ferme Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Archivage des comptes et des paramètres d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Archivage des données d'Evolution (courriels, contacts, calendriers, tâches "
 "et mémos)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Archivage terminé"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Redémarrage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Archiver les données actuelles d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Extraction des fichiers de l'archive"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Chargement des paramètres d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Suppression des fichiers d'archive temporaires"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "Contrôle des sources locales"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Archivage vers le dossier %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restauration depuis le dossier %s"
 
 # Titre
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Archivage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Restauration d'Evolution"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "Archivage des données d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Veuillez attendre qu'Evolution finisse d'archiver vos données."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Restauration des données d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Veuillez attendre qu'Evolution finisse de restaurer vos données."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+"Ceci peut prendre du temps, en fonction de la quantité de données de votre "
+"compte."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15654,14 +16441,24 @@ msgstr ""
 "redémarre automatiquement après l'archivage, activez l'option correspondante."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "Permissions insuffisantes"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Le fichier d'archive Evolution est non valide"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Sélectionnez un fichier d'archive valide pour la restauration."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr ""
+"Le dossier sélectionné ne dispose pas des droits nécessaires pour créer le "
+"fichier"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15741,7 +16538,29 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Erreur pendant le lancement de %s : %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Le processus fils Bogofilter ne répond pas, il va être tué..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+"En attente du processus fils Bogofilter interrompu, terminaison en cours..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "Échec du tube vers Bogofilter, code erreur : %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Convertir le texte du message en _Unicode"
 
@@ -15762,6 +16581,10 @@ msgid "Bogofilter Options"
 msgstr "Options de Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Greffon pourriel Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtre les pourriels en utilisant Bogofilter."
 
@@ -15770,12 +16593,12 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL :"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "Utiliser _SSL"
 
@@ -15795,17 +16618,17 @@ msgstr "Calendriers locaux"
 msgid "Provides core functionality for local calendars."
 msgstr "Fournit la fonctionnalité à la base des calendriers locaux."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "_Actualiser :"
+#: ../plugins/google-account-setup/google-source.c:381
+msgid "Re_fresh:"
+msgstr "Ac_tualiser :"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Connexion _sécurisée"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Nom d'utilisateur :"
 
@@ -15907,14 +16730,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Voulez-vous faire d'Evolution votre client de messagerie par défaut ?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Marquer comme dossier par _défaut"
+msgid "Mark as _default address book"
+msgstr "Marquer comme carnet d'adresses par _défaut"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "Marquer comme calendrier par _défaut"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "Marquer comme liste de tâches par _défaut"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "Marquer comme liste de mémos par _défaut"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15928,6 +16762,56 @@ msgstr ""
 "Fournit la fonctionnalité permettant de marquer un calendrier ou un carnet "
 "d'adresses comme celui par défaut."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "_En-tête personnalisé"
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Clé"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Valeurs"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"Le format de définition d'un en-tête personnalisé est :\n"
+"Nom de l'en-tête personnalisé clé valeurs séparées par « ; »."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "En-tête de courriel personnalisé"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr "Ajoute un en-tête personnalisé aux messages sortants."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "En-tête personnalisé"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr "Liste d'en-têtes personnalisés"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"Cette clé fournit la liste des en-têtes personnalisés que vous pouvez "
+"ajouter à un message sortant. Le format pour spécifier un en-tête et sa "
+"valeur est : nom de l'en-tête personnalisé suivi de « = », les valeurs sont "
+"séparées par des « ; »"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Ouvrir le dossier d'un autre utilisateur"
@@ -15945,12 +16829,12 @@ msgid "_User:"
 msgstr "Nom d'_utilisateur :"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Mot de passe sécurisé"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15958,11 +16842,11 @@ msgstr ""
 "Cette option utilisera l'authentification par mot de passe sécurisé (NTLM) "
 "pour se connecter au serveur Exchange."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Mot de passe en texte brut"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -15970,11 +16854,11 @@ msgstr ""
 "Cette option utilisera un mot de passe en texte brut standard pour se "
 "connecter au serveur Exchange."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Absent du bureau"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -15983,77 +16867,81 @@ msgstr ""
 "vous\n"
 "envoyant du courriel pendant votre absence du bureau."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Je suis actuellement absent du bureau"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Je suis actuellement au bureau"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Changer le mot de passe pour le compte Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gère les paramètres de délégation pour un compte Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Assistant de délégation"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Divers"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Voir la taille de tous les dossiers Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Taille des dossiers"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Paramètres d'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:674
 msgid "_OWA URL:"
 msgstr "URL _OWA :"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:700
 msgid "A_uthenticate"
 msgstr "S'a_uthentifier"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:721
+msgid "_Mailbox:"
+msgstr "_Boîte aux lettres :"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:922
 msgid "_Authentication Type"
 msgstr "Type d'_authentification"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "Ch_eck for Supported Types"
 msgstr "_Vérifier les types pris en charge"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1048
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s Kio"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16072,7 +16960,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -16080,7 +16968,7 @@ msgstr ""
 "Ce mot de passe est différent du mot de passe existant pour votre compte. "
 "Veuillez saisir le bon mot de passe."
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Les deux mots de passe sont différents. Veuillez les saisir à nouveau."
 
@@ -16107,33 +16995,33 @@ msgstr ""
 msgid "Your password will expire in the next %d days"
 msgstr "Votre mot de passe expirera dans les %d prochains jours"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Éditeur (lire, créer, éditer)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Auteur (lire, créer)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Relecteur (lecture-seule)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Permissions du délégué"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permissions pour %s"
@@ -16141,7 +17029,7 @@ msgstr "Permissions pour %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16152,66 +17040,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Vous avez reçu les permissions suivantes sur mes dossiers :"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "Vous avez aussi le droit de consulter mes éléments privés."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "Cependant, vous n'êtes pas autorisé à consulter mes éléments privés."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Vous avez été désigné comme délégué de %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Déléguer à"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Supprimer le délégué %s ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Impossible d'accéder à Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Impossible de se trouver soi-même dans l'Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Impossible de trouver le délégué %s dans l'Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Impossible de supprimer le délégué %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Impossible de mettre à jour la liste des délégués."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Impossible d'ajouter le délégué %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Erreur lors de la lecture de la liste des délégués."
 
@@ -16260,20 +17148,25 @@ msgstr "_Résumer les permissions"
 msgid "_Tasks:"
 msgstr "_Tâches :"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permissions..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Nom du dossier"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Taille du dossier"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "Utilisateur"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "S'abonner à un dossier d'un autre utilisateur"
@@ -16282,20 +17175,20 @@ msgstr "S'abonner à un dossier d'un autre utilisateur"
 msgid "Exchange Folder Tree"
 msgstr "Arborescence des dossiers Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "Se désabonner du dossier..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Voulez-vous vraiment vous désabonner du dossier « %s » ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Se désabonner du dossier « %s »"
@@ -16360,15 +17253,18 @@ msgstr "Votre mot de passe expirera dans 7 jours..."
 msgid "_Change Password"
 msgstr "_Changer le mot de passe"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Permission refusée)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Ajouter un utilisateur :"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Ajouter un utilisateur"
 
@@ -16490,11 +17386,11 @@ msgstr "_Utilisateur"
 msgid "button-user"
 msgstr "bouton utilisateur"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Sélectionner un utilisateur"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Carnet d'adresses..."
 
@@ -16508,10 +17404,10 @@ msgstr "S'abonner au calendrier d'un autre utilisateur"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
-"Un greffon qui gère diffférentes opérations et fonctionnalités spécifiques "
+"Un greffon qui gère différentes opérations et fonctionnalités spécifiques "
 "aux comptes Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16603,10 +17499,16 @@ msgid "Could not update out-of-office state"
 msgstr "Impossible de mettre à jour l'état « Absent du bureau »"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Evolution doit être redémarré pour charger la boîte aux lettres de "
+"l'utilisateur abonné"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Le compte Exchange est hors ligne."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16635,32 +17537,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Impossible de mettre à jour les délégués :"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Le dossier existe déjà"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Le dossier n'existe pas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Dossier hors ligne"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Erreur générique"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Le serveur de catalogue global n'est pas accessible"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16668,78 +17570,78 @@ msgstr ""
 "Si OWA s'exécute dans un chemin différent, vous devez le spécifier dans la "
 "configuration du compte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "La boîte à lettres de {0} n'est pas sur ce serveur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Vérifiez que l'URL est correcte et essayer à nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Vérifiez que le nom du serveur est correctement orthographié et essayez à "
 "nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Vérifiez que l'identifiant et le mot de passe sont corrects et essayez à "
 "nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Aucun catalogue global configuré pour ce compte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Aucune boîte à lettres pour l'utilisateur {0} on {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Aucun utilisateur {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Le mot de passe a bien été modifié."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Saisissez un ID de délégué ou décochez l'option « Envoyer en tant que "
 "délégué »."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Assurez-vous que le nom du Serveur Global Catalog est correct."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Redémarrez Evolution pour que les modifications prennent effet."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Sélectionnez un utilisateur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Le serveur a refusé le mot de passe car celui-ci est trop faible."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Le compte Exchange sera désactivé lorsque vous quitterez Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Le compte Exchange sera supprimé quand vous quitterez Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 "Le serveur Exchange n'est pas compatible avec votre connecteur Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16747,7 +17649,7 @@ msgstr ""
 "Le serveur exécute Exchange 5.5. Le connecteur Exchange prend uniquement en "
 "charge Microsoft Exchange 2000 et 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16762,61 +17664,61 @@ msgstr ""
 "Il est aussi possible que vous ayez saisi un mauvais\n"
 "mot de passe."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Essayer à nouveau avec un mot de passe différent."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Impossible d'ajouter l'utilisateur à la liste de contrôle d'accès :"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Impossible d'éditer les délégués."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Erreur inconnue lors de la recherche de {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Type inconnu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Opération non gérée"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "La capacité occupée par le stockage de vos courriels est proche de la limite "
 "qui vous est autorisée sur ce serveur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Vous ne pouvez pas envoyer de message au nom de plus d'une personne."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Vous ne pouvez pas faire de vous-même votre propre délégué"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Vous avez dépassé la capacité de stockage qui vous est autorisée sur ce "
 "serveur pour vos courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Vous ne pouvez configurer qu'un seul compte Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16824,7 +17726,7 @@ msgstr ""
 "Votre utilisation actuelle est {0} Kio. Essayez de libérer un peu d'espace "
 "en supprimant quelques courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16832,7 +17734,7 @@ msgstr ""
 "Votre utilisation actuelle est {0} Kio. Vous ne serez plus en mesure "
 "d'envoyer ou de recevoir des courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16841,19 +17743,19 @@ msgstr ""
 "d'envoyer ou de recevoir des courriels tant que vous n'aurez pas libérer de "
 "l'espace en supprimant quelques courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Votre mot de passe a expiré."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} ne peut pas être ajouté à une liste de contrôle d'accès"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} est déjà une délégation"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} est déjà dans la liste"
 
@@ -16865,6 +17767,14 @@ msgstr "S'abonner aux tâches d'un autre utilisateur"
 msgid "Check folder permissions"
 msgstr "Contrôler les droits du dossier"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Éditeur externe par défaut"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "La commande à utiliser par défaut pour lancer l'éditeur."
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
@@ -16878,6 +17788,30 @@ msgstr ""
 msgid "External Editor"
 msgstr "Éditeur externe"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Impossible de créer des fichiers temporaires"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "Impossible de lancer l'éditeur"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+"Evolution n'a pas pu créer un fichier temporaire pour enregistrer votre "
+"courriel. Essayez plus tard."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"Impossible de lancer l'éditeur externe paramétré dans vos préférences de "
+"greffons. Essayez de choisir un autre éditeur."
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in External Editor"
 msgstr "Édition dans un éditeur externe"
@@ -16886,15 +17820,27 @@ msgstr "Édition dans un éditeur externe"
 msgid "Compose messages using an external editor"
 msgstr "Édite les messages en utilisant un éditeur externe"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr "Commande à exécuter pour lancer l'éditeur : "
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"Pour Emacs, indiquez « xemacs »\n"
+"pour VI, indiquez « gvim »"
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Sélectionnez une image PNG (48x48) de taille inférieure à 700 octets"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "Fichiers PNG"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "_Portrait"
 
@@ -16933,20 +17879,35 @@ msgstr "Se désabonner des dossiers"
 msgid "_Unsubscribe"
 msgstr "Se _désabonner"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+msgid "<b>Server</b>"
+msgstr "<b>Serveur</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+msgid "Update every"
+msgstr "Mettre à jour tous les"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Un greffon pour configurer un calendrier Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Un greffon pour configurer un calendrier et des contacts Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Sources Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Liste de contrôle"
 
@@ -17027,10 +17988,22 @@ msgid "_Junk List"
 msgstr "_Liste des pourriels"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Rétractation du message"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"Il se peut que le retrait d'un message l'efface de la boîte aux lettres des "
+"destinataires. Êtes-vous sûr de vouloir faire cela ?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Message rétracté avec succès"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Rétractation du courriel"
 
@@ -17038,12 +18011,6 @@ msgstr "Rétractation du courriel"
 msgid "Add Send Options to groupwise messages"
 msgstr "Ajouter les options d'envoi au messages GroupWise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Options d'envoi"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Un greffon pour les fonctionnalités des comptes GroupWise."
@@ -17052,6 +18019,72 @@ msgstr "Un greffon pour les fonctionnalités des comptes GroupWise."
 msgid "Groupwise Features"
 msgstr "Fonctionnalités de GroupWise"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "Échec de la rétractation du message"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "Le serveur ne permet pas la rétractation du message sélectionné."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "Utilisateur non valide"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Impossible de donner l'accès proxy à l'utilisateur « {0} »"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "Indiquer un utilisateur"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "Vous avez déjà donné des permissions proxy à cet utilisateur."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+"Vous devez indiquer un nom d'utilisateur valide pour donner des droits proxy."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+"Le compte « {0} » existe déjà. Veuillez vérifier votre arborescence de "
+"dossiers."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "Compte déjà existant"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+msgstr ""
+"Echec de la connexion proxy en tant que « {0} ». Veuillez vérifier "
+"l'identificateur du courriel et essayez à nouveau."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "Ceci est une réunion récurrente"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "What would you like to {0}?"
+msgstr "Que voulez-vous {0} ?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Impossible de partager le dossier avec l'utilisateur spécifié « {0} »"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "Vous devez indiquer un nom d'utilisateur à ajouter à la liste"
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "Accepter provisoirement"
@@ -17150,9 +18183,9 @@ msgstr "<b>Nom du compte</b>"
 msgid "Proxy Login"
 msgstr "Identification sur le proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17161,21 +18194,21 @@ msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "_Identification sur le proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "L'onglet proxy sera accessible seulement lorsque le compte sera en ligne."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "L'onglet proxy sera accessible seulement lorsque le compte sera actif."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -17191,11 +18224,15 @@ msgstr "Nouveau dossier _partagé..."
 msgid "Sharing"
 msgstr "Partage"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "Notification personnalisée"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Ajouter"
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Modifier"
 
@@ -17260,11 +18297,11 @@ msgstr "Un greffon pour configurer les sources de calendrier Hula."
 msgid "Hula Account Setup"
 msgstr "Configuration d'un compte Hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "En-têtes personnalisés"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "En-têtes IMAP"
 
@@ -17319,28 +18356,28 @@ msgstr "Un greffon pour les fonctionnalités des comptes IMAP."
 msgid "IMAP Features"
 msgstr "Fonctionnalités IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "_Importer dans le calendrier"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_Importer dans les tâches"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Importer ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Sélectionner une liste de tâches"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Sélectionner un calendrier"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "_Importer"
 
@@ -17378,8 +18415,8 @@ msgstr ""
 "Evolution n'a pas pu trouver un iPod avec lequel se synchroniser. Soit "
 "l'iPod n'est pas connecté au système ou bien il n'est pas allumé."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "Format iCalendar (.ics)"
 
@@ -17434,95 +18471,95 @@ msgstr "Impossible de trouver ce mémo dans une liste"
 msgid "Searching for an existing version of this appointment"
 msgstr "Recherche d'une version existante de ce rendez-vous"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:946
 msgid "Unable to parse item"
 msgstr "Impossible d'analyser le contenu de l'élément"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1004
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Impossible d'envoyer l'élément au calendrier « %s ». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1016
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "« %s » a été envoyée au calendrier comme acceptée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "« %s » a été envoyée au calendrier comme provisoire"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "« %s » a été envoyée calendrier comme refusée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1030
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "« %s » a été envoyée au calendrier comme annulée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "L'organisateur a supprimé la délégation %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envoie un avis d'annulation à la délégation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Impossible d'envoyer l'avis d'annulation au délégué"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "L'état du participant n'a pas pu être mis à jour car l'état n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossible de mettre à jour le participant. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 msgid "Attendee status updated"
 msgstr "État du participant mis à jour"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Meeting information sent"
 msgstr "Les informations de la réunion ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
 msgstr "Les informations de la tâche ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 msgid "Memo information sent"
 msgstr "Les informations du mémo ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la réunion, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la tâche, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Impossible d'envoyer les informations du mémo, celui-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The calendar attached is not valid"
 msgstr "Le calendrier joint n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17530,15 +18567,15 @@ msgstr ""
 "Le message prétend contenir un calendrier, mais celui-ci n'est pas dans un "
 "format iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "L'élément dans le calendrier n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17546,11 +18583,11 @@ msgstr ""
 "Le message contient un calendrier, mais celui-ci ne contient aucun "
 "événement, tâche ou information libre/occupé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "Le calendrier joint contient des éléments multiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17558,233 +18595,233 @@ msgstr ""
 "Pour traiter tous ces éléments, le fichier devra être enregistré et le "
 "calendrier importé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Cette réunion est récurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Cette tâche est récurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Ce mémo est récurrent"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Supprimer le message après intervention"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Recherche de conflit"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Sélectionnez les calendriers où chercher les conflits de réunions"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Aujourd'hui"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "Aujourd'hui %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "Aujourd'hui %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "Aujourd'hui %I:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "Demain"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "Demain %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "Demain %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "Demain %I:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Demain %I:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %I:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B, %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B, %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Y, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Veuillez répondre par délégation de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Reçu par délégation de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a publié les informations de la réunion "
 "suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> a publié les informations de la réunion suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> vous a délégué la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s demande votre présence à la réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> demande votre présence à la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite être intégré à une réunion "
 "existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, 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 :"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17793,7 +18830,7 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite recevoir les dernières "
 "informations pour la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -17801,90 +18838,90 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les dernières informations pour la réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a envoyé la réponse à une réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> a envoyé la réponse à une réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a annulé la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> a annulé la réunion suivante."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a proposé les changements suivants à la "
 "réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> a proposé les changements suivants à la réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a refusé les changements suivants à la "
 "réunion :"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> a refusé les changements suivants de la réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a publié les tâches suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> a publié la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> demande l'attribution à %s de la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> par l'intermédiaire de %s vous a attribué une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> vous a attribué une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite être intégré à une tâche "
 "existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, 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 :"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17893,7 +18930,7 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite recevoir les dernières "
 "informations pour l'attribution de tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -17902,7 +18939,7 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les dernières informations pour l'attribution de "
 "tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -17910,23 +18947,23 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a renvoyé une réponse à la tâche "
 "attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> a renvoyé une réponse à la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a annulé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> a annulé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -17934,145 +18971,145 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a proposé les changements suivants à "
 "l'attribution de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> a proposé les changements suivants à l'attribution de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a refusé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> a refusé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a publié le mémo suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> a publié le mémo suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite être intégré à mémo existant :"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> souhaite être intégré à un mémo existant :"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a annulé le mémo partagé suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> a annulé le mémo partagé suivant :"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "Tout _refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "Tout _provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "_Provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "Tout _accepter"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "_Envoyer l'information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "Mettre à jo_ur l'état du participant"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "_Mettre à jour"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1010
 msgid "Start time:"
 msgstr "Heure de début :"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1019
 msgid "End time:"
 msgstr "Heure de fin :"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1085
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1071
 msgid "Send _reply to sender"
 msgstr "Ré_pondre à l'expéditeur"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1099
 msgid "Send _updates to attendees"
 msgstr "Envoyer des _mises à jour aux participants"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1108
 msgid "_Apply to all instances"
 msgstr "_Appliquer à toutes les occurrences"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1117
 msgid "Show time as _free"
 msgstr "Afficher la période comme _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Tasks :"
 msgstr "_Tâches :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "Memos :"
 msgstr "Mémos :"
 
@@ -18144,8 +19181,7 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
-msgstr ""
-"Avertit uniquement de nouveaux messages dans la « Boîte de réception »."
+msgstr "Avertit uniquement de nouveaux messages dans la « Boîte de réception »."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play sound when new messages arrive."
@@ -18193,12 +19229,20 @@ msgstr ""
 "Indique s'il faut avertir seulement de la réception de nouveaux messages "
 "dans la « Boîte de réception »."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Générer un message _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+msgid "Evolution's Mail Notification"
+msgstr "Notification de courriel d'Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+msgid "Mail Notification Properties"
+msgstr "Propriétés des notifications de courriel"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18213,55 +19257,55 @@ msgstr[1] ""
 "Vous avez reçu %d nouveaux messages\n"
 "dans %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Vous avez reçu %d nouveau message."
 msgstr[1] "Vous avez reçu %d nouveaux messages."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "Nouveau courriel"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "Afficher une icône dans la zone de _notification"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "Icône c_lignotante dans la zone de notification"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "_Message contextuel avec l'icône"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "_Jouer un son à la réception d'un nouveau message"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "Jouer un fichier _son"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "Indiquez le nom du _fichier :"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "Sélection d'un fichier sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "_Jouer"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "Avertir uniquement des nouveaux messages de la « Boîte de réception »"
 
@@ -18411,7 +19455,7 @@ msgstr "Envoyer un message électronique à la liste ?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18500,6 +19544,28 @@ msgstr "S'_abonner à la liste"
 msgid "_Unsubscribe from List"
 msgstr "Se _désabonner de la liste"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr ""
+"Marquer tous les messages dans ce dossier et ses sous-dossiers comme lus ?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr ""
+"Voulez-vous que l'opération soit aussi effectuée dans les sous-dossiers ?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "Marquer tous les messages comme lus"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "Dossier actuel et _sous-dossiers"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "Seulement le _dossier actuel"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Tout marquer comme lu"
@@ -18542,7 +19608,7 @@ msgstr "Un greffon pour gérer quels greffons sont actifs ou pas."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Gestionnaire de greffons"
 
@@ -18554,33 +19620,24 @@ msgstr "Active et désactive les greffons"
 msgid "_Plugins"
 msgstr "_Greffons"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Description"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Configuration"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note : certains changements ne prendront effet qu'après un redémarrage"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Configuration"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Il n'y a pas d'option de configuration pour ce greffon."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Greffon"
 
@@ -18607,41 +19664,22 @@ msgstr "Mode texte simple"
 msgid "Prefer plain-text"
 msgstr "Préférer le texte simple"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "Afficher au format HTML si présent"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Préférer le format PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Afficher toujours au format PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "Fournit une option pour imprimer depuis l'éditeur."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Imprimer le message"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "_Aperçu avant impression"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Imprime le message"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Profiler d'Evolution"
@@ -18666,13 +19704,7 @@ msgstr "Emplacements"
 msgid "_Publish Calendar Information"
 msgstr "_Publier l'information Calendar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Saisissez le mot de passe pour « %s »"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Voulez-vous vraiment supprimer cette URL ?"
 
@@ -18760,15 +19792,76 @@ msgstr ""
 "iCal\n"
 "Libre/Occupé"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Bonjour Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Tests du chargeur de greffons Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Greffon de test Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Greffon de test pour le chargeur Python EPlugin."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Un greffon qui charge d'autres greffons écrits en Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Chargeur Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (intégré)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin non trouvé, code : %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Impossible de créer le tube : %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Erreur après le clonage : %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "Le processus fils SpamAssassin ne répond pas, il va être tué..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+"En attente du processus fils Spamassassin interrompu, terminaison en cours..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "Échec du tube vers SpamAssassin, code erreur : %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin n'est pas disponible."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Cela rendra SpamAssassin plus fiable, mais plus lent"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "I_nclure les tests distants"
 
@@ -18796,7 +19889,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "Enregistrer les pièces jointes"
 
@@ -18808,16 +19901,15 @@ msgstr "Enregistrer les pièces jointes..."
 msgid "Save all attachments"
 msgstr "Enregistrer toutes les pièces jointes"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Sélectionnez le nom de la sauvegarde"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "Type MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -18825,79 +19917,79 @@ msgstr "Enregistrer"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Liste de description"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Liste des catégories"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Liste de commentaire"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Créé"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Liste de contacts"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Début"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Fin"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "pourcentage effectué"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Liste des participants"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Modifié"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Options avancées pour le format CSV"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Ajouter un en-tête"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Délimiteur des champs :"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Séparateur de l'enregistrement :"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Encapsuler les valeurs avec :"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Format CSV » (.csv)"
 
@@ -18919,15 +20011,15 @@ msgstr "Enregi_strer sur disque"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "Format RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Sélectionner un fichier de destination"
 
@@ -18952,7 +20044,7 @@ msgid "Show _only this Task List"
 msgstr "Afficher _uniquement cette liste de tâches"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
+msgid "A plugin that manages the Startup wizard."
 msgstr "Un greffon qui gère l'assistant de lancement."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
@@ -18985,24 +20077,24 @@ msgid "Importing files"
 msgstr "Importation de fichiers"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "Sélectionnez les informations que vous désirez importer :"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "Importation des données."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
@@ -19023,6 +20115,30 @@ msgstr "Tri des messages par sujet"
 msgid "F_all back to threading messages by subject"
 msgstr "Revenir au tri des messages par su_jet"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Liste de paires mot-clé/valeur pour le greffon Modèles en vue de leur "
+"substitution dans le corps des messages."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Sans titre"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Enregistrer comme _modèle"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Enregistre comme modèle"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Greffon de modèles basés sur des brouillons"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
@@ -19049,69 +20165,150 @@ msgid "Evolution Test component"
 msgstr "Composant Test d'Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Une chaîne décrivant les paramètres actuels de l'imprimante."
+msgid "Authenticate proxy server connections"
+msgstr "Connexions authentifiées au serveur mandataire"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "URL de configuration automatique du serveur mandataire"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Numéro de version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "Décide si la détection d'arrêt brutal doit être active ou non."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Largeur par défaut du panneau latéral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Hauteur par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "État par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Largeur par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Active les paramètres du serveur mandataire lors d'accès HTTP/HTTP sécurisé "
+"à Internet."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr "Nom d'hôte du serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr "Mot de passe du serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr "Port du serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr "Nom d'utilisateur du serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID ou alias du composant à afficher par défaut au démarrage."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username/password combo is defined by \"/apps/evolution/shell/network_config/"
+"authentication_user\" and locally stored password in .gnome2_private/."
+msgstr ""
+"Si vrai, les connexions au serveur mandataire nécessitent une "
+"authentification. L'ensemble nom d'utilisateur/mot de passe est défini par « /"
+"apps/evolution/shell/network_config/authentication_user » et le mot de passe "
+"est enregistré localement dans .gnome2_private/."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Dernier numéro de version d'Evolution mise à jour"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste des chemins des dossiers à synchroniser sur le disque pour "
 "l'utilisation hors ligne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr "Hôtes sans serveur mandataire"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+"Mot de passe à fournir à l'authentification lors de l'usage du serveur "
+"mandataire HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr "Mode de configuration du serveur mandataire"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr "Nom d'hôte du serveur mandataire SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr "Port du serveur mandataire SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr "Nom d'hôte du serveur mandataire HTTP sécurisé"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr "Port du serveur mandataire HTTP sécurisé"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+"Indique le mode de configuration du serveur mandataire. Les valeurs prises "
+"en charge sont 0, 1, 2 et 3 signifiant respectivement « utiliser les réglages "
+"système », « pas de serveur mandataire », « utiliser une configuration "
+"manuelle du serveur mandataire » et « utiliser la configuration du serveur "
+"mandataire fournie par l'URL d'autoconfiguration »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Le panneau latéral est visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Ignorer les dialogues d'avertissement de développement"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Ignorer les dialogues d'avertissement de récupération"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Démarrer en mode hors ligne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "La barre d'état est visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19119,19 +20316,19 @@ msgstr ""
 "Le numéro de version d'Evolution, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Hauteur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Largeur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Largeur par défaut du panneau latéral, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19139,7 +20336,43 @@ msgstr ""
 "La dernière version mise à jour d'Evolution, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr "Le nom de la machine servant de serveur mandataire HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Le nom de la machine servant de serveur mandataire HTTP sécurisé."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr "Le nom de la machine servant de serveur mandataire SOCKS."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"Le port de la machine servant de serveur mandataire HTTP définie par « /apps/"
+"evolution/shell/network_config/http_host »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"Le port de la machine servant de serveur mandataire HTTP sécurisé définie "
+"par « /apps/evolution/shell/network_config/secure_host »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"Le port de la machine servant de serveur mandataire SOCKS définie par « /apps/"
+"evolution/shell/network_config/socks_host »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19150,58 +20383,85 @@ msgstr ""
 "« toolbar » est choisi, le style des boutons est défini par le paramètre "
 "GNOME de la barre d'outils."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"Cette clé contient une liste d'hôtes qui sont connectés directement plutôt "
+"qu'à travers le serveur mandataire (s'il est actif). Les valeurs peuvent "
+"être des noms d'hôtes, des domaines (en utilisant un caractère générique "
+"comme *.toto.com), des adresses IP d'hôtes (IPv4 ou IPv6) et des adresses de "
+"réseaux avec un masque de réseau (quelque chose du type 192.168.0.0/24)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Barre d'outils visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr "URL fournissant les paramètres de configuration du serveur mandataire."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "Utiliser un serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+"Nom d'utilisateur à fournir à l'authentification lors de l'usage du serveur "
+"mandataire HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indique si Evolution doit démarrer en mode hors ligne plutôt qu'en mode "
 "connecté."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "Indique si la détection d'arrêt brutal doit être active"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Indique si la fenêtre doit être maximisée."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Indique si le panneau latéral doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Indique si la barre d'état doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Indique si la barre d'outils doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indique si les fenêtres d'avertissement de la version de développement "
 "d'Evolution sont ignorées."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr ""
 "Indique si les fenêtres d'avertissement de récupération d'Evolution sont "
 "ignorées."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Indique si la fenêtre des boutons doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Style des boutons de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Les boutons de la fenêtre sont visibles"
 
@@ -19217,11 +20477,11 @@ msgstr "Connexions actives"
 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-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "Choisissez l'assistant d'importation à lancer :"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -19235,11 +20495,11 @@ msgstr ""
 "Si vous ignorez le type, sélectionnez « Automatique » et Evolution essaiera "
 "de l'utiliser."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "Choisissez la destination de cette importation"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19251,79 +20511,59 @@ msgstr ""
 "Aucun paramètre pouvant être importé n'a été trouvé. Si vous\n"
 "voulez essayer de nouveau, cliquez sur le bouton « Précédent ».\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nom du f_ichier :"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Sélectionnez un fichier"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "_Type de fichier :"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Importer les données et paramètres d'_anciens programmes"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Importer un _seul fichier"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Préférences d'Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Aucun nom de dossier spécifié."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Un nom de dossier ne peut pas contenir le caractère Entrée."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Un nom de dossier ne peut pas contenir le caractère « / »."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Un nom de dossier ne peut pas contenir le caractère « # »."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "« . » et « .. » sont des noms de dossiers réservés."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Les outils du GNOME Pilot ne semblent pas être installés sur ce système."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Erreur à l'exécution de %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy n'est pas installé."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut pas être exécuté."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Christophe Merlet <redfox@redfoxcenter.org>\n"
@@ -19341,77 +20581,82 @@ msgstr ""
 "Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
 "Robert-André Mauchin <zebob.m@pengzone.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>\n"
-"Claude Paroz <claude@2xlibre.net>"
+"Claude Paroz <claude@2xlibre.net>\n"
+"Bruno Brouard <annoa.b@gmail.com>"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Site Web d'Evolution"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Erreur lors de l'ouverture de la page Web de la Foire aux questions."
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Travailler _en ligne"
 
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "Travailler _hors ligne"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Travail hors ligne"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"Evolution est actuellement en ligne. Cliquez sur ce bouton pour travailler "
-"hors ligne."
+"Evolution est actuellement en ligne.\n"
+"Cliquez sur ce bouton pour travailler hors ligne."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution est en train de passer hors ligne."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"Evolution est actuellement hors ligne. Cliquez sur ce bouton pour travailler "
-"en ligne."
+"Evolution est actuellement hors ligne.\n"
+"Cliquez sur ce bouton pour travailler en ligne."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Changer pour %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "Erreur système inconnue."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld Kio"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "Valider"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "Paramètres non valides"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "Impossible d'enregistrer dans OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Nouveau"
 
@@ -19466,7 +20711,7 @@ msgstr ""
 "d'importation de fichiers externes dans Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19505,7 +20750,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:257
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19513,19 +20758,19 @@ msgstr ""
 "Merci,\n"
 "L'équipe d'Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "Ne plus afficher le message"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "Détection d'arrêt brutal d'Evolution"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "Ig_norer"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19537,39 +20782,39 @@ msgstr ""
 "masqués.\n"
 "Vous pouvez rétablir les volets d'aperçu depuis le menu Affichage.\n"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "_Ne plus afficher ce message"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant spécifié"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "Démarre en mode connecté"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "Force l'arrêt de tous les composants d'Evolution"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Force la remigration depuis Evolution 1.4"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoie la sortie de débogage de tous les composants vers un fichier."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "Désactive le chargement des greffons."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Désactive l'aperçu des courriels, contacts et tâches."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Le client de messagerie et l'agenda Evolution"
 
@@ -19721,7 +20966,7 @@ msgstr ""
 "Si vous choisissez de continuer, il se peut que vous n'ayez plus accès à "
 "certaines de vos anciennes données.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19732,7 +20977,7 @@ msgstr ""
 "\n"
 "Éditer les paramètres d'approbation :"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19742,7 +20987,7 @@ msgstr ""
 "certificat alors vous faites confiance en l'authenticité de ce certificat à "
 "moins que quelque chose n'indique le contraire ici"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19800,11 +21045,16 @@ msgstr "Adresse électronique"
 msgid "All CA certificate files"
 msgstr "Tous les fichiers de certification CA"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visionneur de certificat : %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Saisissez le mot de passe pour « %s »"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19815,7 +21065,7 @@ msgid "Enter new password"
 msgstr "Saisissez le nouveau mot de passe"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19824,7 +21074,7 @@ msgstr ""
 "Émis vers :\n"
 "   Sujet : %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19833,7 +21083,7 @@ msgstr ""
 "Émis par :\n"
 "   Sujet : %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Sélectionnez le certificat"
 
@@ -20028,7 +21278,7 @@ msgid "_Edit CA Trust"
 msgstr "M_odifier l'approbation CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Certificat déjà existant"
 
@@ -20237,8 +21487,7 @@ msgstr "Co_pier tous les contacts vers..."
 msgid "Contact _Preview"
 msgstr "_Aperçu du contact"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copier"
@@ -20263,8 +21512,7 @@ msgstr "Copier vers le dossier..."
 msgid "Create a new addressbook folder"
 msgstr "Crée un nouveau dossier de carnet d'adresses"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
@@ -20305,8 +21553,7 @@ msgstr "Déplace les contacts du dossier sélectionné vers un autre dossier"
 msgid "Move to Folder..."
 msgstr "Déplacer vers le dossier..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Coller"
@@ -20343,13 +21590,11 @@ msgstr "Enregistre les contacts sélectionnés comme VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Enregistre les contacts du dossier sélectionné comme VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Tout sélectionner"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Tout sélectionner"
 
@@ -20479,7 +21724,7 @@ msgid "Month"
 msgstr "Mois"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Suivant"
 
@@ -20488,7 +21733,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Prévisualise le calendrier à imprimer"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Précédent"
 
@@ -20556,233 +21801,6 @@ msgstr "Sem. de travail"
 msgid "_Open Appointment"
 msgstr "_Ouvrir un rendez-vous"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copie le texte sélectionné dans le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Copie la sélection vers le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Coupe le texte sélectionné vers le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Coupe la sélection vers le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Colle depuis le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Colle le texte depuis le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Sélectionne tout le texte"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Joindre"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Cliquez ici pour joindre un fichier"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Cliquez ici pour fermer la fenêtre actuelle"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Cliquez ici pour enregistrer la fenêtre actuelle"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Cliquez ici pour voir l'aide disponible"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Fermer"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nsertion"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Pièce jointe..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Fermer"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Fichier"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "Aid_e"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Options"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Toute la journée"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Toute la _journée"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Classer comme confidentiel"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Classer comme privé"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Classer comme public"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Cliquez ici pour définir ou annuler les alarmes de cet événement"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Insère les options avancées d'envoi"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Transforme en événement récurrent"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pu_blic"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr ""
-"Interroge les personnes attendues sur leur disponibilité (libre/occupé)"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Champ _Rôle"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Options d'envoi"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Afficher la période comme _occupé"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Fu_seau horaire"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "L'état indique si le champ Type de participant est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "L'état indique si le champ RSVP est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "L'état indique si le champ Rôle est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "L'état indique si le champ État est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "L'état indique si le champ Fuseau horaire est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "L'état indique si les catégories sont affichées"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "L'état indique si défini comme « Événement toute la journée »"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "L'état indique si la période est affichée comme occupée"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmes"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Catégories"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "C_lassification"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidentiel"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Libre/Occupé"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privé"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Récurrence"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Champ _État"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Champ _Type"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Annule l'opération de messagerie en cours"
@@ -20814,7 +21832,6 @@ msgid "Empty _Trash"
 msgstr "_Vider la corbeille"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "D_ossier"
 
@@ -21491,9 +22508,9 @@ msgstr "_Zoom"
 msgid "_Zoom In"
 msgstr "Zoom a_vant"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Ferme cette fenêtre"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Fermer"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21531,291 +22548,6 @@ msgstr "Affiche le mémo sélectionné"
 msgid "_Open Memo"
 msgstr "_Ouvrir le mémo"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Joindre un fichier"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Ferme le fichier actuel"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Supprime tout sauf la signature"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Chiffre ce message avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Chiffre ce message avec votre certificat de chiffrement S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_mat"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Obtenir un avertissement quand votre message est lu"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Insére les options d'envoi"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Ouvre un fichier"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Chiffrer avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Signer avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "_Chiffrer avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "_Signer avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "D_emander un accusé de lecture"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "C_hiffrer avec S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Chiffrer avec S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S_igner avec S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Signer avec S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "E_nvoyer"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Enregistrer sous"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Enregistrer le brouillon"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Enregistrer _sous..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Enregistrer le _brouillon"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Enregistre comme brouillon"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Enregistrer dans le dossier..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Enregistre le fichier actuel"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Enregistre le fichier actuel avec un nom différent"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Enregistre le message dans un dossier spécifié"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Envoyer"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Envoie le message au format HTML"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Envoie ce message"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Affecte une priorité élevée au message"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Signe ce message avec votre clé PGP"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Signe ce message avec votre certificat de signature S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Indique si le champ Cci est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Indique si le champ Cc est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Indique si le champ De est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Indique si le champ Envoyé à est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Indique si le champ Répondre à est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Indique si le champ À est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "Champ Cc_i"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "Champ _Cc"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "Tout _supprimer"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "Champ _De"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Ouvrir..."
-
-# voir les toggles au dessus !
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "Champ En_voyé à"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Prioriser le message"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "Champ _Répondre à"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "Séc_urité"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Options d'_envoi"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "Champ _À"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Fermer"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Enregistrer et fermer"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Enregistrer et _fermer"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Enregistre le fichier actuel et ferme la fenêtre"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Ajoute le dossier à votre liste de dossier abonnés"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Actualiser la liste"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Actualise la liste de dossiers"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Supprime le dossier de votre liste de dossier abonnés"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "S'abonner"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Se désabonner"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverser la sélection"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Cliquer pour modifier ou afficher les détails de l'état de la tâche"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Détails de l'état"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Fuseau horaire"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Détails de l'é_tat"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copie les tâches sélectionnées"
@@ -22132,11 +22864,11 @@ msgid "With _Status"
 msgstr "Avec l'é_tat"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -22153,8 +22885,8 @@ msgid "Select a Time Zone"
 msgstr "Sélectionner un fuseau horaire"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Menu déroulant du fuseau horaire"
+msgid "Timezone drop-down combination box"
+msgstr "Zone de liste déroulante pour le fuseau horaire"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22166,19 +22898,19 @@ msgstr ""
 "sélectionner un fuseau horaire.\n"
 "Utilisez le bouton droit de la souris pour réduire."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Collection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Définir les vues pour %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Définir les vues"
 
@@ -22188,17 +22920,17 @@ msgid "Define Views for \"%s\""
 msgstr "Définir les vues pour « %s »"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tableau"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instance"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Enregistrement de la vue actuelle"
 
@@ -22251,11 +22983,11 @@ msgid "Create or edit views"
 msgstr "Crée ou édite des vues"
 
 # Usine ???
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabrique"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Définir une nouvelle vue"
 
@@ -22271,17 +23003,17 @@ msgstr "Type de la vue"
 msgid "Type of view:"
 msgstr "Type de la vue :"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barre des pièces jointes"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Impossible de joindre le fichier %s : %s."
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -22304,34 +23036,33 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Calendrier mensuel"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Couleur de remplissage"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "Couleur de remplissage GDK"
 
 # ??? stipple : mot inconnu
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Remplir le stipple"
 
@@ -22356,29 +23087,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Largeur minimale"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Largeur minimale"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Espacement"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Maintenant"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La date doit être dans le format : %s"
@@ -22387,152 +23118,150 @@ msgstr "La date doit être dans le format : %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Le pourcentage doit être compris entre 0 et 100 inclus"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "Balte"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "Europe centrale"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "Grec"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "Thaï"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Européen de l'ouest"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "Européen de l'ouest, Nouveau"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Traditionnel"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Simplifié"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "Visuel"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Jeu de caractères inconnu : %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "Codage des caractères"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "Saisissez le jeu de caractères à utiliser"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "Autre..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "Codage des c_aractères"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Zone de saisie pour fixer la date"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Cliquez sur ce bouton pour afficher un calendrier"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
-msgstr "Menu déroulant pour choisir la date"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr "Zone de liste déroulante de sélection de la date"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_Maintenant"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "A_ujourd'hui"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Date non valide"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Heure non valide"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Développé"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Indique si l'icône d'extension doit être déplié"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Libellé de l'icône d'extension"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Utiliser le soulignement"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22540,39 +23269,39 @@ msgstr ""
 "Si activé, un soulignement dans le texte indique que le caractère suivant "
 "est utilisé comme touche de raccourcis"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Espace à mettre entre le libellé et le fils"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Composant graphique Libellé"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Un composant graphique à afficher à la place du libellé usuel de l'icône "
 "d'extension"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "Taille de l'icône d'extension"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "Taille de la flèche de l'icône d'extension"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Indicateur d'espacement"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Espace autour de la flèche de l'icône d'extension"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
@@ -22617,22 +23346,31 @@ msgstr "Dossier actuel"
 msgid "Current Message"
 msgstr "Message actuel"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Choisissez une image"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Carte du monde"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
-"Widget de carte interactive basé sur l'utilisation de la souris afin de "
-"choisir le fuseau horaire. Les utilisateurs se servant d'un clavier peuvent "
-"sélectionner le fuseau horaire grâce au menu déroulant situé en bas."
+"Composant graphique du type carte interactive basé sur l'utilisation de la "
+"souris afin de choisir le fuseau horaire. Les utilisateurs se servant d'un "
+"clavier doivent sélectionner le fuseau horaire grâce à la zone de liste "
+"déroulante située en bas."
+
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "En ligne"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "L'état du bouton est en ligne"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22659,61 +23397,61 @@ msgstr "Modèle de replacement"
 msgid "Column width"
 msgstr "Largeur des colonnes"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Recherche"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Cliquez ici pour modifier le type de recherche"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID de l'élément"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texte"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "_Afficher : "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "_Rechercher : "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " _dans "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Rangée de curseurs"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Colonne de curseurs"
@@ -22730,7 +23468,7 @@ msgstr "Mode de sélection"
 msgid "Cursor Mode"
 msgstr "Mode du curseur"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "Si s_upprimé :"
 
@@ -22754,10 +23492,6 @@ msgstr "<b>Suivi de l'état</b>"
 msgid "A_uto-delete sent item"
 msgstr "S_upprimer automatiquement l'élément envoyé"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classification"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Cré_er un élément envoyé pour suivre l'information"
@@ -22838,39 +23572,40 @@ msgstr "_Après :"
 msgid "_All information"
 msgstr "_Toutes les informations"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "_Retarder la distribution du message"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Distribué"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Définir une date d'expiration"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Jusqu'au :"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "Quand cela vous _convient"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "_Quand ouvert :"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% effectué)"
@@ -22915,23 +23650,23 @@ msgstr "Colonne ayant le focus"
 msgid "Unselected Column"
 msgstr "Colonne non sélectionnée"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Colonne barrée"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Colonne soulignée"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Colonne en gras"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Colonne en couleur"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Colonne de couleur d'arrière-plan"
 
@@ -22969,7 +23704,7 @@ msgid "A_vailable Fields:"
 msgstr "Champs _disponibles :"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -22982,7 +23717,7 @@ msgid "Clear _All"
 msgstr "_Tout effacer"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Décroissant"
 
@@ -23045,14 +23780,14 @@ msgstr "_Trier..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "Code Glisser/Déposer"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "En-tête complet"
 
@@ -23086,297 +23821,317 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d élément)"
 msgstr[1] "%s (%d éléments)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Couleurs de rangées alternatives"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Grille de dessin horizontal"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Grille de dessin vertical"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Dessiner le focus"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Mode du curseur"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Modèle de sélection"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Longueur du seuil"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Hauteur de rangée uniforme"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Gelé"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Personnaliser la vue en cours"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "Tri _croissant"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Tri _décroissant"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Ne pas trier"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Grouper par ce _champ"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Grouper par _boîte"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Enlever cette c_olonne"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "_Ajouter une colonne..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "A_lignement"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "_Meilleur ajustement"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Format des colonne_s..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "_Personnaliser la vue actuelle..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Trier par"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Personnaliser"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Description de la police"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Info de tri"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Arborescence"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "En-tête de tableau"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modèle de tableau"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Rangée de curseurs"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Toujours rechercher"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Utiliser le clic pour ajouter"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
 msgid "ETree table adapter"
 msgstr "Adaptateur de table ETree"
 
 # ??? je ne comprends pas
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
 msgid "Retro Look"
 msgstr "Rechercher en arrière"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
 msgid "Draw lines and +/- expanders."
 msgstr "Dessiner les lignes et les icônes d'extension +/-."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Méthodes de saisie"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Processeur d'événements"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Gras"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Barré"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Ancre"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Justification"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Largeur du masque"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Hauteur du masque"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Masque"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Remplir le masque rectangulaire"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "Décalage en X"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Décalage en Y"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Largeur du texte"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Hauteur du texte"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Utiliser des points de suspension"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Points de suspension"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Coupure des lignes"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Caractères de coupure"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Lignes maximum"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Dessiner les bordures"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Autoriser les nouvelles lignes"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Dessiner l'arrière-plan"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Dessiner le bouton"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Position du curseur"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "Contexte des méthodes de saisie"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Poignée du menu contextuel"
 
-#~ msgid ""
-#~ "The address book {0} is read only, thus you cannot add contacts there. "
-#~ "Select other address book, please."
-#~ msgstr ""
-#~ "Le carnet d'adresses {0} est en lecture seule, vous ne pouvez pas lui "
-#~ "ajouter de contacts. Choisissez un autre carnet d'adresses."
+#~ msgid "No folder name specified."
+#~ msgstr "Aucun nom de dossier spécifié."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Un nom de dossier ne peut pas contenir le caractère Entrée."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Un nom de dossier ne peut pas contenir le caractère « / »."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Un nom de dossier ne peut pas contenir le caractère « # »."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "« . » et « .. » sont des noms de dossiers réservés."
+
+#~ msgid "All Day Event"
+#~ msgstr "Toute la journée"
+
+#~ msgid "Send _Options"
+#~ msgstr "_Options d'envoi"
+
+#~ msgid "Status Details"
+#~ msgstr "Détails de l'état"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fuseau horaire"
diff --git a/po/gl.po b/po/gl.po
index ffb07d6eef..c3e594ae1b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,3 +1,4 @@
+# translation of evolution.HEAD.po to Galician
 # translation of evolution.HEAD.gl.po to
 # Galician translation of Evolution.
 # Copyright (C) 2000 Jesús Bravo Álvarez.
@@ -12,18 +13,17 @@
 # Manuel A. Fernández Montecelo <manuel@sindominio.net>, 2001, 2005.
 # Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005, 2006.
 # Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007, 2008.
-#  <>, 2008
-#  <>, 2008
-#  <>, 2008
-#: ../shell/main.c:695
+# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2008
+# Frco. Javier Rial Rodríguez <>, 2008, 2008.
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.gl\n"
+"Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-31 18:16+0200\n"
-"PO-Revision-Date: 2008-05-31 18:40+0200\n"
-"Last-Translator:  <>\n"
-"Language-Team:  <en@li.org>\n"
+"POT-Creation-Date: 2008-08-07 18:06+0200\n"
+"PO-Revision-Date: 2008-08-07 18:12+0200\n"
+"Last-Translator: Frco. Javier Rial Rodríguez <>\n"
+"Language-Team: Galician <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type:  text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,21 +32,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "axenda de enderezos do Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Novo contacto"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Nova lista de contactos"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -163,7 +163,7 @@ msgid "calendar view for one or more days"
 msgstr "visualización de calendario para un ou máis días"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -174,8 +174,8 @@ msgstr "%A, %d de %b de %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1545
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
@@ -183,9 +183,9 @@ msgstr "%a, %d de %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -193,10 +193,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -206,15 +206,15 @@ msgstr "%d de %b de %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1561
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d de %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Calendario do Gnome"
 
@@ -326,34 +326,34 @@ msgstr "Calendario: desde %s até %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Botón de combinación"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Activar os predeterminados"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Menú emerxente"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Conmutar a barra de anexos"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "activar"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}' é unha fonte de libro de enderezos de só lectura. Cambie a vista de "
-"contactos e realce un libro de enderezos que poida aceptar contactos."
+"'{0}' é unha axenda de enderezos de só lectura. Cambie a vista de contactos "
+"e elixa un libro de enderezos distinto da barra lateral."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -402,7 +402,7 @@ msgstr "Non se pode eliminar a axenda de enderezos."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Actualmente só se pode acceder á axenda de enderezos do sistema GroupWise "
 "desde o Evolution. Use unha vez algún outro cliente de correo GroupWise para "
@@ -427,7 +427,7 @@ msgstr "Fallo ao autenticarse co servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "Fallo ao eliminar o contacto"
 
@@ -530,10 +530,9 @@ msgstr ""
 "debería actualizarse a unha versión soportada"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
+msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
-"Vostede non ten os permisos suficientes para eliminar este contacto do libro "
+"Vostede non ten os permisos suficientes para eliminar contactos nesta axenda "
 "de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -574,7 +573,7 @@ msgstr "_Usar tal como está"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -583,17 +582,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Enderezo de sincronización predeterminado:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Non se puido cargar a axenda de enderezos"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Non se puido ler o bloque de aplicación Enderezo do pilot"
 
@@ -615,10 +614,10 @@ msgstr "Configurar aquí o completado automático"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -659,11 +658,12 @@ msgstr "Xestione os seus certificados S/MIME aquí"
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -676,20 +676,22 @@ msgstr "Neste computador"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Persoal"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
 #: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
@@ -698,6 +700,7 @@ msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
@@ -711,6 +714,7 @@ msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
 msgid "Address _Book"
 msgstr "Ax_enda de enderezos"
 
@@ -723,36 +727,36 @@ msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Fallo ao actualizar a configuración da axenda de enderezos ou os cartafoles."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o contido da a_xenda de enderezos localmente para unha operación sen "
 "conexión"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:292 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2362
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Xeral"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:559
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
@@ -765,13 +769,13 @@ msgid "Authentication"
 msgstr "Autenticación"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:960
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Buscando"
 
@@ -785,12 +789,12 @@ msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
@@ -847,48 +851,48 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear o cartafol \"%s\" como:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Renomear o cartafol"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "Gardar como vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1709 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1347
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Selector de orixe de contactos"
 
@@ -909,6 +913,7 @@ msgstr "Introduza o contrasinal para %s (usuario %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:498
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1006,7 +1011,7 @@ msgid "Add Address Book"
 msgstr "Engadir axenda de enderezos"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Sempre"
 
@@ -1014,73 +1019,78 @@ msgstr "Sempre"
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "_Examinar este libro até que se alcance o límite"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Nome distintivo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Enderezo de correo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "O Evolution empregará este enderezo de correo para autenticalo co servidor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Localizar bases de busca posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nunca"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sen cifrado"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Un"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtro de busca"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_Base de busca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Filtro de busca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtro de busca"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1090,7 +1100,7 @@ msgstr ""
 "Se isto non se modifica, a busca por defecto realizarase sobre a clase de "
 "obxectos do tipo \"person\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1098,7 +1108,7 @@ msgstr ""
 "Seleccionar esta opción significa que o Evolution só conectará co seu "
 "servidor LDAP se o seu servidor LDAP soporta SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1106,7 +1116,7 @@ msgstr ""
 "Seleccionar esta opción significa que o Evolution só conectará co seu "
 "servidor LDAP se o seu servidor LDAP soporta TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 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 "
@@ -1116,23 +1126,23 @@ msgstr ""
 "TLS. Isto significa que a súa conexión será insegura e que vostede será "
 "vulnerable a fallos de seguranza."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de busca soportadas"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 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 "
@@ -1142,7 +1152,7 @@ msgstr ""
 "buscas. Se deixa isto en branco, a busca comezará na raíz da árbore de "
 "directorios."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 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 "
@@ -1154,7 +1164,7 @@ msgstr ""
 "todas as entradas por debaixo da súa base de busca. Un ámbito \"un\" só "
 "incluirá as entradas un nivel por debaixo da súa base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1162,7 +1172,7 @@ msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap.mycompany."
 "com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1170,7 +1180,7 @@ msgstr ""
 "Este é o número máximo de entradas para descargar. Configuralo cun número "
 "demasiado grande podería ralentizar a súa axenda de enderezos."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1180,7 +1190,7 @@ msgstr ""
 "en que definir isto como \"Enderezo de correo\" require o acceso anónimo ao "
 "seu servidor LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1188,7 +1198,7 @@ msgstr ""
 "Este é o nome que identificará este servidor na lista de cartafoles do "
 "Evolution. É só para poder mostralo no monitor. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 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 "
@@ -1198,75 +1208,75 @@ msgstr ""
 "Proporcionouse unha lista de portos estándar. Pregunte ao seu administrador "
 "do sistema que porto debería especificar."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Usando nome distintivo (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Usando enderezo de correo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Cando sexa posible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Engadir axenda de enderezos"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Localizar bases de busca posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:174
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "Ámbito da bu_sca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:183
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Tempo de espera:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartóns"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:715
 msgid "minutes"
 msgstr "minutos"
 
@@ -1307,7 +1317,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Traballo</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1319,16 +1329,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:201
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -1341,7 +1351,7 @@ msgid "Image"
 msgstr "Imaxe"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1354,7 +1364,7 @@ msgid "Nic_kname:"
 msgstr "_Alcume:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1368,11 +1378,11 @@ msgstr "Teléfono"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Traballo"
 
@@ -1394,7 +1404,7 @@ msgid "_Birthday:"
 msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
@@ -1484,1120 +1494,1121 @@ msgstr "_Onde:"
 msgid "_Zip/Postal Code:"
 msgstr "_Código Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Alxeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antártida"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antiga e Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Arxentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Acerbaixán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Bélxica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belice"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bután"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia e Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botsuana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Illa Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Territorio Británico do Océano Índico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Sultanato de Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Camerún"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Illas Caimán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "República Centroafricana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Chad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Kiritimati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Illas Cocos (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, A república democrática do"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Illas Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croacia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Xibutí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Exipto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiopía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Illas Malvinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Illas Feroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fixi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Francia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Güiana Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Territorios Franceses do Sur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Xeorxia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Alemaña"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Gana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Xibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Güiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haití"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Illas Heard e McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Santa Sé"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hungría"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Irán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Illa de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Xamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Xapón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Xordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corea, República democrática popular de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Corea, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirguizistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Letonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Malí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Illas Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "México"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldavia, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nova Zelandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Níxer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nixeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Illa Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Illas Marianas do Norte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Omán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Paquistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palestina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papúa Nova Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Perú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Reunión"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Romanía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Federación Rusa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "San Cristófer-Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Santa Lucía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "San Vicente e as Granadinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "São Tomé e Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Serbia e Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seixeles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Serra Leona"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Illas Salomón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Sudáfrica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Xeorxia do Sur e Illas Sandwich do Sur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "España"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre e Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Illas Svalbard e Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Suíza"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Siria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Taxikistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, República Unida de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turquía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Illas Turk e Caicos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ucraína"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Emiratos Árabes Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "Illas Exteriores Menores dos EEUU"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Illas Virxes, británicas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "Illas Virxes, estadounidenses"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Illas Wallis e Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Sáhara Occidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Iemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "Messenger instantáneo AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Messenger Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Messenger Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Servizo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Localización"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Nome do usuario"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Outros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Axenda de enderezos de orixe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Axenda de enderezos de destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "É un contacto novo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Campos que se poden escribir"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "Campos requiridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Modificado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2605,47 +2616,47 @@ msgstr ""
 "Os datos de contacto non son válidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "Contacto non válido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Adición rápida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Editar Completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "Correo _electrónico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2654,7 +2665,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar a lista de contactos (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2662,7 +2673,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2671,7 +2682,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar o contacto (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2822,9 +2833,9 @@ msgstr "_Integrantes"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:216
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Axenda de enderezos"
 
@@ -2869,40 +2880,40 @@ msgstr ""
 "O nome ou enderezo de correo deste contacto xa existe neste\n"
 "cartafol. Quere engadilo de todas as formas?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Combinar contacto"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Combinar contacto"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Correo Electrónico"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:81 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "O nome comeza por"
+msgid "Name contains"
+msgstr "O nome contén"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2917,9 +2928,9 @@ msgstr[1] "%d contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Consulta"
 
@@ -2930,7 +2941,7 @@ msgstr "Erro ao obter a visualización da axenda de enderezos"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2940,105 +2951,108 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "O nome comeza por"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Fonte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:816
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "Gardar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Novo contacto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Nova _lista de contactos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Enviar unha _mensaxe á lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "Co_piar á axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver á axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:455
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1694 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2045
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "_Pegar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1520
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "Calquera categoría"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Outro erro"
@@ -3074,7 +3088,7 @@ msgstr "Teléfono do automóbil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3175,9 +3189,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "Rol"
 
@@ -3213,38 +3227,38 @@ msgid "Web Site"
 msgstr "Sitio Web"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Largura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Altura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ten foco"
 
@@ -3268,7 +3282,17 @@ msgstr "Lonxitude máxima do campo"
 msgid "Column Width"
 msgstr "Largura da columna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"A buscar os contactos..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3282,7 +3306,7 @@ msgstr ""
 "\n"
 "ou prema dúas veces aquí para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3296,7 +3320,7 @@ msgstr ""
 "\n"
 "Prema aquí dúas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3306,7 +3330,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3316,41 +3340,41 @@ msgstr ""
 "\n"
 "Non hai elementos para mostrar nesta visualización."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Correo electrónico do traballo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Correo electrónico particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Outro correo electrónico"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Posúe cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazón no navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Copiar localización da ligazón"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
 
@@ -3393,12 +3417,12 @@ msgid "Video Chat"
 msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2377
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -3410,8 +3434,7 @@ msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
 
@@ -3433,12 +3456,14 @@ msgid "Web Log"
 msgstr "Blogue"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2362
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Aniversario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2363
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -3484,7 +3509,7 @@ msgstr "Ningún contacto propio definido"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -3506,11 +3531,11 @@ msgstr "Non se soprota o protocolo"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3757,7 +3782,7 @@ msgstr "Información de contacto"
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "Consultando a axenda de enderezos..."
 
@@ -3785,43 +3810,43 @@ msgstr "Gardar na axenda de enderezos"
 msgid "Card View"
 msgstr "Visualización de cartón"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF do Evolution"
 
@@ -3874,7 +3899,7 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
@@ -3981,7 +4006,7 @@ msgstr "Sombreado"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:986
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4000,7 +4025,7 @@ msgid "Top:"
 msgstr "Superior:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -4109,20 +4134,20 @@ msgstr "Erro non soportado"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' é unha fonte de calendario de só lectura. Cambia calendario a un que "
-"poida aceptar citas."
+"'{0}' é un calendario de só lectura. Cambie á vista de calendario e elixa un "
+"calendario distinto da barra lateral."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"'{0}' é unha fonte de calendario de só lectura. Cambia a vista de calendario "
-"e realce un calendario que poida aceptar citas."
+"'{0}' é un calendario de só lectura. Cambia a vista de calendario e elixa un "
+"calendario que poida aceptar citas."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4215,19 +4240,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Está seguro de que quere eliminar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Está seguro de que quere eliminar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Está seguro de que quere eliminar esta nota?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que quere eliminar esta tarefa?"
@@ -4386,8 +4411,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "O calendario non está marcado para o uso sen conexión."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "A lista de notas non está marcada para o uso sen conexión"
+msgid "The memo list is not marked for offline usage."
+msgstr "A lista de notas non está marcada para o uso sen conexión."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4478,12 +4503,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "As súas tarefas non estarán dispoñibles até que reinicie o Evolution."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -4492,8 +4516,8 @@ msgid "_Save Changes"
 msgstr "_Gardar modificacións"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -4505,55 +4529,55 @@ msgstr "_Enviar notificación"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de días múltiples:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1519
-#: ../calendar/conduits/calendar/calendar-conduit.c:1520
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Non se puido iniciar o servidor Evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1627
-#: ../calendar/conduits/calendar/calendar-conduit.c:1630
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non se puido ler o bloque da aplicación do calendario do pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Non se puido ler o bloque da aplicación Memo do pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Non se puido escribir o bloque da aplicación Memo do pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Prioridade predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non se puido ler o bloque de aplicación ToDo do pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Non se puido escribir o bloque de aplicación ToDo do pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4594,23 +4618,23 @@ msgid "Memo_s"
 msgstr "Nota_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1121
-#: ../calendar/gui/gnome-cal.c:1703 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1575 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4630,25 +4654,25 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizo de notificación por alarma do Calendario do Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:113
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:128
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:716
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "horas"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:284
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -4659,9 +4683,9 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Localización:"
@@ -4671,14 +4695,15 @@ msgid "Snooze _time:"
 msgstr "_Pospor o aviso:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4690,32 +4715,32 @@ msgstr "_Pospor"
 msgid "location of appointment"
 msgstr "localización da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "Non hai resumo dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "Non hai descrición dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "Posúe %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4727,7 +4752,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo electrónico. No seu lugar\n"
 "Evolution vai mostrar un diálogo de aviso normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4744,15 +4769,15 @@ msgstr ""
 "\n"
 "Está seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Non se puido iniciar o Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:152
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4765,7 +4790,7 @@ msgid "invalid time"
 msgstr "hora non válida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4774,7 +4799,7 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4785,7 +4810,7 @@ msgstr[1] "%d minutos"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -5038,12 +5063,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostrar o campo de estado no editor de eventos/tarefas/reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar o panel de \"Previsualización\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar o panel de \"Previsualización\"."
 
@@ -5240,66 +5265,66 @@ msgstr "Minuto de comezo da xornada laboral"
 msgid "daylight savings time"
 msgstr "horario de verán"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "A categoría é"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "A localización contén"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos seguintes sete días"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "Tarefas pendentes"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos seguintes sete días"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5309,15 +5334,15 @@ msgstr ""
 "antigos que o tempo seleccionado. Se continúa, non poderá recuperar estes "
 "eventos."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Purgar eventos anteriores a"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:717
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "días"
@@ -5326,103 +5351,107 @@ msgstr "días"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:510
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:404
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de nacementos e aniversarios"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Tempo"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2087
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2101
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Fallou ao actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Non se puido abrir o calendario '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Non hai ningún calendario dispoñible para crear eventos e reunións"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "R_eunión"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Crear un novo calendario"
 
@@ -5443,15 +5472,219 @@ msgid "Month View"
 msgstr "Visualización mensual"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Calquera campo"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anexos"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Participante"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Traballo"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Categoría"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Clasificación"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Competición"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Descrición"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "A descrición contén"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Non existe"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existe"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favoritos"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Regalos"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Obxectivos"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Vacacións"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Tarxetas de vacaciones"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Contactos"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideas"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Internacional"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Cliente chave"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Tarefas dos seguintes 7 días"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organizador"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Chamadas de teléfono"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privado"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Público"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Recorrencia"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Estado"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Estratexias"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Resumo"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "O resumo contén"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Provedores"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Tempo e gastos"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "Esperando"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contén"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "non contén"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "é"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "non é"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir o calendario"
@@ -5464,11 +5697,11 @@ msgstr "Método non soportado ao abrir o calendario"
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir o calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Editar alarma"
 
@@ -5501,17 +5734,17 @@ msgid "Mes_sage:"
 msgstr "Mensa_xes:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Emerxer unha alerta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Executar un programa"
 
@@ -5524,7 +5757,7 @@ msgid "Send To:"
 msgstr "Enviar a:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Enviar un correo"
 
@@ -5571,7 +5804,10 @@ msgstr "tempos adicionais a cada"
 msgid "hour(s)"
 msgstr "hora(s)"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -5579,7 +5815,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "comezo da cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "Acción/Activador"
 
@@ -5590,16 +5826,15 @@ msgstr "Enga_dir"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir mostrar o anexo automaticamente"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
@@ -5670,8 +5905,8 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Venres"
 
@@ -5686,8 +5921,8 @@ msgstr ""
 "Días"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Luns"
 
@@ -5710,7 +5945,7 @@ msgstr ""
 "Domingo"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
@@ -5720,8 +5955,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -5738,8 +5973,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar os _números das semanas no navegador de datas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -5757,8 +5992,8 @@ msgid "Template:"
 msgstr "Modelo:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -5772,14 +6007,14 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Martes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mércores"
 
@@ -5858,323 +6093,466 @@ msgstr "Mé_r"
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente os contidos do calendario para unha operación sen conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente os contidos da lista de tarefas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Copia_r localmente os contidos da lista de notas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "Memo List Properties"
 msgstr "Propiedades de lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Eliminouse este evento."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Eliminouse esta tarefa."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "Eliminouse esta nota."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s Realizou modificacións. Quere esquecer estas modificacións e pechar o "
 "editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Non realizou modificacións, quere pechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Modificouse esta tarefa."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "Esta nota foi modificado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Realizou modificacións. Quere esquecer estas modificacións e actualizar "
 "o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificacións, quere actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:518
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaxe anexa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaxe anexa"
 msgstr[1] "%d mensaxes anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Cancelar o _arrastre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:661
-#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:378
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:823
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Non se puido actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunión - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tarefa asignada - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Nota - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Sen resumo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Prema aquí para pechar a ventá actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Copiar o texto seleccionado ao portapapeis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Cortar o texto seleccionado para o portapapeis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Prema aquí para ver a axuda dispoñible"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Pegar texto desde o portapapeis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Prema aquí para gardar a ventá actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Seleccionar todo o texto"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "_Clasificación"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Axuda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Opcións"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Ver"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Anexo..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Prema aquí para anexar un ficheiro"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Categorías"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr " Alterna entre se se mostran as categorías ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "_Fuso horario"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Alterna entre se se mostra ou non o campo Fuso horario"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Pú_blico"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Clasificar como público"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Clasificar como privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Clasificar como confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Campo _rol"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Alterna entre se se mostra o campo Rol ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Alterna entre se se mostra o campo RSVP ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Campo de e_stado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Alterna entre se se mostra o campo Estado ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Campo _tipo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Alterna entre se se mostra o campo Tipo de participante ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Docu_mentos recentes"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Anexar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../calendar/gui/dialogs/comp-editor.c:1591
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "E_liminar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../mail/em-format-html-display.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2194
 msgid "Show Attachments"
 msgstr "Mostrar anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Prema a tecla de espazo para alternar a barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2227
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Meeting - %s"
-msgstr "Reunión - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2235
-#: ../calendar/gui/dialogs/comp-editor.c:2278
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tarefa asignada - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2241
-#: ../calendar/gui/dialogs/comp-editor.c:2284
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../calendar/gui/dialogs/comp-editor.c:2287
-#, c-format
-msgid "Memo - %s"
-msgstr "Nota - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-msgid "No summary"
-msgstr "Sen resumo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2999
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As modificacións realizadas neste elemento pódense rexeitar se chega unha "
 "actualización"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3052
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Non é posible usar a versión actual!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Non se puido abrir a orixe"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Non se puido abrir o destino"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "O destino é só de lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "E_liminar este elemento das caixas de correo de todos os outros "
 "destinatarios?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "A tarefa non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "A nota non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "O elemento non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr "A nota non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr "O elemento non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "O evento non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "A tarefa non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "A nota non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "O elemento non se puido eliminar debido a un erro"
 
@@ -6183,7 +6561,7 @@ msgid "Contacts..."
 msgstr "Contactos..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Delegar en:"
 
@@ -6191,134 +6569,181 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alarmas"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+"Prema aquí para configurar ou desconfigurar as alarmas para este evento"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Recorrencia"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Converter en evento recorrente"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Opcións de envío"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Inserir opcións avanzadas de envío"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Evento de _día completo"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Alterna entre se se ten un evento de día completo ou non"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Mostrar hora como _ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Dispoñibilidade"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Consultar información de dispoñibilidade para os participantes"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Recorrencia"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Este evento posúe alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Evento sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Evento sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "A data de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "A hora de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Requírese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Engadir "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posible abrir o calendario '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando en nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes da cita"
 msgstr[1] "%d días antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1424
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../widgets/misc/e-cell-date-edit.c:308 ../widgets/misc/e-dateedit.c:1533
-#: ../widgets/misc/e-dateedit.c:1747
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "Ningún"
@@ -6391,28 +6816,24 @@ msgstr "_Cambiar organizador"
 msgid "Co_ntacts..."
 msgstr "Co_ntactos..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organizador"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non é posible abrir as notas en '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1558
-#: ../mail/em-format-html.c:1616 ../mail/em-format-html.c:1642
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1561
+#: ../mail/em-format-html.c:1619 ../mail/em-format-html.c:1645
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Para"
 
@@ -6430,58 +6851,58 @@ msgid "_Description:"
 msgstr "_Descrición:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Está modificando un evento recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Está delegando un evento recorrente. Que quere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando unha tarefa recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Está modificando unha nota recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Unicamente esta instancia "
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Esta instancia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Esta instancia e as futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contén recorrencias que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrencia non é válida"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "en"
 
@@ -6489,7 +6910,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "primeiro"
 
@@ -6498,7 +6919,7 @@ msgstr "primeiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "segundo"
 
@@ -6506,7 +6927,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "terceiro"
 
@@ -6514,7 +6935,7 @@ msgstr "terceiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "cuarto"
 
@@ -6522,13 +6943,13 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "último"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -6536,7 +6957,7 @@ msgstr "Outra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "Do 1º ao 10º"
 
@@ -6544,7 +6965,7 @@ msgstr "Do 1º ao 10º"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "do 11º ao 20º"
 
@@ -6552,45 +6973,45 @@ msgstr "do 11º ao 20º"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "Do 21º ao 31º"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "día"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "ocorrencias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Engadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Non se puido obter unha selección para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Non se puido obter unha selección para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -6641,12 +7062,12 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Páxina web"
 
@@ -6661,51 +7082,55 @@ msgstr "<span weight=\"bold\">Estado</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:252
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Terminada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Alto"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "En progreso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Baixo"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -6718,7 +7143,7 @@ msgid "Stat_us:"
 msgstr "Esta_do:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -6735,25 +7160,37 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Detalles do e_stado"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Prema para modificar ou ver os detalles do estado da tarefa"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Opción_s de envío"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "A data de vencemento é incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non é posible abrir as tarefas en '%s'."
@@ -6779,7 +7216,7 @@ msgid "_Due date:"
 msgstr "_Data de vencemento:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6787,142 +7224,126 @@ msgstr[0] "%d día"
 msgstr[1] "%d días"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Acción descoñecida para realizar "
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do comezo da cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s despois do comezo da cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ao comezo da cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de finalizar a cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s despois de finalizar a cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ao finalizar a cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de activador descoñecido"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Sen título"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Data de inicio:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Páxina Web:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:268
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Público"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privado"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Confidencial"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data final"
@@ -6932,21 +7353,14 @@ msgstr "Data final"
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:365
-msgid "Summary"
-msgstr "Resumo"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -6961,16 +7375,16 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:747
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
@@ -6978,16 +7392,16 @@ msgstr "Non"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
 #: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:742
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Descoñecido"
@@ -7000,27 +7414,27 @@ msgstr "Recorrencia"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2052
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione o cartafol para gardar os anexos seleccionados..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
-msgstr "imaxe_sen título.%s"
+msgstr "imaxe_sen_título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "_Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "Definir como _fondo"
 
@@ -7028,131 +7442,157 @@ msgstr "Definir como _fondo"
 msgid "_Save Selected"
 msgstr "_Gardar os seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:848
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Sen resumo *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizador: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Comeza: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Vence: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:681 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Eliminar os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:811 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1237 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1673 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Imp_rimir..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1676
-#: ../calendar/gui/e-calendar-view.c:1695 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Remitir como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar as tarefas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar as tarefas seleccionadas como non terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "E_liminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -7175,7 +7615,8 @@ msgid "Due date"
 msgstr "Data de vencemento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -7183,112 +7624,93 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de inicio"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:546
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Estado"
-
-#: ../calendar/gui/e-calendar-view.c:1356
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Movendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1358
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "Novo _evento de día completo"
 
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "Nova _reunión"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "_Visualización actual"
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "Seleccionar _hoxe"
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "_Seleccionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "_Imprimir..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "_Programar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "_Remitir como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1705 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta ocorrencia _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1711 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Eliminar esta _ocorrencia"
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "Eliminar _todas as ocorrencias"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2234
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizador: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2238
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizador: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2254 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7316,7 +7738,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:592
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisións de minuto"
@@ -7327,44 +7749,34 @@ msgstr "%02i divisións de minuto"
 #. 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:852 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:772 ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Si. (Recorrencia complexa)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada día"
 msgstr[1] "Cada %d días"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7372,9 +7784,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7382,51 +7792,35 @@ msgstr[0] "Cada semana en "
 msgstr[1] "Cada %d semanas en "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " e "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "O %s día de "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada ano"
 msgstr[1] "Cada %d anos"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7434,342 +7828,342 @@ msgstr[0] " un total de %d vez"
 msgstr[1] " un total de %d veces"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", finalizando en "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Comeza"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Finaliza"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "información de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Unha persoa descoñecida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Revise a seguinte información, e escolla unha acción do menú de abaixo."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:702
-#: ../plugins/itip-formatter/itip-formatter.c:2032
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:705 ../calendar/gui/itip-utils.c:734
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "A reunión cancelouse, porén non se puido encontrar nos seus calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa cancelouse, porén non se puido encontrar nas súas listas de tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, 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:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Información da reunión"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita a presenza de %s nunha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> require a súa presenza nunha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Proposta de reunión"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> quere que se lle engada a unha reunión existente."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Actualización da reunión"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> quere recibir a última información sobre a reunión."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Solicitude de actualización da reunión"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a unha petición de reunión."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Resposta de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Cancelación da reunión"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, 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:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Mensaxe de reunión incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou información da tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> require a %s que efectúe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> require que efectúe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> quere que se lle engada a unha tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Actualización de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quere recibir a última información sobre a tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Solicitude de actualización de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a unha asignación de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Resposta de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Cancelación de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Mensaxe de tarefa incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou información de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> require a súa información de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Solicitude de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a unha solicitude de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Resposta de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe incorrecta de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "A mensaxe non parece estar formada apropiadamente"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén solicitudes non soportadas."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo non contén unha mensaxe de calendario válida"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo non ten elementos de calendario visibles"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "O obxecto non é válido e non pode ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta non é dun participante actual. Quere engadilo como "
 "participante?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "O estado do participante non se puido actualizar debido a un estado non "
 "válido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
+#: ../calendar/gui/e-itip-control.c:2080
 #: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "O estado do participante non se puido actualizar porque xa non existe o "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Elemento enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Non se puido enviar o elemento!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Seleccione unha acción:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Rexeitar"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Actualizar o estado do interlocutor"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Enviar a última información"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -7798,112 +8192,112 @@ msgstr "Cargando calendario..."
 msgid "Server Message:"
 msgstr "Mensaxe do servidor:"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Participantes requiridos"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Presidente"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/e-meeting-store.c:744 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Participante requirido"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "Non-participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:754
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "Necesita acción"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/itip-utils.c:708
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegado"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:492
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Participante                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 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:473
-#: ../calendar/gui/e-meeting-time-sel.c:2138
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -7912,7 +8306,7 @@ 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:477
-#: ../calendar/gui/e-meeting-time-sel.c:2169
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7922,74 +8316,70 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Fóra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Sen información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Par_ticipantes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:452
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:469
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:577
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:622
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Participante"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Prema aquí para engadir un participante"
@@ -8022,8 +8412,8 @@ msgstr "E_liminar as notas seleccionadas"
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
-#: ../calendar/gui/e-memos.c:761 ../calendar/gui/e-tasks.c:911
-#: ../calendar/gui/gnome-cal.c:2865
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8032,84 +8422,84 @@ msgstr ""
 "Erro en %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:810
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../calendar/gui/e-memos.c:891
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo notas en %s"
 
-#: ../calendar/gui/e-memos.c:1063 ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Eliminando os obxectos seleccionados..."
 
-#: ../calendar/gui/e-tasks.c:964
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
 
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Finalizando tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Expurgando"
 
-#: ../calendar/gui/e-timezone-entry.c:134
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "Seleccionar fuso horario"
 
 #. 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/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: ../calendar/gui/gnome-cal.c:831
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "Actualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "Visualización _personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2503
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "_Gardar visualización personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "_Definir visualizacións..."
 
-#: ../calendar/gui/gnome-cal.c:2689
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tarefas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2717
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Cargando notas en %s"
 
-#: ../calendar/gui/gnome-cal.c:2824
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3780
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "Depurando"
 
@@ -8169,137 +8559,144 @@ msgstr "Setembro"
 msgid "_Select Today"
 msgstr "_Seleccionar hoxe"
 
-#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Débese definir un organizador."
 
-#: ../calendar/gui/itip-utils.c:483
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "É necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:661 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Información do evento"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/itip-utils.c:665 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Información da nota"
 
-#: ../calendar/gui/itip-utils.c:667 ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Información do calendario"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de dispoñibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no evento."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionada"
 msgstr[1] ", %d seleccionada"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Fallou ao actualizar as notas."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Non é posible abrir a lista de notas '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Non hai un calendario dispoñible para crear notas"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Selector de orixe de notas"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nova nota"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Crear unha nova nota"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Crear unha nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "Li_sta de notas"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Os seguintes 7 días"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8311,7 +8708,7 @@ msgstr ""
 "\n"
 "Agarde mentres o Evolution migra os seus cartafoles..."
 
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8324,25 +8721,25 @@ msgstr ""
 "Agarde mentres o Evolution migra os seus cartafoles..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Non é posible migrar a configuración antiga desde evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Non se puido migrar o calendario `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Non se puido migrar as tarefas `%s'"
 
-#: ../calendar/gui/migration.c:1232
+#: ../calendar/gui/migration.c:1227
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
@@ -8502,119 +8899,126 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sá"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contactos: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Citas próximas"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "Fallou ao actualizar as tarefas."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Non é posible abrir a lista de tarefas '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Non hai ningún calendario dispoñible para crear tarefas"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../calendar/gui/tasks-component.c:1336
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Crear unha nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de tare_fas"
 
-#: ../calendar/gui/tasks-component.c:1344
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8626,49 +9030,70 @@ msgstr ""
 "\n"
 "Está seguro de que quere eliminar estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% rematado"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "En progreso"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "é maior que"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "é menor que"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Citas e reunións"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1573
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Aviso!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "Ficheiros vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
@@ -10210,201 +10635,196 @@ msgstr "Non se puido gardar automaticamente o ficheiro"
 msgid "Unable to retrieve message from editor"
 msgstr "Non é posible obter a mensaxe do editor"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Inserir anexo"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "Mensaxe sen título"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Anexo..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1344
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_visualización da impresión"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "Gardar _como..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "Gardar _borrador"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Opción_s de envío"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Introducir opcións de envío"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Nova _mensaxe"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Abrir unha ventá de nova mensaxe"
+
+#: ../composer/e-composer-actions.c:544
 msgid "Character _Encoding"
 msgstr "_Codificación dos caracteres"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "_Mensaxe prioritaria"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:570
-#, fuzzy
+#: ../composer/e-composer-actions.c:585
 msgid "Re_quest Read Receipt"
-msgstr "_Requirir confirmación de lectura"
+msgstr "Re_quirir confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "Si_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CCO"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CC"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Alterna entre se se mostra ou non o selector do campo De"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "Campo _Publicar-en"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Publicar en"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Responder a"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 msgid "_Subject Field"
 msgstr "Campo _Asunto"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Alterna entre se se mostra o campo Asunto ou non"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "Campo _Para"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Para"
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Anexar"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
@@ -10492,8 +10912,8 @@ msgstr ""
 "Non se pode cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1936
-#: ../mail/em-format-html-display.c:2426 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1912
+#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10504,11 +10924,11 @@ msgstr[1] "Anexos"
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4009
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10656,23 +11076,27 @@ msgstr "Non pode anexar o ficheiro `{0}' a esta mensaxe."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar unha conta antes de poder escribir un correo."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continuar editando"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Non recuperar"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:318
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Gardar mensaxe"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Gardar borrador"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Correo e calendario do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
@@ -10688,31 +11112,39 @@ msgstr "cartón de enderezo"
 msgid "calendar information"
 msgstr "información de calendario"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Aviso do Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Información do Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:458
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erro interno: requirido un erro descoñecido '%s'"
 
-#: ../e-util/e-plugin.c:308 ../mail/em-account-prefs.c:489
-#: ../mail/em-composer-prefs.c:982
-#: ../plugins/plugin-manager/plugin-manager.c:331
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Compoñente"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "O nome da compoñente que rexistrar"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Activado"
@@ -10721,15 +11153,15 @@ msgstr "Activado"
 msgid "Whether the plugin is enabled"
 msgstr "Se o complemento está activado"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Ocorreu un erro ao imprimir"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impresión informou dos seguintes detalles sobre o erro:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -10763,47 +11195,47 @@ msgstr "Sobrescribir o ficheiro?"
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "I_mportante"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Traballo"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Persoal"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_Tarefas pendentes"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Máis tarde"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Nome da etiqueta:"
 
-#: ../e-util/e-util-labels.c:340
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Editar etiqueta"
 
-#: ../e-util/e-util-labels.c:340
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Engadir etiqueta"
 
-#: ../e-util/e-util-labels.c:359
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "O nome da etiqueta non pode estar baleiro."
 
-#: ../e-util/e-util-labels.c:364
+#: ../e-util/e-util-labels.c:356
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -10817,7 +11249,7 @@ msgstr "Erro de GConf: %s"
 
 #: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
-msgstr ""
+msgstr "De agora en adiante, todos os erros amosaranse só no terminal."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10935,65 +11367,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Proba"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Nome da r_egra"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Buscar os elementos que cumpran cos seguintes criterios"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "En_gadir regra de filtraxe"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Se se cumpren todos os criterios"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Se se cumpre algún criterio"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_ncluír fíos"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -11093,7 +11525,7 @@ msgstr "dentro de"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "segundos"
 
@@ -11105,9 +11537,9 @@ msgstr "a hora actual"
 msgid "the time you specify"
 msgstr "a hora especificada"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:718
 msgid "weeks"
 msgstr "semanas"
 
@@ -11123,7 +11555,7 @@ msgstr "Engadir regra"
 msgid "Edit Rule"
 msgstr "Editar regra"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -11181,15 +11613,15 @@ msgid "Evolution Network configuration control"
 msgstr "Control de configuración de rede de Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
@@ -11206,12 +11638,12 @@ msgstr "Preferencias da rede"
 msgid "_Mail"
 msgstr "_Correo"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de licenza %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11224,109 +11656,109 @@ msgstr ""
 "para %s que se mostre abaixo\n"
 "e marque a caixa de verificación para aceptalo.\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaxe"
 
-#: ../mail/em-account-editor.c:1825 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1874 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Recibindo correo"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Verificar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2064
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2238 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: ../mail/em-account-editor.c:2297 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2363 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:316
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Seguranza"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Opcións de recepción"
 
-#: ../mail/em-account-editor.c:2401 ../mail/em-account-editor.c:2492
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Predeterminado]"
 
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1154 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Sen nome"
 
-#: ../mail/em-composer-prefs.c:986
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:1035
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Engadir script de sinatura"
 
-#: ../mail/em-composer-prefs.c:1077
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Sinatura(s)"
 
-#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../mail/em-composer-utils.c:1754
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. 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:1801
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11334,11 +11766,11 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1942
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Regras de filtro"
 
@@ -11355,10 +11787,6 @@ msgstr "Asignar cor"
 msgid "Assign Score"
 msgstr "Asignar puntuación"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Anexos"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cco"
@@ -11375,10 +11803,6 @@ msgstr "Cc"
 msgid "Completed On"
 msgstr "Completado en"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contén"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
@@ -11392,7 +11816,7 @@ msgid "Date sent"
 msgstr "Data de envío"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11403,10 +11827,6 @@ msgstr "Eliminar"
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "non contén"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "non finaliza en"
@@ -11427,10 +11847,6 @@ msgstr "non soa como"
 msgid "does not start with"
 msgstr "non comeza por"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Non existe"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Borrador"
@@ -11439,10 +11855,6 @@ msgstr "Borrador"
 msgid "ends with"
 msgstr "termina en"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existe"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existe"
@@ -11455,14 +11867,10 @@ msgstr "Expresión"
 msgid "Follow Up"
 msgstr "Seguimento"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Importante"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "é"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "é posterior a"
@@ -11475,18 +11883,6 @@ msgstr "é anterior a"
 msgid "is Flagged"
 msgstr "está marcado"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "é maior que"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "é menor que"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "non é"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "non está marcado"
@@ -11508,7 +11904,7 @@ msgstr "Correo non desexado"
 msgid "Junk Test"
 msgstr "Proba de correo non desexado"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11550,7 +11946,7 @@ msgstr "Reproducir son"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Ler"
 
@@ -11623,8 +12019,8 @@ msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11635,101 +12031,110 @@ msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Entón"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Engadir a_cción"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca por busca..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:214
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:215
 msgid "Unread Messages"
 msgstr "Mensaxes non lidas"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:217
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:225
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:228
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son correos non desexados"
 
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Busca na conta"
 
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Busca en todas as contas"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:185
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaxe non lida:"
-msgstr[1] "Mensaxe non lida:"
+msgstr[1] "Mensaxes non lidas:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:205 ../mail/em-folder-properties.c:207
-#, fuzzy
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
 msgid "Quota usage"
-msgstr "Mensaxes totais:"
+msgstr "Uso da cota"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "Caixa de entrada"
 
-#: ../mail/em-folder-properties.c:397
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
@@ -11738,27 +12143,19 @@ msgstr "Cartafoles de busca"
 msgid "UNMATCHED"
 msgstr "NON EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Borradores"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -11777,86 +12174,80 @@ msgstr "Cargando..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:373
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Árbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:895
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:919
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Non se pode(n) soltar a(s) mensaxe(s) no almacenamento do nivel superior"
 
-#: ../mail/em-folder-tree.c:996 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar ao cartafol"
 
-#: ../mail/em-folder-tree.c:997 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover ao cartafol"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Ver"
-
-#: ../mail/em-folder-tree.c:2080
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Abrir nunha _nova ventá"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Novo cartafol..."
 
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
@@ -11867,7 +12258,7 @@ msgstr "Copiando `%s' a `%s'"
 
 #: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
 #: ../mail/em-folder-view.c:1208
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
@@ -11905,7 +12296,7 @@ msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:579 ../mail/em-popup.c:590
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Reenviar"
@@ -11961,7 +12352,7 @@ msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:500
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Ningún"
 
@@ -12016,76 +12407,81 @@ msgid "Filter based on _Mailing List"
 msgstr "Filtrar por lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#: ../plugins/google-account-setup/google-source.c:301
+#: ../plugins/google-account-setup/google-source.c:586
+#: ../plugins/google-account-setup/google-source.c:772
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Non se puido obter a mensaxe"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Obtendo a mensaxe..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "Ch_amar a..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Crear cartafol de _busca"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_A este enderezo"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Clic para chamar %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:494
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalencias: %d"
 
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:667
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../mail/em-format-html-display.c:672
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_Diferenciar maiúsculas e minúsculas"
 
-#: ../mail/em-format-html-display.c:971 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:971
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12093,11 +12489,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:972 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:972
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12105,11 +12501,11 @@ msgstr ""
 "Esta mensaxe está asinada e é válida, o que significa que é moi probable que "
 "a mensaxe sexa auténtica."
 
-#: ../mail/em-format-html-display.c:973 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Invalid signature"
 msgstr "Sinatura non válida"
 
-#: ../mail/em-format-html-display.c:973
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12117,11 +12513,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Valid signature, but cannot verify sender"
 msgstr "Sinatura válida, mais non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:974
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12129,11 +12525,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, mais non se puido verificar "
 "o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:975 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe pero se necesita a chave pública"
 
-#: ../mail/em-format-html-display.c:975
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12141,11 +12537,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura, mais non hai unha chave pública "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:982 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:659
 msgid "Unencrypted"
 msgstr "Non cifrado"
 
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12153,11 +12549,11 @@ msgstr ""
 "Esta mensaxe non está cifrada. O seu contido pode verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:983 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:983
+#: ../mail/em-format-html-display.c:959
 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 "
@@ -12167,11 +12563,11 @@ msgstr ""
 "difícil, mais non imposible para un intruso ver o contido desta mensaxe "
 "dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:984 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:984
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12179,11 +12575,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:985 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted, strong"
 msgstr "Cifrado, forte"
 
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -12192,89 +12588,89 @@ msgstr ""
 "Esta mensaxe está cifrada cun algoritmo de cifrado forte. Sería moi difícil "
 "para un intruso ver o contido desta mensaxe dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:1086 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:1101
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1370
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado o %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1402
+#: ../mail/em-format-html-display.c:1378
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1405
+#: ../mail/em-format-html-display.c:1381
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes do %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1483
+#: ../mail/em-format-html-display.c:1459
 msgid "_View Inline"
 msgstr "_Ver en liña"
 
-#: ../mail/em-format-html-display.c:1484
+#: ../mail/em-format-html-display.c:1460
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1485
+#: ../mail/em-format-html-display.c:1461
 msgid "_Fit to Width"
 msgstr "_Axustar á largura"
 
-#: ../mail/em-format-html-display.c:1486
+#: ../mail/em-format-html-display.c:1462
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:1982
 msgid "Save attachment as"
 msgstr "Gardar anexo como"
 
-#: ../mail/em-format-html-display.c:2010
+#: ../mail/em-format-html-display.c:1986
 msgid "Select folder to save all attachments"
 msgstr "Seleccione o cartafol onde gardar todos os anexos"
 
-#: ../mail/em-format-html-display.c:2061
+#: ../mail/em-format-html-display.c:2037
 msgid "_Save Selected..."
 msgstr "_Gardar os seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2128
+#: ../mail/em-format-html-display.c:2104
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d an_exo"
 msgstr[1] "%d an_exos"
 
-#: ../mail/em-format-html-display.c:2135 ../mail/em-format-html-display.c:2224
+#: ../mail/em-format-html-display.c:2111 ../mail/em-format-html-display.c:2200
 msgid "S_ave"
 msgstr "G_ardar"
 
-#: ../mail/em-format-html-display.c:2146
+#: ../mail/em-format-html-display.c:2122
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../mail/em-format-html-display.c:2220
+#: ../mail/em-format-html-display.c:2196
 msgid "No Attachment"
 msgstr "Sen anexo"
 
-#: ../mail/em-format-html-display.c:2361 ../mail/em-format-html-display.c:2399
+#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:2363
+#: ../mail/em-format-html-display.c:2339
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:2418
+#: ../mail/em-format-html-display.c:2394
 msgid "O_pen With"
 msgstr "A_brir con"
 
-#: ../mail/em-format-html-display.c:2489
+#: ../mail/em-format-html-display.c:2465
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "O Evolution non pode renderizar este correo porque é demasiado longo para "
@@ -12285,106 +12681,106 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Páxina %d de %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Recuperando `%s'"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:924
 msgid "Unknown external-body part."
 msgstr "Parte do corpo-externo descoñecida."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:932
 msgid "Malformed external-body part."
 msgstr "Parte do corpo-externo malformada."
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:962
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:973
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro ao ficheiro local (%s) válido no sitio \"%s\""
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:975
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:996
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1007
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro aos datos externos descoñecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1235
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1409
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxe..."
 
-#: ../mail/em-format-html.c:1559 ../mail/em-format-html.c:1623
-#: ../mail/em-format-html.c:1645 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1626
+#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1560 ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1632
+#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1740 ../mail/em-format-quote.c:350
-#: ../mail/em-mailer-prefs.c:1465
+#: ../mail/em-format-html.c:1743 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Aplicación de correo"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1767
+#: ../mail/em-format-html.c:1770
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1772
+#: ../mail/em-format-html.c:1775
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1906
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Esta mensaxe foi enviada por <b>%s</b> no nome de <b>%s</b>"
 
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "De"
 
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
@@ -12393,167 +12789,184 @@ msgstr "Grupos de noticias"
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../mail/em-format.c:1197
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Non se puido analizar a mensaxe S/MIME: erro descoñecido"
 
-#: ../mail/em-format.c:1334 ../mail/em-format.c:1490
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido analizar a mensaxe MIME. Mostrando como orixe."
 
-#: ../mail/em-format.c:1342
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado non soportado para multipart/encrypted"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Non se puido analizar a mensaxe PGP/MIME"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Non se puido analizar a mensaxe PGP/MIME: Erro descoñecido"
 
-#: ../mail/em-format.c:1509
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Formato de sinatura non soportado"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Erro ao verificar a sinatura"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1579 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Erro descoñecido ao verificar a sinatura"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Non se puido analizar a mensaxe PGP"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Non se puido analizar a mensaxe PGP: Erro descoñecido"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Unha vez ao día"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Unha vez á semana"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Engadir cabeceira de correo non desexado personalizada"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Nome da cabeceira:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "O valor da cabeceira contén:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "O valor contén"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O plugin %s está dispoñible e o binario está instalado."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "O plugin %s non está dispoñible. Verifique se o paquete está instalado."
 
-#: ../mail/em-mailer-prefs.c:1122
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Non hai dispoñible un plugin de correo non desexado"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Tarefas pendentes"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Máis tarde"
 
-#: ../mail/em-migrate.c:1210
-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 ""
-"A localización e a xerarquía dos cartafoles da caixa de correo modificouse "
-"desde o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrando '%s':"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Non é posible crear un cartafol novo: `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Non é posible copiar o cartafol `%s' en `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Non é posible examinar as caixas de correo existentes en `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+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 ""
+"A localización e a xerarquía dos cartafoles da caixa de correo modificouse "
+"desde o Evolution 1.x.\n"
+"\n"
+"Agarde mentres o Evolution migra os seus cartafoles..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Non foi posible abrir os datos antigos POP keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Non é posible crear o directorio de datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Non é posible copiar os datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Fallo ao crear o almacenamento de correo local `%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"O formato de resumo dos cartafoles de correo de Evolution cambiouse a "
+"sqlitedesde o Evolution 2.24.\n"
+"\n"
+"Agarde mentres o Evolution migra os seus cartafoles..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Non é posible crear os cartafoles de correo local en `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12561,43 +12974,44 @@ msgstr ""
 "Non é posible ler a configuración da instalación anterior do Evolution, "
 "`evolution/config.xmldb' non existe ou está danado."
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:869
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "_Engadir á axenda de enderezos"
 
-#: ../mail/em-subscribe-editor.c:596
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacenamento non soporta subscricións ou non están activadas."
 
-#: ../mail/em-subscribe-editor.c:629
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
+#. Check buttons
 #: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:124
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
@@ -12700,84 +13114,91 @@ msgstr ""
 "address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-#, fuzzy
-msgid "Custom headers to use while checking for junk."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr ""
-"Determina se se deben usar cabeceiras personalizadas para comprobar correo "
-"non desexado"
+"Controla como de frecuente os cambios locais son sincronizados co servidor "
+"de correo remoto. O intervalo deber ser alomenos 30 segundos."
 
 #: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr "Cabeceiras personalizadas para comprobar o correo non desexado."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
+"Cabeceiras personalizadas para comprobar o correo non desexado. Os elementos "
+"da lista son cadeas co formato \"nomedacabeceira=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada da ventá do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Altura predeterminada da ventá da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predeterminada do diálogo de subscrición."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Estilo de resposta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para o estado expandido do fío"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Largura predeterminada da ventá do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Largura predeterminada da ventá da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Largura predeterminada do diálogo de subscrición."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
 msgstr ""
-"Determina se se debe buscar o enderezo do remitente no libro de enderezos"
+"Determina se se deben buscar os enderezos para o correo non desexado "
+"filtrando soamente no libro de enderezos local"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Determina se se debe buscar o enderezo do remitente no libro de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12789,13 +13210,13 @@ msgstr ""
 "libros marcados para autocompletado. Pode ser lento se se marcaron para "
 "autocompletado libros de enderezos remotos (coma LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se se deben usar cabeceiras personalizadas para comprobar correo "
 "non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12805,7 +13226,7 @@ msgstr ""
 "non desexado. Se esta opción está activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de comprobación de correo non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12813,62 +13234,64 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liñas \"De\" e "
 "\"Asunto\" na columna \"Mensaxes\" da vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio onde cargar/anexar os ficheiros no editor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directorio onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
+"Habilitar ou deshabilitar a elipse dos nomes dos cartafoles na árbore de "
+"cartafoles"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Debuxar os indicadores de erros de ortografía nas palabras mentres se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Baleirar os cartafoles do correo non desexado ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles do lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 "Baleirar todos os cartafoles de correo non desexado ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles do lixo ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Activar modo cursor, para que poida ver un cursor cando lea un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Activar ou desactivar a barra espaciadora máxica"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Activar ou desactivar a característica de busca ao teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Activar cartafoles de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Activar cartafoles de busca ao inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12880,7 +13303,7 @@ msgstr ""
 "facilmente un cartafol nesa barra lateral tan só tecleando o nome do "
 "cartafol e a selección salta automaticamente a ese cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12888,28 +13311,28 @@ msgstr ""
 "Activar isto para usar a barra espaciadora para desprazarse na vista previa "
 "da mensaxe, lista de mensaxes e cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Activar para renderizar a parte da mensaxe de texto de tamaño limitado."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a vista previa por cartafol e elimina a selección"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12917,7 +13340,7 @@ msgstr ""
 "Se o usuario tenta abrir 10 ou máis mensaxes ao mesmo tempo, preguntar ao "
 "usuario se está seguro de que quere facelo."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12925,7 +13348,7 @@ msgstr ""
 "Se o panel de \"Previsualización\" está activado, móstrao de lado a lado en "
 "vez de verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 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 "
@@ -12936,13 +13359,15 @@ msgstr ""
 "visualizador de compoñentes Bonobo na base de datos do Gnome pode empregarse "
 "para mostrar o contido."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
+"Altura inicial da ventá \"Enviar e recibir correo\". O valor actualízase "
+"cada vez que o usuario cambia o tamaño en vertical da ventá."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12950,18 +13375,25 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
+"Valor inicial do estado maximizado da ventá \"Enviar e recibir correo\". O "
+"valor actualízase cando o usuario maximiza ou restaura a ventá. Este valor "
+"particular non é utilizado por Evolution xa que a ventá \"Enviar e recibir "
+"correo\" non pode ser maximizada. Este característica só existe como detalle "
+"da implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
+"Largura inicial da ventá \"Enviar e recibir correo\". O valor actualízase "
+"cada vez que o usuario cambia a tamaño en horizontal da ventá."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Desactiva ou activa a pregunta cando se marcan varias mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12969,7 +13401,7 @@ msgstr ""
 "Activa/desactiva a característica onde se repite a pregunta de requírese "
 "sincronización antes de pasar ao modo traballar desconectado."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12979,31 +13411,31 @@ msgstr ""
 "dun cartafol de busca borra permanentemente a mensaxe, non só os elimina dos "
 "resultados de busca."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Última vez que se baleirou o correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Última vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel máis alá do cal a mensaxe débese rexistrar."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e as súas cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13012,15 +13444,15 @@ msgstr ""
 "contén cadeas que nomean subdirectorios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e se están activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
-msgstr ""
+msgstr "Lista de códigos de idioma de diccionarios usados para a corrección."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 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."
@@ -13029,135 +13461,133 @@ msgstr ""
 "lista contén cadeas que conteñen o nome: cor onde cor usa a codificación "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Lista de tipos mime de verificación de visualizadores de compoñentes Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa se aceptou a licenza."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imaxes para mensaxes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
 "Cargar imaxes de mensaxes HTML sobre http(s). Os valores posibles son: 0 - "
 "nunca cargar as imaxes desde a rede, 1 - cargar as imaxes se o remitente "
-"está na axenda de enderezos, 2 - cargar sempre as imaxes desde a rede"
+"está na axenda de enderezos, 2 - cargar sempre as imaxes desde a rede."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Rexistrar accións de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar accións de filtraxe no ficheiro de rexistro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtraxe."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Altura predeterminada da ventá de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Largura predeterminada da ventá de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización de mensaxe (\"normal\", \"cabeceiras completas\", "
 "\"orixe\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Número mínimo de días antes do baleirado do correo non desexado ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Número mínimo de días antes do baleirado do lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Tempo mínimo antes do baleirado do correo non desexado ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mínimo antes do baleirado do lixo ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de enderezos para mostrar en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Preguntar cando o asunto está baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar ao usuario cando tente expurgar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar ao usuario cando tente enviar unha mensaxe sen un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Preguntar para verificar se o usuario quere desconectarse inmediatamente"
 
-#: ../mail/evolution-mail.schemas.in.h:101
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
-msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
+msgstr "Preguntar cando se eliminan mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario expurga"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario só encha o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Preguntar cando o usuario tente abrir dez ou máis mensaxes ao mesmo tempo"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13165,146 +13595,145 @@ msgstr ""
 "Preguntar ao enviar mensaxes en HTML aos destinatarios que non desexen "
 "recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cando o usuario tente enviar unha mensaxe sen destinatarios Para "
 "ou CC."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cando o usuario tente enviar un HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cando se marcan varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:109
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recoñecer emoticonas no texto e substituílas con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Recoñecer ligazóns no texto e substituílas."
 
-#: ../mail/evolution-mail.schemas.in.h:111
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
-msgstr "Executar a proba de correo non desexado no correo entrante"
+msgstr "Executar a proba de correo non desexado no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Directorio onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Buscar a foto do remitente nas axendas locais de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por defecto"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por defecto."
 
-#: ../mail/evolution-mail.schemas.in.h:116
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
-msgstr ""
-"Mostrar o correo do remitente na columna de mensaxes na lista de mensaxes"
+msgstr "Mostrar o correo do remitente na columna da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Intervalo de sincronización do servidor"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Mostrar animacións"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Mostrar a foto do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:124
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
-"Mostrar o correo do remitente na columna de composición de mensaxes na lista "
-"de mensaxes"
+"Mostrar o correo do remitente nunha columna separada na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar a foto do remitente no panel de lectura da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Verificación ortográfica en liña"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Cor da verificación de ortografía"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
-msgstr "Verificación ortográfica en liña"
+msgstr "Idiomas da verificación ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Largura predeterminada do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Límite da parte de texto da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "O plugin predefinido para a asociación de correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "A última vez que se baleirou o correo non desexado, en días desde a época."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "A última vez que se baleirou o lixo, en días desde a época."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "O tipo de letra de largura variable para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
+"Isto pode ter tres posibles valores. \"0\" para erros. \"1\" para avisos. \"2"
+"\" para mensaxes de depuración."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13312,8 +13741,7 @@ msgstr ""
 "Isto decide o tamaño máximo da parte de texto que se pode formatar no "
 "Evolution. O predeterminado é 4MB / 4096 e está especificado en KB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13323,13 +13751,16 @@ msgstr ""
 "varios plugins activados. Se o plugin predeterminado listado está "
 "desactivado, entón non se usarán os outros plugins dispoñibles."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
+"Esta chave é dunha soa lectura e despois de lida establécese a \"false\". "
+"Isto deselecciona o correo na lista e elimina a vista previa para esa "
+"carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 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;"
@@ -13341,18 +13772,21 @@ msgstr ""
 "estrutura XML é &lt;header enabled&gt; - defínao como activado se se debe "
 "mostrar a cabeceira na visualización do correo."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
+"Esta opción está relacionada coa chave lookup_addressbook e úsase para "
+"determinar se se debe buscar na axenda de enderezos locais só para excluír "
+"dos filtros de correo non desexado o correo enviado por contactos coñecidos."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opción podería axudar a mellorar a velocidade de recepción."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13360,53 +13794,41 @@ msgstr ""
 "Isto define o número de enderezos que se mostra na visualización da lista de "
 "mensaxes predeterminada, para os restantes móstrase un '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:146
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 "Esta opción especifica se os fíos deberían estar por defecto no estado "
-"expandido ou contraído. É necesario reiniciar o Evolution"
+"expandido ou contraído. É necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:147
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"Esta opción especifica se os fíos deberían estar por defecto no estado "
-"expandido ou contraído. É necesario reiniciar o Evolution"
+"Esta opción especifica se os fíos deberían estar ordenados pola última "
+"mensaxe en cada fío, en lugar de pola data das mensaxes. É necesario "
+"reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Lista de mensaxes por fíos."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Lista de mensaxes por fíos"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por fíos baseadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
 #: ../mail/evolution-mail.schemas.in.h:154
-#, fuzzy
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
@@ -13417,6 +13839,7 @@ msgstr "Cadea UID para a conta predeterminada."
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
+"Color de subliñado para as palabras mal escritas cando se usa o corrector."
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
@@ -13493,10 +13916,14 @@ msgstr "O elemento do menú Ver/Responder está seleccionado."
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
+"Se se debe engadir un requirimento de confirmación de lectura por defecto a "
+"cada mensaxe."
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
 msgstr ""
+"Se se debe deshabilitar a característica de elipse no nome dos cartafoles na "
+"árbore de cartafoles."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -13508,7 +13935,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
-msgstr ""
+msgstr "Se se deben ordear os fíos dos correos pola última mensaxe en cada fío"
 
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
@@ -13518,31 +13945,31 @@ msgstr "Largura do panel de lista de mensaxes"
 msgid "Width of the message-list pane."
 msgstr "Largura do panel de lista de mensaxes."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Importador do Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Cartafol de destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Seleccionar cartafol para o que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
@@ -13550,7 +13977,7 @@ msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
@@ -13560,15 +13987,15 @@ msgstr "Importando `%s'"
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
@@ -13596,142 +14023,150 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Engadir regra de filtraxe"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Modelos"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionado, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminado"
 msgstr[1] "%d eliminado"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo non desexado"
 msgstr[1] "%d correo non desexado"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviado"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non enviado"
 msgstr[1] "%d non enviado"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "Nova mensaxe de correo"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:917
+msgctxt "New"
 msgid "_Mail Message"
-msgstr "Enviar _mensaxe"
+msgstr "_Mensaxe de correo"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "Novo cartafol de correo"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:925
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Cartafol de correo"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol de correo novo"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallou ao actualizar a configuración do correo ou os cartafoles."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Erro"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Erros"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Avisos e erros"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Erro, avisos e mensaxes de depuración"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Rexistros de depuración"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Mostrar _erros na barra de estado"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1745
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Mensaxes de rexistro:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "Nivel de rexistro"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2386
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Pechar esta ventá"
@@ -13758,7 +14193,7 @@ msgstr "<b>Si_naturas</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr ""
+msgstr "<b>Opción publicar por enriba</b> (Non se recomenda)"
 
 #: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
@@ -13890,19 +14325,16 @@ msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sempre _confiar nas chaves do meu anel de chaves ao cifrar"
 
 #: ../mail/mail-config.glade.h:43
-#, fuzzy
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrarme sempre a _min mesmo ao enviar correo cifrado"
 
 #: ../mail/mail-config.glade.h:44
-#, fuzzy
 msgid "Always request rea_d receipt"
-msgstr "_Requirir confirmación de lectura"
+msgstr "_Requirir sempre confirmación de lectura"
 
 #: ../mail/mail-config.glade.h:46
-#, fuzzy
 msgid "Automatically insert _emoticon images"
-msgstr "_Inserir emoticonas automaticamente"
+msgstr "Inserir as imaxes das _emoticonas automaticamente"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -13921,12 +14353,11 @@ msgid "Ch_eck for Supported Types "
 msgstr "_Verificar tipos soportados "
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Check cu_stom headers for junk"
-msgstr "Verificar se o correo entrante é _correo non desexado"
+msgstr ""
+"Verificar as cabeceiras personalizadas en busca de _correo non desexado"
 
 #: ../mail/mail-config.glade.h:52
-#, fuzzy
 msgid "Check incoming _messages for junk"
 msgstr "Verificar se o correo entrante é _correo non desexado"
 
@@ -13979,29 +14410,26 @@ msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada: "
 
 #: ../mail/mail-config.glade.h:68
-#, fuzzy
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar os correos non desexados ao saí_r"
 
 #: ../mail/mail-config.glade.h:70
-#, fuzzy
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar _dixitalmente as mensaxes saíntes (por defecto)"
 
 #: ../mail/mail-config.glade.h:71
-#, fuzzy
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr ""
-"Non formatar os contidos do texto dos correos se o ta_maño do texto excede"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Non formatar os correos se o ta_maño do texto excede"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
 msgstr ""
+"Non mar_car os correos como non desexados se o remitente está na miña axenda "
+"de enderezos"
 
 #: ../mail/mail-config.glade.h:73
-#, fuzzy
 msgid "Do not quote"
-msgstr "Non eliminar"
+msgstr "Non citar"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -14025,7 +14453,7 @@ msgstr "Baleirar os cartafoles de lixo ao _saír"
 
 #: ../mail/mail-config.glade.h:79
 msgid "Enable Magic S_pacebar "
-msgstr ""
+msgstr "Habilitar a barra espaciadora _máxica"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
@@ -14064,9 +14492,8 @@ msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
 #: ../mail/mail-config.glade.h:91
-#, fuzzy
 msgid "H_TTP Proxy:"
-msgstr "_Apdo. de correos:"
+msgstr "H_TTP Proxy:"
 
 #: ../mail/mail-config.glade.h:92
 msgid "Headers"
@@ -14114,12 +14541,14 @@ msgstr "Editor de mensaxes"
 
 #: ../mail/mail-config.glade.h:106
 msgid "No _Proxy for:"
-msgstr ""
+msgstr "Sen _proxy para:"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
+"Nota: O guión baixo o nome da nota úsase como un identificador mnemónico no "
+"menú."
 
 #: ../mail/mail-config.glade.h:108
 msgid ""
@@ -14129,18 +14558,24 @@ msgstr ""
 "Nota: non se lle pedirá un contrasinal até que se conecte por primeira vez"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Esta opción será ignorada se se atopa unha coincidencia cunha cabeceira "
+"personalizada de correo non desexado."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganización:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _Chave PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Contrasinal:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14148,7 +14583,7 @@ msgstr ""
 "Introduza un nome descritivo para esta conta no espazo de abaixo.\n"
 "Este nome usarase só para a visualización."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14157,7 +14592,7 @@ msgstr ""
 "seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 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 "
@@ -14167,111 +14602,115 @@ msgstr ""
 "abaixo non necesitan encherse, a non ser que desexe incluír esta información "
 "no correo que envíe."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Escolla entre as seguintes opcións"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes só con destinatarios _Cco definidos"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citada"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Lembrar contrasinal"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Lembrar _contrasinal"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
-msgstr ""
+msgstr "Equipo S_OCKS:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "B_uscar fotografías do remitente só nas axendas de enderezos locais"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_eleccione..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "En_viar confirmacións de mensaxes:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Tipo de letra e_stándar:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Seleccione tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione tipo de letra de largura fixa en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Seleccione tipo de letra de largura variable en HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione tipo de letra de largura variable en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticación"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _sinatura:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Táboa de sinaturas"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Verificación da ortografía"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Comezar a _escribir pola parte de abaixo ao responder"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14279,7 +14718,7 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14289,12 +14728,7 @@ msgstr ""
 "sinatura. O nome que especifique usarase\n"
 "só para a visualización. "
 
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14302,24 +14736,25 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:678
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "Largura v_ariable:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14329,128 +14764,125 @@ msgstr ""
 "\n"
 "Prema en \"Adiante\" para comezar. "
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Automatic proxy configuration URL:"
-msgstr "URL de configuración de proxy _automático:"
+msgstr "_URL para a configuración automática do proxy:"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Plugin por _defecto de correo non desexado:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
-msgstr ""
+msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Non a_sinar as peticións de reunión (para compatibilidade con Outlook)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
-msgstr ""
+msgstr "_Manter a firma por debaixo da mensaxe orixinal ao respostar"
 
-#: ../mail/mail-config.glade.h:169
-#, fuzzy
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
-msgstr "_Cargar imaxes dos contactos no correo"
+msgstr "_Cargar imaxes no correo dos contactos"
 
-#: ../mail/mail-config.glade.h:170
-#, fuzzy
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local addressbook only"
-msgstr "Listar os cartafoles de axendas de enderezos locais"
+msgstr "_Buscar soamente na axenda de enderezos local"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Facer esta a miña conta predeterminada"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "Configuración do proxy _manual:"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensaxes como lidas despois de"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Camiño:"
 
-#: ../mail/mail-config.glade.h:177
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "_Preguntar cando se envíen mensaxes HTML a contactos que non as queren"
-
 #: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Preguntar cando se envíen correos HTML a contactos que non as queren"
+
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
-msgstr ""
+msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "S_eleccionar..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Mostrar animacións de imaxes"
 
-#: ../mail/mail-config.glade.h:186
-#, fuzzy
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 "Mo_strar a fotografía do remitente na previsualización do correo electrónico"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir as cabeceiras Para / Cc / Cco "
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "Usar _predeterminado do sistema"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutras aplicacións"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "enderezos"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "descrición"
 
@@ -14490,43 +14922,43 @@ msgstr "_Diferenciar maiúsculas e minúsculas"
 msgid "Co_mpleted"
 msgstr "Co_mpletado"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Buscar:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Buscar na mensaxe"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Marcar para facer seguimento"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Subscricións de cartafoles"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Acordo de licenza"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ningún seleccionado"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Información de seguranza"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Cartafoles específicos"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14534,19 +14966,19 @@ msgstr ""
 "As mensaxes que seleccionou para o seguimento lístanse abaixo.\n"
 "Seleccione unha acción de seguimento desde o menú \"Marcar\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Aceptar a licenza"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Vence o:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque isto para aceptar o acordo de licenza"
 
@@ -14597,11 +15029,11 @@ msgstr "Enviando a mensaxe %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Terminado."
 
@@ -14629,9 +15061,9 @@ msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
 #: ../mail/mail-ops.c:1270
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving quota information for folder %s"
-msgstr "Información de contacto de %s"
+msgstr "Obtendo a información de cota para o cartafol %s"
 
 #: ../mail/mail-ops.c:1339
 #, c-format
@@ -14690,7 +15122,7 @@ msgstr[1] "Recuperando %d mensaxes"
 #: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
@@ -14740,27 +15172,27 @@ msgstr "Preparando a conta '%s' para o modo sen conexión"
 msgid "Checking Service"
 msgstr "Verificando servizo"
 
-#: ../mail/mail-send-recv.c:194
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:397
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
-#: ../mail/mail-send-recv.c:408
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:517
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "En espera..."
 
-#: ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
@@ -14792,11 +15224,6 @@ msgstr "O usuario cancelou a operación."
 msgid "_Save and Close"
 msgstr "_Gardar e Pechar"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Ficheiro"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Editar sinatura"
@@ -14845,11 +15272,11 @@ msgstr "Actualizando cartafoles de busca para '%s: %s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando cartafoles de busca para '%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Editar cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Novo cartafol de busca"
 
@@ -14924,13 +15351,12 @@ msgstr ""
 "eliminadas en todos os cartafoles?"
 
 #: ../mail/mail.error.xml.h:14
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
-"Está seguro de que quere eliminar permanentemente todas as mensaxes "
-"eliminadas en todos os cartafoles?"
+"Está seguro de que quere borrar permanentemente todas as mensaxes eliminadas "
+"do cartafol \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15038,9 +15464,8 @@ msgid "Cannot set signature script \"{0}\"."
 msgstr "Non se pode definir o script de sinatura \"{0}\"."
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Check Junk Failed"
-msgstr "Verificar se hai _correo non desexado"
+msgstr "Fallou ao verificar se hai _correo non desexado"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15056,23 +15481,20 @@ msgid "Could not save signature file."
 msgstr "Non se puido gardar o ficheiro de sinatura."
 
 #: ../mail/mail.error.xml.h:44
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Eliminada: "
+msgstr "Eliminar \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Eliminar a conta?"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
+msgstr "Eliminar as mensaxes no cartafol de busca \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
-#, fuzzy
 msgid "Delete messages in Search Folder?"
-msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
+msgstr "Eliminar as mensaxes no cartafol de busca?"
 
 #: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
@@ -15223,7 +15645,6 @@ msgstr ""
 "enderezos de correo premendo no botón \"Para:\" ao lado da caixa de entrada."
 
 #: ../mail/mail.error.xml.h:81
-#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15231,8 +15652,7 @@ msgid ""
 msgstr ""
 "Asegúrese de que os seguintes destinatarios queren e poden recibir mensaxes "
 "HTML:\n"
-"{0}\n"
-"Enviar de todas as maneiras?"
+"{0}"
 
 #: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
@@ -15267,13 +15687,12 @@ msgstr ""
 "subcartafoles?"
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid "Report Junk Failed"
-msgstr "Importar ficheiro"
+msgstr "Fallou ao informar do correo non desexado"
 
 #: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr ""
+msgstr "Fallou ao informar do correo que non é SPAM"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -15426,6 +15845,9 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
+"Aviso: Eliminar mensaxes dunha carpeta de busca borrará a mensaxeactual "
+"dunha das súas carpetas locais ou remotas.\n"
+"Está seguro que quere facer isto?"
 
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
@@ -15481,86 +15903,89 @@ msgstr "_Expurgar"
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "Reenviada"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:3818
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3888 ../mail/message-list.c:4324
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4081
+#: ../mail/message-list.c:4179
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
+"Non hai mensaxes que coincidan cos seus criterios de busca. Probe a limpar a "
+"busca co elemento Limpar do menú Buscar ou cámbiea."
 
-#: ../mail/message-list.c:4083
-#, fuzzy
+#: ../mail/message-list.c:4181
 msgid "There are no messages in this folder."
-msgstr ""
-"\n"
-"\n"
-"Non hai elementos para mostrar nesta visualización."
+msgstr "Non hai mensaxes para amosar neste cartafol."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -15591,39 +16016,39 @@ msgstr "Mensaxes enviadas"
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Non reenviar"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Para a súa información"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Non é necesaria unha resposta"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Revisar"
 
@@ -15664,42 +16089,48 @@ msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr ""
+"Lista de pistas para que o plugin de recordatorio de anexos busque no corpo "
+"dunha mensaxe"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr ""
+"Lista de pistas para que o plugin de recordatorio de anexos busque no corpo "
+"dunha mensaxe."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:468
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
-msgstr ""
+msgstr "Palabras clave"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-#, fuzzy
 msgid "Attachment Reminder"
-msgstr "Barra de anexos"
+msgstr "Recordatorio de anexos"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid ""
 "Looks for clues in a message for mention of attachments and warns if the "
 "attachment is missing"
 msgstr ""
+"Busca pistas nunha mensaxe que mencionen a existencia de anexos e avisa se "
+"falta o anexo"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
+"Evolution atopou algunhas palabras chave que indican que esta mensaxe "
+"debería conter un anexo, mais non se atopa ningún."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-#, fuzzy
 msgid "Message has no attachments"
-msgstr "Mensaxes con anexos"
+msgstr "A mensaxe non ten anexos"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-#, fuzzy
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Editar a mensaxe"
 
@@ -15716,18 +16147,18 @@ msgid "Audio inline plugin"
 msgstr "Plugin de son en liña"
 
 #: ../plugins/backup-restore/backup-restore.c:107
-#, fuzzy
 msgid "Select name of the Evolution backup file"
-msgstr "Seleccione o nome do arquivo do Evolution"
+msgstr "Seleccione o nome do arquivo de copia de seguranza do Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
 #: ../plugins/backup-restore/backup-restore.c:159
-#, fuzzy
 msgid "Select name of the Evolution backup file to restore"
-msgstr "Seleccione o nome do arquivador do Evolution para restaurar"
+msgstr ""
+"Seleccione o nome do arquivo de copia de seguranza do Evolution para "
+"restaurar"
 
 #: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
@@ -15738,18 +16169,17 @@ msgid "Restore from backup"
 msgstr "Restaurar desde unha copia de seguranza"
 
 #: ../plugins/backup-restore/backup-restore.c:258
-#, fuzzy
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
-"Pode restaurar o Evolution desde o seu arquivo. Pode restaurar todos os "
-"correos, calendarios, tarefas, notas e axendas de enderezos. \n"
+"Pode restaurar o Evolution desde o seu arquivo de copia de seguranza. Pode "
+"restaurar todos os correos, calendarios, tarefas, notas e axendas de "
+"enderezos. \n"
 "Tamén restaura todas as configuracións persoais, filtros de correo etc."
 
 #: ../plugins/backup-restore/backup-restore.c:264
-#, fuzzy
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar o Evolution desde o arquivo de copia de seguranza"
 
@@ -15761,88 +16191,111 @@ msgstr "Seleccione o arquivo do Evolution para restaurar:"
 msgid "Choose a file to restore"
 msgstr "Escolla un ficheiro para restaurar"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Facer unha copia de seguranza do directorio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Restaurar o directorio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
-msgstr "Copia de seguranza do Evolution"
+msgstr "Comprobar a copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
-msgstr ""
+msgstr "Con interface de usuario gráfica"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 "Facendo unha copia de seguranza das contas e configuracións do Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
 "calendario, tarefas, notas)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Terminou a copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Facendo unha copia dos datos actuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
-msgstr "Extraendo ficheiros do arquivo"
+msgstr "Extraendo ficheiros da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Cargando a configuración do Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Eliminando os ficheiros temporais da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:249
-#, fuzzy, c-format
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "Asegurando fontes locais"
+
+#: ../plugins/backup-restore/backup.c:435
+#, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza en %s"
 
-#: ../plugins/backup-restore/backup.c:254
-#, fuzzy, c-format
+#: ../plugins/backup-restore/backup.c:440
+#, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando desde %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Restauración do Evolution"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "Facendo unha copia de seguranza dos datos do Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Espere mentras Evolution respalda o seus datos."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Restaurando os datos do Evolution"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Espere mentras Evolution restaura os seus datos."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+"Isto pode levar un tempo dependendo da cantidade de datos na súa conta."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15859,11 +16312,11 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Está seguro de que quere pechar o Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
 msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
-"Está seguro de que quere restaurar o Evolution desde o arquivo seleccionado?"
+"Está seguro de que quere restaurar o Evolution desde a copia de seguranza "
+"seleccionada?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -15878,24 +16331,20 @@ msgstr ""
 "automaticamente despois da copia de seguranza, active o botón de estado."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
 msgid "Insufficient Permissions"
-msgstr "Permisos delegados"
+msgstr "Non ten permisos suficientes"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-#, fuzzy
 msgid "Invalid Evolution backup file"
-msgstr "O arquivo do Evolution non é válido"
+msgstr "O ficheiro de copia de seguranza do Evolution non é válido"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-#, fuzzy
 msgid "Please select a valid backup file to restore."
-msgstr "Seleccione un ficheiro de arquivo válido para restaurar."
+msgstr "Seleccione un ficheiro válido de copia de seguranza para restaurar."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#, fuzzy
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
+msgid "The selected folder is not writable."
+msgstr "Non se pode escribir no cartafol seleccionado."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -15932,11 +16381,10 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-#, fuzzy
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
-"Crear entradas _automaticamente na axenda de enderezos ao responder o correo"
+"Crear entradas _automaticamente na axenda de enderezos ao responder a "
+"mensaxes"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15948,18 +16396,14 @@ msgstr "Mensaxe instantánea de contactos"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-#, fuzzy
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar periodicamente a información e as imaxes de contacto desde a "
-"lista de amigos do Gaim"
+"Sincronizar información e as imaxes de contacto desde a lista de amigos do "
+"Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
-#, fuzzy
 msgid "Select Address book for Pidgin buddy list"
-msgstr "Seleccione a axenda de enderezos para a lista de amigos do Gaim"
+msgstr "Seleccione a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:618
@@ -15982,34 +16426,32 @@ msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while spawning %s: %s."
-msgstr "Ocorreu un erro ao imprimir"
+msgstr "Ocorreu un erro ao crear %s: %s."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr ""
+msgstr "O proceso fillo Bofotilter non responde, matándoo..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
+msgstr "A espera polo proceso fillo Bogofilter interrompeuse, rematando..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr ""
+msgstr "Fallou a tubería cara Bogofilter, código de erro: %d"
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
-#, fuzzy
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto do correo a _Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-#, fuzzy
 msgid "Convert mail messages to Unicode"
-msgstr "Converter o texto do correo a Unicode"
+msgstr "Converter as mensaxes do correo a Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
 msgid ""
@@ -16020,30 +16462,28 @@ msgstr ""
 "ham que veñen de diferentes conxuntos de caracteres."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#, fuzzy
 msgid "Bogofilter Options"
-msgstr "Rexistrar accións de filtraxe"
+msgstr "Opcións de Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "Bogofilter junk plugin"
-msgstr "Rexistrar accións de filtraxe"
+msgstr "Plugin de correo non desexado de Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
-msgstr ""
+msgstr "Filtrar o correo non desexado usando Bogofilter."
 
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:671
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
@@ -16063,19 +16503,17 @@ msgstr "Calendarios locais"
 msgid "Provides core functionality for local calendars."
 msgstr "Proporciona funcionalidade básica para calendarios locais."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:695
 msgid "Re_fresh:"
-msgstr "Ac_tualizar"
+msgstr "Ac_tualizar:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Conexión _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:406
-#, fuzzy
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Nome de usuario:"
 
@@ -16179,29 +16617,25 @@ msgstr ""
 "predeterminado?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:691
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#, fuzzy
 msgid "Mark as _default address book"
-msgstr "Marcar como cartafol _predeterminado"
+msgstr "Marcar como axenda de enderezos _predeterminado"
 
 #: ../plugins/default-source/default-source.c:102
-#, fuzzy
 msgid "Mark as _default calendar"
-msgstr "Marcar como cartafol _predeterminado"
+msgstr "Marcar como calendario _predeterminado"
 
 #: ../plugins/default-source/default-source.c:103
-#, fuzzy
 msgid "Mark as _default task list"
-msgstr "Marcar como cartafol _predeterminado"
+msgstr "Marcar como lista de tarefas _predeterminada"
 
 #: ../plugins/default-source/default-source.c:104
-#, fuzzy
 msgid "Mark as _default memo list"
-msgstr "Marcar como cartafol _predeterminado"
+msgstr "Marcar como lista de notas _predeterminada"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -16215,33 +16649,44 @@ msgstr ""
 "Proporciona funcionalidade para marcar calendarios ou axendas de enderezos "
 "como opción predeterminada."
 
-#: ../plugins/email-custom-header/email-custom-header.c:541
-#, fuzzy
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
-msgstr "Cabeceiras personalizadas"
+msgstr "_Cabeceira personalizada"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-#, fuzzy
-msgid "Custom Header Options"
-msgstr "Cabeceiras personalizadas"
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Chave"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Valores"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:2
-#, fuzzy
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"O formato para especificar o valor dunha chave de cabeceira personalizada "
+"é:\n"
+"Valores chave do nome da cabeceira personalizada separados por \";\"."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
-msgstr "Cabeceiras personalizadas"
+msgstr "Cabeceira personalizada de correo"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Adds custom header to outgoing messages."
-msgstr ""
+msgstr "Engade unha cabeceira personalizada ás mensaxes saíntes."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-#, fuzzy
 msgid "Custom Header"
-msgstr "Cabeceiras personalizadas"
+msgstr "Cabeceira personalizada"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "Lista de cabeceiras personalizadas"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16250,6 +16695,10 @@ msgid ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
+"A chave especifica a lista de cabeceiras personalizadas que pode engadir a "
+"unha mensaxe saínte. O formato para especificar unha cabeceira e un valor de "
+"cabeceira é: Nome da cabeceira personalizada seguida de \"=\" e valores "
+"separados por \";\""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16268,12 +16717,12 @@ msgid "_User:"
 msgstr "_Usuario:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:62
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Contrasinal seguro"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:65
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16281,11 +16730,11 @@ msgstr ""
 "Esta opción conectará co servidor Exchange usando unha autenticación de "
 "contrasinal segura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:73
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Contrasinal de texto plano"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:75
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16293,11 +16742,11 @@ msgstr ""
 "Esta opción conectará co servidor Exchange usando unha autenticación "
 "estándar de texto plano."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:256
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Fóra da oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16305,77 +16754,81 @@ msgstr ""
 "A mensaxe especificada abaixo enviarase automaticamente a cada\n"
 "persoa que lle envíe correo mentres está fóra da oficina."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Estou fóra da oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Estou na oficina"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Modificar o contrasinal para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Cambiar contrasinal"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Xestione a configuración dos delegados para a conta Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Asistente de delegacións"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:348
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Varios"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Ver o tamaño de todos os cartafoles Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:360
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Tamaño dos cartafoles"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configuración do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:624
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:650
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:853
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Caixa de correo:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:867
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar tipos soportados"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:979
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16394,7 +16847,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -16402,7 +16855,7 @@ msgstr ""
 "O contrasinal actual non coincide co contrasinal existente para a súa conta. "
 "Introduza o contrasinal correcto"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Os dous contrasinais non coinciden. Reintroduza os contrasinais."
 
@@ -16427,33 +16880,33 @@ msgstr "O seu contrasinal actual caducou. Cambie o seu contrasinal agora."
 msgid "Your password will expire in the next %d days"
 msgstr "O contrasinal caducará nos seguintes %d días"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (ler, crear, editar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (ler, crear)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisor (só de lectura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
-msgstr "Permisos delegados"
+msgstr "Delegar permisos"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permisos para %s"
@@ -16461,75 +16914,76 @@ msgstr "Permisos para %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
 msgstr ""
+"Esta mensaxe foi enviada automaticamente por Evolution para informalo de que "
+"foi designado como delegado. Agora pode enviar mensaxes no meu nome."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
-msgstr ""
+msgstr "Fóronlle concedidos os seguintes permisos nos meus cartafoles:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
-msgstr "O _delegado pode ver elementos privados"
+msgstr "Vostede tamén pode ver os meus elementos privados."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
-msgstr ""
+msgstr "Sen embargo non lle está permitido ver os meus elementos privados."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
-msgstr ""
+msgstr "Foi designado como delegado para %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Delegar en"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Eliminar o delegado %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Non se puido acceder ao Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Non puido localizarse a si mesmo no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Non se puido localizar o delegado %s no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Non se puido eliminar o delegado %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Non se puido actualizar a lista de delegados."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Non se puido engadir o delegado %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Erro ao ler a lista de delegados."
 
@@ -16569,25 +17023,24 @@ msgid "_Inbox:"
 msgstr "_Caixa de entrada:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-#, fuzzy
 msgid "_Summarize permissions"
-msgstr "Permisos delegados"
+msgstr "_Resumir permisos"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:60
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permisos..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Nome do cartafol"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Tamaño do cartafol"
 
@@ -16596,7 +17049,7 @@ msgstr "Tamaño do cartafol"
 msgid "User"
 msgstr "Usuario"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Subscribirse ao cartafol doutro usuario"
@@ -16605,20 +17058,20 @@ msgstr "Subscribirse ao cartafol doutro usuario"
 msgid "Exchange Folder Tree"
 msgstr "Árbore de cartafol do Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "Eliminar subscrición do cartafol..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Está seguro de que quere eliminar subscrición do cartafol \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Eliminar subscrición de \"%s\""
@@ -16683,18 +17136,18 @@ msgstr "O seu contrasinal caducará en 7 días..."
 msgid "_Change Password"
 msgstr "_Cambiar contrasinal"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Permiso denegado.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Engadir usuario:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/exchange-operations/exchange-send-options.c:417
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Engadir usuario"
 
@@ -16814,13 +17267,13 @@ msgstr "_Usuario"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:17
 msgid "button-user"
-msgstr ""
+msgstr "button-user"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Axenda de enderezos..."
 
@@ -16834,7 +17287,7 @@ msgstr "Subscribirse ao calendario doutro usuario"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
 "Un plugin que manipula unha colección de operacións e características "
@@ -16928,10 +17381,16 @@ msgid "Could not update out-of-office state"
 msgstr "Non se puido actualizar o estado \"Fóra da oficina\""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Evolution require reiniciarse para cargar a caixa de correo do usuario "
+"subscrito"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "A conta do Exchange está sen conexión."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16958,32 +17417,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Fallo ao actualizar delegados:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "O cartafol xa existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "O cartafol non existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Cartafol sen conexión"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Non é posible atinxir o servidor de catálogo global"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16991,76 +17450,77 @@ msgstr ""
 "Se OWA se está executando nun camiño diferente, debe especificalo no diálogo "
 "de configuración de conta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "A caixa de correo de {0} non está neste servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Asegúrese de que o URL é correcto e ténteo de novo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Asegúrese de que o nome do servidor está escrito correctamente e ténteo de "
 "novo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Asegúrese de que o nome do usuario e o contrasinal son correctos e ténteo de "
 "novo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 "Non hai ningún servidor de catálogo global configurado para esta conta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Non hai ningunha caixa de correo para o usuario {0} en {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Non existe ese usuario {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Contrasinal modificado correctamente."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
+"Introduza un ID de delegado ou desmarque a opción de Enviar como delegado."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Asegúrese de que o nome do servidor de catálogo global é correcto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Reinicie o Evolution para que sexan efectivas as modificacións"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Seleccione un usuario."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "O servidor rexeitou o contrasinal porque é demasiado débil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "A conta do Exchange desactivarase ao saír do Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "A conta do Exchange eliminarase ao saír do Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "O servidor Exchange non é compatible co Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17068,7 +17528,7 @@ msgstr ""
 "O servidor está executando o Exchange 5.5. Exchange Connector \n"
 "só soporta o Microsoft Exchange 2000 e 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17082,58 +17542,59 @@ msgstr ""
 "\n"
 "Ou pode que só escribira incorrectamente o contrasinal."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Ténteo de novo cun contrasinal diferente."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Non é posible engadir o usuario á lista de control de acceso:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Non é posible editar os delegados."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Erro descoñecido ao buscar {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:597
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Tipo descoñecido"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Operación non soportada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Está próximo á súa cota dispoñible para almacenar correo neste servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
-msgstr ""
+msgstr "Permíteselle enviar unha mensaxe no nome dun só delegado de cada vez."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Non pode converterse no seu propio delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Excedeu a súa cota para almacenar correo neste servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Só pode configurar unha conta do Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17141,14 +17602,14 @@ msgstr ""
 "O seu uso actual é: {0}KB. Tente liberar algo de espazo eliminando algún "
 "correo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "O seu uso actual é: {0}KB. Non poderá nin enviar nin recibir correos agora."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17156,19 +17617,19 @@ msgstr ""
 "O seu uso actual é: {0}KB. Non poderá enviar correos até que libere algo de "
 "espazo eliminando algún correo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "O seu contrasinal caducou."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} non pode engadirse á lista de control de acceso"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} xa é un delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} xa está na lista"
 
@@ -17186,13 +17647,15 @@ msgstr "Editor externo predeterminado"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
-msgstr ""
+msgstr "O comando predeterminado a usar como editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
 "plain-text messages."
 msgstr ""
+"Un plugin para usar un editor externo para as mensaxes. Só pode enviar "
+"mensaxes de texto plano."
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
@@ -17205,23 +17668,27 @@ msgstr "Non se pode crear o ficheiro temporal"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+msgstr "Non se pode lanzar o editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr ""
+"Evolution non pode crear un ficheiro temporal para gardar o seu correo. "
+"Ténteo máis tarde."
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
+"Non se pode lanzar o editor externo axustado nas preferencias do "
+"complemento  Ténteo establecendo un editor distinto."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Compoñer nun editor externo"
+msgid "Compose in _External Editor"
+msgstr "Compoñer nun editor _externo"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
@@ -17241,7 +17708,7 @@ msgstr ""
 
 #: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
-msgstr ""
+msgstr "Elixa unha imaxe (48*48) png de tamaño < 700bytes"
 
 #: ../plugins/face/face.c:68
 msgid "PNG files"
@@ -17257,6 +17724,10 @@ msgid ""
 "configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
 "faces This will be used in messages that are sent further."
 msgstr ""
+"Engade unha cara aos mensaxes saíntes. Primeiro, o usuario necesita "
+"configurar unha imaxe png de 48*48. A imaxe codificarase en base64 e "
+"gardarase en ~/.evolution/faces. A imaxe usarase nas mensaxes que se envíen "
+"a partir dese momento."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
@@ -17281,21 +17752,64 @@ msgstr "Eliminar subscrición de cartafoles"
 msgid "_Unsubscribe"
 msgstr "E_liminar subscrición"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:90
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
-msgstr "conmutar"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:493
+msgid "Please enter user name first."
+msgstr "Introduza primeiro o nome de usuario."
+
+#: ../plugins/google-account-setup/google-source.c:497
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Introduza o contrasinal para que o usuario %s poida acceder á lista de "
+"calendarios subscritos."
+
+#: ../plugins/google-account-setup/google-source.c:597
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Non se poden ler os datos do servidor de Google.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:747
+msgid "Cal_endar:"
+msgstr "Cal_endario:"
+
+#: ../plugins/google-account-setup/google-source.c:782
+msgid "Retrieve _list"
+msgstr "Recuperando _lista"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Servidor</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+msgid "Update every"
+msgstr "Actualizar cada"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin to setup google calendar."
-msgstr "Plugin para configurar as orixes do calendario hula."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Un plugin para configurar o calendario e contactos de Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-#, fuzzy
 msgid "Google sources"
-msgstr "Recursos"
+msgstr "Fontes de Google"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
@@ -17379,10 +17893,22 @@ msgid "_Junk List"
 msgstr "Lista de _correo non desexado"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Anulación da mensaxe"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"Anular unha mensaxe pode eliminala da caixa de correo dos destinatarios. "
+"Está seguro que de quere facer isto?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Mensaxe anulada con éxito"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Anular correo"
 
@@ -17390,12 +17916,6 @@ msgstr "Anular correo"
 msgid "Add Send Options to groupwise messages"
 msgstr "Engadir opcións de envío ás mensaxes de Groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Opcións de envío"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Un plugin para as características nas contas Groupwise."
@@ -17405,14 +17925,12 @@ msgid "Groupwise Features"
 msgstr "Características do Groupwise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "Mensaxe anulada con éxito"
+msgstr "Fallou a anulación da mensaxe"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
-#, fuzzy
 msgid "The server did not allow the selected message to be retracted."
-msgstr "Converte a mensaxe seleccionada nunha tarefa nova"
+msgstr "O servidor non permite que se anule a mensaxe seleccionada."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
@@ -17421,9 +17939,8 @@ msgid "Invalid user"
 msgstr "Usuario non válido"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
-#, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Non se pode gardar no ficheiro &quot;{0}&quot;."
+msgstr "Non se pode dar acceso ao Proxy ao usuario &quot;{0}&quot;"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
@@ -17431,18 +17948,17 @@ msgid "Specify User"
 msgstr "Especificar usuario"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#, fuzzy
 msgid "You have already given proxy permissions to this user."
-msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
+msgstr "Xa lle dera permisos a este usuario para acceder ao proxy."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
+"Ten que especificar un nome de usuario válido para darlle acceso ao proxy."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-#, fuzzy
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "Xa existe un cartafol chamado &quot;{0}&quot;. Use un nome diferente."
+msgstr "Xa existe a conta &quot;{0}&quot;. Comprobe a súa árbore de cartafois."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
 msgid "Account Already Exists"
@@ -17450,27 +17966,31 @@ msgstr "A conta xa existe"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
+"Non se puido iniciar sesión no proxy como &quot;{0}&quot;. Comprobe o "
+"enderezo de correo e ténteo de novo."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-#, fuzzy
 msgid "This is a recurring meeting"
-msgstr "Converter en evento recorrente"
+msgstr "Este é un evento recorrente"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-#, fuzzy
-msgid "What would you like to {0}?"
-msgstr "Quere gardar os cambios?"
+msgid "Would you like to accept it?"
+msgstr "Quere aceptalo?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "Non pode compartir o cartafol co usuario especificado \"{0}\""
+msgid "Would you like to decline it?"
+msgstr "Quere descartalo?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Non pode compartir o cartafol co usuario especificado &quot;{0}&quot;"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
-msgstr ""
+msgstr "Ten que especificar o nome do usuario que quere engadir á lista"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
@@ -17570,9 +18090,9 @@ msgstr "<b>Nome da conta</b>"
 msgid "Proxy Login"
 msgstr "Iniciar sesión no proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17581,21 +18101,21 @@ msgstr "%s Introduza o seu contrasinal para %s (usuario %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "Iniciar sesión no _proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "O separador do proxy estará dispoñible só cando a conta estea en liña."
 
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "O separador do proxy estará dispoñible só cando a conta estea activada."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Usuarios"
 
@@ -17611,15 +18131,15 @@ msgstr "Novo cartafol _compartido..."
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
 msgid "Custom Notification"
 msgstr "Notificación personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Modificar"
 
@@ -17684,11 +18204,11 @@ msgstr "Plugin para configurar as orixes do calendario hula."
 msgid "Hula Account Setup"
 msgstr "Configuración da conta hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
 
@@ -17763,7 +18283,7 @@ msgid "Select Calendar"
 msgstr "Seleccionar calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:703
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "_Importar"
 
@@ -17778,38 +18298,39 @@ msgstr "Importa anexos ICS ao calendario."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:34
 msgid "Hardware Abstraction Layer not loaded"
-msgstr ""
+msgstr "Non se cargou a capa de abstracción de hardware"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:35
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 msgstr ""
+"Requírese o servizo \"hald\" e actualmente non está funcionando. Habilite o "
+"servizo e volva a executar este programa ou contacte co seu administrador do "
+"sistema."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
 msgid "Search for an iPod failed"
-msgstr ""
+msgstr "Fallou a busca dun iPod"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-#, fuzzy
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">A busca dun iPod fallou</span>\n"
-"\n"
 "O Evolution non puido encontrar un iPod co que sincronizarse. Ou o iPod non "
 "está conectado ao sistema ou non está encendido."
 
-#: ../plugins/ipod-sync/ical-format.c:123
-#: ../plugins/save-calendar/ical-format.c:167
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-#, fuzzy
 msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "Sincronizar a tarefa/calendario/axenda de enderezos con Apple iPod"
+msgstr ""
+"Sincronizar a tarefa/nota/calendario/axenda de enderezos seleccionada co "
+"Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -17913,9 +18434,8 @@ msgid "Attendee status updated"
 msgstr "Estado de participación actualizado"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1276
-#, fuzzy
 msgid "Meeting information sent"
-msgstr "Información da reunión"
+msgstr "Enviouse información da reunión"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
@@ -17927,16 +18447,15 @@ msgstr "Enviada información de nota"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
-msgstr ""
+msgstr "Non se pode enviar a información da reunión, a reunión non existe"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1294
-#, fuzzy
 msgid "Unable to send task information, the task does not exist"
-msgstr "Non é posible localizar esta tarefa en ningunha lista de tarefas"
+msgstr "Non é posible enviar a información da tarefa, a tarefa non existe"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
-msgstr ""
+msgstr "Non se pode enviar a información da nota, a nota non existe"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1366
 #: ../plugins/itip-formatter/itip-formatter.c:1377
@@ -17952,15 +18471,15 @@ msgstr ""
 "A mensaxe di que contén un calendario mais o calendario non é un iCalendar "
 "válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1431
-#: ../plugins/itip-formatter/itip-formatter.c:1513
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1432
-#: ../plugins/itip-formatter/itip-formatter.c:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17968,11 +18487,11 @@ msgstr ""
 "A mensaxe contén un calendario mais o calendario non contén eventos, tarefas "
 "nin información de dispoñibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contén múltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17980,327 +18499,328 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2143
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
-msgstr "Esta cita _repítese"
+msgstr "Esta cita repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2146
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
-msgstr "Esta cita _repítese"
+msgstr "Esta tarefa repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
-msgstr "Esta cita _repítese"
+msgstr "Esta nota repítese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2388
-#: ../plugins/itip-formatter/itip-formatter.c:2420
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2403
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflitos entre reunións"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:300
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Hoxe"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "Hoxe ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "Hoxe ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "Hoxe ás %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "Mañá"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "Mañá ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañá ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañá ás %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañá ás %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y ás %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e de %B de %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
-msgstr ""
+msgstr "Responda e nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
-msgstr ""
+msgstr "Recibido en nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegoulle a reunión seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> require a súa presenza na seguinte reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> require a súa presenza na seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> quere apuntarse a unha reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> quere apuntarse a unha reunión existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:381
+#, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
-msgstr "<b>%s</b> quere recibir a última información da seguinte reunión:"
+msgstr ""
+"<b>%s</b> quere recibir a través de %s a última información da seguinte "
+"reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> quere recibir a última información da seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:387
+#, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> devolveu a seguinte resposta á reunión:"
+msgstr "<b>%s</b> devolveu a través de %s a seguinte resposta á reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> cancelou a reunión seguinte."
 
-#: ../plugins/itip-formatter/itip-view.c:401
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:399
+#, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> propuxo as seguintes modificacións para a reunión."
+msgstr ""
+"<b>%s</b> a través de %s propuxo as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> propuxo as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> rexeitou as seguintes modificacións para a reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> rexeitou as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> publicou a seguinte tarefa a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> publicou a tarefa seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> require a asignación de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> a través de %s asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> a través de %s quere engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> quere engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:469
+#, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr ""
-"<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
+"<b>%s</b> quere recibir a última información a través de %s para a seguinte "
+"tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18308,129 +18828,132 @@ msgid ""
 msgstr ""
 "<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:475
+#, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> devolveu a seguinte resposta á tarefa asignada:"
+msgstr ""
+"<b>%s</b> devolveu a través de %s a seguinte resposta á tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:487
+#, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> propuxo as seguintes modificacións na asignación de tarefas:"
+msgstr ""
+"<b>%s</b> propuxo a través de %s as seguintes modificacións na asignación de "
+"tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> propuxo as seguintes modificacións na asignación de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> publicou a seguinte nota a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> publicou a seguinte nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> quere sumarse a unha reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> quere sumarse a unha nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> cancelou a seguinte nota compartida:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "_Actualizar"
 
@@ -18514,7 +19037,7 @@ msgstr "Desactivar a conta"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
-msgstr "Emitir ou reproducir ficheiro de son."
+msgstr "Emitir ton de aviso ou reproducir ficheiro de son."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Blink icon in notification area."
@@ -18533,140 +19056,147 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Xera unha mensaxe D-BUS ao chegar mensaxes novas."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-#, fuzzy
 msgid ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
-msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Se está activado emitirá un ton de aviso, senón reproducirá un ficheiro de "
+"son cando chegue correo novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-#, fuzzy
 msgid "Notify new messages for Inbox only."
-msgstr "Movendo mensaxes ao cartafol %s"
+msgstr "Notificar de novas mensaxes só na caixa de entrada."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-#, fuzzy
 msgid "Play sound when new messages arrive."
-msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+msgstr "Reproducir un ficheiro de son ao  _chegar correo novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
-msgstr ""
+msgstr "Mensaxe emerxente xunto coa icona."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-#, fuzzy
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "_Non notificarme cando chegue correo novo"
+msgstr ""
+"Amosar icona de novo correo na área de notificación cando chegue correo novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
-msgstr ""
+msgstr "Nome do ficheiro de son a reproducir."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-#, fuzzy
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "Ficheiro de son para reproducir cando chegue un correo novo."
+msgstr ""
+"Ficheiro de son a reproducir cando chegue un correo novo, se non está en "
+"modo ton de aviso."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
-#, fuzzy
 msgid "Whether play sound or beep when new messages arrive."
-msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+msgstr ""
+"Indica se reproducir un ficheiro de son ou ton de aviso ao chegar correo "
+"novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
-#, fuzzy
 msgid "Whether show message over the icon when new messages arrive."
-msgstr "Xera unha mensaxe D-BUS ao chegar correo novo."
+msgstr "Indica se amosa unha mensaxe sobre a icona ao chegar correo novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-#, fuzzy
 msgid "Whether the icon should blink or not."
-msgstr "Se a barra lateral debería ser visible."
+msgstr "Indica se a icona debe facer intermitencia ou non."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
+"Indica se se deben notificar só as mensaxes no cartafol da bandeixa de "
+"entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:254
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
-msgstr "Xerando a lista de mensaxes"
+msgstr "Xerar unha mensaxe _D-Bus"
+
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "Notificación de correo de Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "Propiedades da notificación de correo"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
-#, fuzzy, c-format
+#: ../plugins/mail-notification/mail-notification.c:458
+#, c-format
 msgid ""
 "You have received %d new message\n"
 "in %s."
 msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
-msgstr[0] "Recibiu %d mensaxes novas en %s."
-msgstr[1] "Recibiu %d mensaxes novas en %s."
+msgstr[0] ""
+"Recibiu %d mensaxe nova\n"
+"en %s."
+msgstr[1] ""
+"Recibiu %d mensaxes novas\n"
+"en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
-#, fuzzy, c-format
+#: ../plugins/mail-notification/mail-notification.c:463
+#, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] "Recibiu %d mensaxe nova en %s."
-msgstr[1] "Recibiu %d mensaxe nova en %s."
+msgstr[0] "Recibiu %d mensaxe nova."
+msgstr[1] "Recibiu %d mensaxes novas."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "Mostrar icona na área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:443
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
-msgstr "_Personalizar a mensaxe de notificación"
+msgstr "_Facer intermitencia a icona na área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
-msgstr ""
+msgstr "_Mensaxe emerxente xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:626
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
 
-#: ../plugins/mail-notification/mail-notification.c:632
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
-msgstr "Ton de aviso"
+msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:633
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
-msgstr "Seleccionar un ficheiro de son"
+msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "Especificar o nome de _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:646
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
-msgstr "Palau"
+msgstr "_Reproducir"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
-msgstr ""
+msgstr "Notificar novas mensaxes só para a _bandexa de entrada"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "Generates a D-Bus message or notifies the user with an icon in notification "
 "area and a notification message whenever a new message has arrived."
 msgstr ""
-"Avisa ao usuario coa icona da bandexa e unha mensaxe de notificación cando "
-"chega unha nova mensaxe."
+"Xera unha mensaxe de D-Bus ou notifica ao usuario cunha icona na área de "
+"notificación e unha mensaxe de notificación cando chega unha nova mensaxe."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
@@ -18689,15 +19219,17 @@ msgid "Mail to meeting"
 msgstr "Correo para a reunión"
 
 #: ../plugins/mail-to-task/mail-to-task.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open calendar. %s"
-msgstr "Non se puido abrir o ficheiro"
+msgstr "Non se puido abrir o calendario %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:275
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
+"A fonte seleccionada é de só lectura, por iso non se pode crear unha tarefa "
+"aquí. Elixa outra fonte."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
@@ -18806,12 +19338,12 @@ msgstr "Quere enviar unha mensaxe á lista de correo?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
 "A acción non se puido efectuar. Isto significa que a cabeceira para esta "
-"acción non contén ningunha acción que se poida manipular.\n"
+"acción non contiña ningunha acción que se puidera manipular.\n"
 "\n"
 "Cabeceira: {0}"
 
@@ -18891,29 +19423,24 @@ msgid "_Unsubscribe from List"
 msgstr "E_liminar subscrición da lista"
 
 #: ../plugins/mark-all-read/mark-all-read.c:37
-#, fuzzy
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Marcar todas as mensaxes nos subcartafoles como lidas?"
+msgid "Also mark messages in subfolders?"
+msgstr "Marcar tamén as mensaxes no subcartafoles?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
-#, fuzzy
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Quere que se realice esta operación nos subcartafoles?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:85
-#, fuzzy
-msgid "Mark All Messages as Read"
-msgstr "Ma_rcar todas as mensaxes como lidas"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"Quere marcar as mensaxes como lidas só no cartafol actual, ou no cartafol "
+"actual e tamén en todos os seus subcartafoles?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:162
-#, fuzzy
 msgid "Current Folder and _Subfolders"
-msgstr "Crear subcartafoles"
+msgstr "Cartafol actual e _subcartafoles"
 
 #: ../plugins/mark-all-read/mark-all-read.c:174
-#, fuzzy
 msgid "Current _Folder Only"
-msgstr "Cartafol actual"
+msgstr "Soamente o _cartafol actual"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -18936,14 +19463,12 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "Marca o calendario seleccionado para visualizalo sen conexión."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-#, fuzzy
 msgid "_Do not make available for offline use"
-msgstr "_Non facer isto dispoñible sen conexión"
+msgstr "_Non facer isto dispoñible para usalo sen conexión"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-#, fuzzy
 msgid "_Make available for offline use"
-msgstr "_Marcar o calendario para o uso sen conexión"
+msgstr "_Facer isto dispoñible para usalo sen conexión"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -18959,7 +19484,7 @@ msgstr "Plugin para xestionar que plugins están activados ou desactivados."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Xestor de plugin"
 
@@ -18971,35 +19496,24 @@ msgstr "Activar e desactivar plugins"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Descrición"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Configuración"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: algunhas modificacións non serán efectivas até que reinicie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
-msgstr "Revisar"
+msgstr "Vista xeral"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-#, fuzzy
-msgid "Configuration"
-msgstr "Configuración do correo"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr ""
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -19024,22 +19538,21 @@ msgstr "Modo de texto plano"
 msgid "Prefer plain-text"
 msgstr "Preferir texto plano"
 
-#: ../plugins/prefer-plain/prefer-plain.c:179
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:180
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Preferir PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:181
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Mostrar só PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:224
-#, fuzzy
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
-msgstr "Modo HTML"
+msgstr "Modo _HTML"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
@@ -19153,50 +19666,72 @@ msgstr ""
 "Dispoñibilidade\n"
 "iCal"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Probas de carga dos complementos Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Complemento de proba de Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Probar o complemento para o cargador Python EPlugin."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Un complemento que carga outros complementos escritos en Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Cargador de Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (integrado)"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin not found, code: %d"
-msgstr "Plugin de correo non desexado SpamAssassin"
+msgstr "Non se atopou SpamAssassin, código: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create pipe: %s"
-msgstr "Fallo ao crear o almacenamento de correo local `%s': %s"
+msgstr "Fallo ao crear a canalización: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error after fork: %s"
-msgstr ""
-"Erro en %s:\n"
-" %s"
+msgstr "Erro despois de bifurcar: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:244
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
+msgstr "O proceso fillo de SpamAssasin non está respondendo, matándoo..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:246
 #, c-format
 msgid "Wait for Spamassassin child process interrupted, terminating..."
 msgstr ""
+"Espere a que o proceso fillo de SpamAssasin se interrompa, rematanado..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
+msgstr "Fallou a tubería cara SpamAssasin, código de erro: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin is not available."
-msgstr "As opcións de envío non están dispoñibles."
+msgstr "SpamAssassin non está dispoñible."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:865
-#, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Isto fará que o SpamAssasin sexa máis fiable, aínda que máis lento"
 
@@ -19217,9 +19752,8 @@ msgid "SpamAssassin junk plugin"
 msgstr "Plugin de correo non desexado SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-#, fuzzy
 msgid "Spamassassin Options"
-msgstr "SpamAssassin (integrado)"
+msgstr "Opcións de SpamAssassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19228,7 +19762,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "Gardar anexos"
 
@@ -19240,16 +19774,15 @@ msgstr "Gardar anexos..."
 msgid "Save all attachments"
 msgstr "Gardar todos os anexos"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Seleccionar un nome base para gardar"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Gardar"
 
@@ -19257,79 +19790,79 @@ msgstr "Gardar"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:166
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Lista de descrición"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Lista de categorías"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Lista de comentarios"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Creado"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Comezar"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Finalizar"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "porcentaxe feita"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Opcións avanzadas para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Antepor unha cabeceira"
 
-#: ../plugins/save-calendar/csv-format.c:551
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Delimitador de valor:"
 
-#: ../plugins/save-calendar/csv-format.c:557
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Delimitador de rexistro:"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:585
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
@@ -19350,15 +19883,15 @@ msgstr "Gardar no _disco"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:153
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:380
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Seleccione ficheiro de destino"
 
@@ -19375,21 +19908,20 @@ msgid "Show _only this Calendar"
 msgstr "_Mostrar só este calendario"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-#, fuzzy
 msgid "Show _only this Memo List"
-msgstr "Mostrar _só esta lista de tarefas"
+msgstr "Mostrar _só esta lista de notas"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "Mostrar _só esta lista de tarefas"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Un plugin que manipula o asistente de inicio."
+msgid "Guides you through your initial account setup."
+msgstr "Guíalle pola súa configuración da conta inicial."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Asistente de inicio"
+msgid "Setup Assistant"
+msgstr "Asistente de configuración"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -19417,24 +19949,24 @@ msgid "Importing files"
 msgstr "Importar ficheiros"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a información que quere importar:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "Importando datos."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "Espere"
 
@@ -19452,18 +19984,62 @@ msgstr "Encadear mensaxes polo asunto"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-#, fuzzy
 msgid "F_all back to threading messages by subject"
 msgstr "Volver ao encadeamento de mensaxes polo _asunto"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Lista de pares de palabras chave e valores para o plugin de Modelos para "
+"substituír no corpo dunha mensaxe."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Sen título"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Gardar como _modelo"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Gardar como modelo"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Borradores baseados no plugin de modelos"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr ""
+msgstr "Un complemento sinxelo que usa ytnef para decodificar adxuntos TNEF."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-#, fuzzy
 msgid "TNEF Attachment decoder"
-msgstr "Sen anexo"
+msgstr "Decodificador de adxuntos TNEF"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Un plugin para configurar os contactos WebDAV."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contactos WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Evitar IfMatch (necesario en apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -19482,147 +20058,147 @@ msgid "Evolution Test component"
 msgstr "Compoñente de proba do Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-#, fuzzy
-msgid "A string description of the current printer settings."
-msgstr "Unha cadea de descrición da configuración actual de impresora"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "Autenticar as conexións do servidor proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
-msgstr "Recoñecemento automático da ligazón"
+msgstr "URL para a configuración automática do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Versión de configuración"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
-msgstr "Se a barra lateral debería ser visible."
+msgstr "Indica se se debe executar ou non o detector de fallos."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Largura predeterminada da barra lateral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Altura predeterminada da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Estado predeterminado da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Largura predeterminada da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
+"Activar as configuracións do proxy ao acceder HTTP/Secure HTTP en internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "Nome do equipo proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy password"
-msgstr "Introduza o contrasinal"
+msgstr "Contrasinal do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
-msgstr ""
+msgstr "Porto do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
-msgstr ""
+msgstr "Nome de usuario do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID ou alias do compoñente que se mostrará por defecto ao iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
+"Se está activado, as conexións ao servidor proxy requiren autenticación. O "
+"nome de usuario está definido na chave de GConf en \"/apps/evolution/shell/"
+"network_config/authentication_user\" e o contrasinal gárdase por medio de "
+"gnome-keyring ou o ficheiro de contrasinal ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Última versión da configuración actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de camiños aos cartafoles que se sincronizarán co disco para o uso sen "
 "conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
-msgstr ""
+msgstr "Equipos que non sexan proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "Contrasinal para pasar como autenticación ao facer HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Proxy configuration mode"
-msgstr "Configuración do correo"
+msgstr "Modo de configuración do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "Nome do equipo proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "Porto do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "Nome do equipo proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "Porto do proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
+"Elixe o modo de configuración do proxy. Os valores aceptados son 0, 1, 2 e 3 "
+"que representan respectivamente \"usar as configuracións do sistema\", \"sen "
+"proxy\", \"usar a configuración manual do proxy\" e \"usar a URL para a "
+"configuración automática do proxy:\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "A barra lateral é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
-msgstr "Saltar o diálogo de aviso de desenvolvemento"
+msgstr "Saltar o diálogo de aviso de recuperación"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:577
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "A barra de estado é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19630,19 +20206,19 @@ msgstr ""
 "A versión de configuración do Evolution, co nivel de configuración maior/"
 "menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada da ventá principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "A largura predeterminada da ventá principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura predeterminada para a barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19650,37 +20226,43 @@ msgstr ""
 "A última versión actualizada da configuración do Evolution, con nivel de "
 "configuración maior/menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
-msgstr ""
+msgstr "O nome da máquina pola que se fai proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
+msgstr "O nome da máquina pola que se fai proxy HTTP seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
-msgstr ""
+msgstr "O nome da máquina pola que se fai proxy socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
+"O porto da máquina definida por \"/apps/evolution/shell/network_config/"
+"http_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
+"O porto da máquina definida por \"/apps/evolution/shell/network_config/"
+"secure_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
+"O porto da máquina definida por \"/apps/evolution/shell/network_config/"
+"socks_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19690,78 +20272,79 @@ msgstr ""
 "\"toolbar\". Se se selecciona \"toolbar\", o estilo dos botóns determinarase "
 "pola configuración da barra de ferramentas do Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
+"Esta chave contén unha lista de equipos que están conectados directamente, "
+"non a través do proxy (se está activo). Os valores poden ser nomes de "
+"equipos, dominios (usando unha expresión do estilo *.algo.com), enderezos IP "
+"(tanto IPv4 como IPv6) e enderezos de rede coa máscara de rede (do estilo "
+"192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "URL that provides proxy configuration values."
-msgstr "Última versión da configuración actualizada"
+msgstr "URL que fornece os valores de configuración do proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
-msgstr ""
+msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "Nome de usuario a pasar como autenticación ao usar o proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Se o Evolution se iniciará en modo sen conexión en vez de en modo conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
-msgstr "Se a barra lateral debería ser visible."
+msgstr "Indica se a detección de fallos debe executarse ou non"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Se a ventá debería ou non estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Se a barra lateral debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Se a barra de estado debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Se se salta o diálogo de aviso nas versión de desenvolvemento do Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Se se salta o diálogo de aviso nas versión de desenvolvemento do Evolution."
+msgstr "Se se salta o diálogo de aviso cando Evolution se está recuperando."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botóns da ventá deberían ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Estilo dos botóns de ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Os botóns da ventá son visibles"
 
@@ -19777,11 +20360,11 @@ msgstr "Conexións activas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Prema en \"Aceptar\" para pechar estas conexións e desconectar"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador que se executará:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -19795,11 +20378,11 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe e o Evolution tentará "
 "averigualo."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importación"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19811,56 +20394,36 @@ msgstr ""
 "localizou ningunha configuración que se poida importar. Se\n"
 "quere tentalo de novo, prema o botón \"Atrás\".\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nome do _ficheiro:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuración de programas _antigos"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Preferencias do Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Non se especificou un nome de cartafol."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "O nome do cartafol non pode conter o carácter Retorno."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "O nome do cartafol non pode conter o carácter \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "O nome do cartafol non pode conter o carácter \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' e '..' son nomes de cartafol reservados."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:343
-#, fuzzy, c-format
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
+#, c-format
 msgid "%s - Evolution"
-msgstr "Evolution"
+msgstr "%s - Evolution"
 
 #: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
@@ -19883,83 +20446,85 @@ msgstr "Non foi posible executar o Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Proxecto Trasno"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
-#, fuzzy
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
-msgstr "Erro ao abrir o calendario"
+msgstr "Erro ao abrir a páxina web coas FAQ."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Traballar con conexión"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Traballar sen conexión"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Traballar sen conexión"
 
-#: ../shell/e-shell-window.c:392
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"O Evolution está conectado neste momento. Prema neste botón para traballar "
-"sen conexión."
+"O Evolution está conectado neste momento.\n"
+"Prema neste botón para traballar sen conexión."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution está en proceso de desconexión."
 
-#: ../shell/e-shell-window.c:406
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"O Evolution está actualmente sen conexión. Prema neste botón para traballar "
-"con conexión."
+"O Evolution está actualmente sen conexión.\n"
+"Prema neste botón para traballar con conexión."
 
-#: ../shell/e-shell-window.c:815
+#: ../shell/e-shell-window.c:782
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell.c:640
-#, fuzzy
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "Erro de sistema descoñecido."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:316
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "Os argumentos non son válidos"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Non se localizou a base de datos de configuración"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Novo"
 
@@ -19968,6 +20533,7 @@ msgid "New Test"
 msgstr "Nova proba"
 
 #: ../shell/test/evolution-test-component.c:108
+msgctxt "New"
 msgid "_Test"
 msgstr "_Proba"
 
@@ -20015,7 +20581,7 @@ msgstr ""
 "ficheiros externos ao Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20052,7 +20618,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos ansiosamente as súas colaboracións.\n"
 
-#: ../shell/main.c:258
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20060,66 +20626,66 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:265
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:315
-#, fuzzy
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
-msgstr "Restauración do Evolution"
+msgstr "Detector de fallos do Evolution"
 
-#: ../shell/main.c:317
-#, fuzzy
+#: ../shell/main.c:305
 msgid "Ig_nore"
-msgstr "Ignorar"
+msgstr "Ig_norar"
 
-#: ../shell/main.c:332
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
 "run.  As a precautionary measure, all preview panes will be hidden.\n"
 "You can restore the preview panes from the View menu.\n"
 msgstr ""
+"Parece que Evolution pechouse de forma inesperada a última vez que se\n"
+"executou. Como medida de precaución ocultaranse todos os paneis de vista\n"
+"previa. Pode restablecer os paneis de vista previa desde o menú Ver.\n"
 
-#: ../shell/main.c:343
-#, fuzzy
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
-msgstr "Non mostrar esta mensaxe outra vez."
+msgstr "_Non mostrar esta mensaxe outra vez"
 
-#: ../shell/main.c:575
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando o compoñente especificado"
 
-#: ../shell/main.c:579
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexión"
 
-#: ../shell/main.c:582
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar o peche de todos os compoñentes do Evolution"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza a remigración desde o Evolution 1.4"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:577
 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:591
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de calquera plugin."
 
-#: ../shell/main.c:593
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr ""
+msgstr "Desactivar a vista previa do correo, contactos e tarefas."
 
-#: ../shell/main.c:678
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:706
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20265,7 +20831,7 @@ msgstr ""
 "Se escolle continuar, pode que non teña acceso a algúns dos seus datos "
 "antigos.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20276,7 +20842,7 @@ msgstr ""
 "\n"
 "Edite a configuración de confianza:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20286,7 +20852,7 @@ msgstr ""
 "certificado, entón confía na autoridade deste certificado a non ser que se "
 "indique outra cousa aquí"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20344,7 +20910,7 @@ msgstr "Enderezo de correo electrónico"
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros CA de certificación de correo"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificados: %s"
@@ -20364,7 +20930,7 @@ msgid "Enter new password"
 msgstr "Introduza un contrasinal novo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20373,7 +20939,7 @@ msgstr ""
 "Emitido a:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20382,7 +20948,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Seleccione o certificado"
 
@@ -20570,7 +21136,7 @@ msgid "_Edit CA Trust"
 msgstr "_Editar confianza na CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "O certificado xa existe"
 
@@ -20885,7 +21451,7 @@ msgstr "Gardar os contactos do cartafol seleccionado como unha VCard."
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
@@ -20954,7 +21520,7 @@ msgstr "_Mover contacto a..."
 msgid "_Move Folder Contacts To"
 msgstr "_Mover cartafol de contactos a"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Novo"
 
@@ -21015,7 +21581,7 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Seguinte"
 
@@ -21024,7 +21590,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualiza o calendario que se vai imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Anterior"
 
@@ -21092,193 +21658,6 @@ msgstr "Semana laboral"
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Prema aquí para anexar un ficheiro"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Prema aquí para pechar a ventá actual"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Prema aquí para gardar a ventá actual"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Prema aquí para ver a axuda dispoñible"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Pechar"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copiar o texto seleccionado ao portapapeis"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Cortar o texto seleccionado para o portapapeis"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "I_nserir"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Pegar texto desde o portapapeis"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Seleccionar todo o texto"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Axuda"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opcións"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Evento de día completo"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Evento de _día completo"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Clasificar como confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Clasificar como privado"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Clasificar como público"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Prema aquí para configurar ou desconfigurar as alarmas para este evento"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Inserir opcións avanzadas de envío"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Converter en evento recorrente"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Consultar información de dispoñibilidade para os participantes"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Campo _rol"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Opcións de envío"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Mostrar hora como _ocupada"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Fuso horario"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Alterna entre se se mostra o campo Tipo de participante ou non"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Alterna entre se se mostra o campo RSVP ou non"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Alterna entre se se mostra o campo Rol ou non"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Alterna entre se se mostra o campo Estado ou non"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Alterna entre se se mostra ou non o campo Fuso horario"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr " Alterna entre se se mostran as categorías ou non"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Alterna entre se se ten un evento de día completo ou non"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmas"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorías"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Clasificación"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Dispoñibilidade"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privado"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Recorrencia"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Campo de e_stado"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Campo _tipo"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operación de correo actual"
@@ -21350,7 +21729,7 @@ msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
-msgstr ""
+msgstr "Ver a consola de depuración para as mensaxes de rexistro"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
@@ -21361,14 +21740,12 @@ msgid "_Copy Folder To..."
 msgstr "_Copiar cartafol a..."
 
 #: ../ui/evolution-mail-global.xml.h:22
-#, fuzzy
 msgid "_Debug Logs"
-msgstr "Rexistro _web:"
+msgstr "_Rexistros de depuración"
 
 #: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
 msgid "_Download Messages for Offline Usage"
-msgstr "Descargar as mensaxes para o modo sen conexión"
+msgstr "_Descargar as mensaxes para o seu uso sen conexión"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
@@ -21456,9 +21833,8 @@ msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
 #: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
 msgid "Mark all messages in the folder as read"
-msgstr "Marcar todas as mensaxes nos subcartafoles como lidas?"
+msgstr "Marcar todas as mensaxes no cartafol como lidas?"
 
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
@@ -21481,9 +21857,8 @@ msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
 #: ../ui/evolution-mail-list.xml.h:23
-#, fuzzy
 msgid "Select Message S_ubthread"
-msgstr "Seleccionar _fío de mensaxe"
+msgstr "Seleccionar o sub_fío da mensaxe"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
@@ -21503,9 +21878,8 @@ msgid "Select all messages in the same thread as the selected message"
 msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
 
 #: ../ui/evolution-mail-list.xml.h:28
-#, fuzzy
 msgid "Select all replies to the currently selected message"
-msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
+msgstr "Seleccionar todas as respostas á mensaxe actualmente seleccionada"
 
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
@@ -21993,6 +22367,10 @@ msgstr "_Zoom"
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Pechar"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
@@ -22029,22 +22407,6 @@ msgstr "Ver a nota seleccionada"
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Prema para modificar ou ver os detalles do estado da tarefa"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Detalles do estado"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Fuso horario"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Detalles do e_stado"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copiar as tarefas seleccionadas"
@@ -22132,9 +22494,8 @@ msgid "Display window buttons with text only"
 msgstr "Mostrar os botóns da ventá só con texto"
 
 #: ../ui/evolution.xml.h:10
-#, fuzzy
 msgid "Evolution _FAQ"
-msgstr "Evolution"
+msgstr "_FAQ do Evolution"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
@@ -22153,7 +22514,6 @@ msgid "I_mport..."
 msgstr "I_mportar..."
 
 #: ../ui/evolution.xml.h:15
-#, fuzzy
 msgid "Icons _and Text"
 msgstr "Iconas _e texto"
 
@@ -22171,12 +22531,11 @@ msgstr "Nova _ventá"
 
 #: ../ui/evolution.xml.h:20
 msgid "Open the Frequently Asked Questions webpage"
-msgstr ""
+msgstr "Abrir a páxina web de preguntas máis frecuentes"
 
 #: ../ui/evolution.xml.h:21
-#, fuzzy
 msgid "Page Set_up..."
-msgstr "Configuración de páxina:"
+msgstr "Config_uración de páxina..."
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
@@ -22231,7 +22590,6 @@ msgid "Toggle whether we are working offline."
 msgstr "Alternar entre se estamos traballando sen conexión ou non"
 
 #: ../ui/evolution.xml.h:36
-#, fuzzy
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
@@ -22244,53 +22602,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Ver/Ocultar a barra de estado"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Traballar sen c_onexión"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Pechar ventá"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Es_quecer contrasinais"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
-msgstr ""
+msgstr "_Preguntas máis frecuentes"
 
-#: ../ui/evolution.xml.h:46
-#, fuzzy
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Ocultar botóns"
 
-#: ../ui/evolution.xml.h:47
-#, fuzzy
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Só _iconas"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Opcións de _sincronización..."
 
-#: ../ui/evolution.xml.h:53
-#, fuzzy
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Só _texto"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Ventá"
 
@@ -22367,11 +22726,11 @@ msgid "With _Status"
 msgstr "Con e_stado"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -22389,7 +22748,7 @@ msgstr "Seleccionar un fuso horario"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "Caixa de combinación coas zonas horarias"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22401,19 +22760,19 @@ msgstr ""
 "fuso horario.\n"
 "Use o botón dereito para reducir."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Colección"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir visualizacións para %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Definir visualizacións"
 
@@ -22429,11 +22788,11 @@ msgstr "Definir visualizacións para \"%s\""
 msgid "Table"
 msgstr "Táboa"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instancia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Gardar visualización actual"
 
@@ -22485,11 +22844,11 @@ msgstr "Gardar a visualización personalizada actual"
 msgid "Create or edit views"
 msgstr "Crear ou editar visualizacións"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Factoría"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Definir visualizacións novas"
 
@@ -22505,44 +22864,17 @@ msgstr "Tipo de visualización"
 msgid "Type of view:"
 msgstr "Tipo de visualización:"
 
-#: ../widgets/misc/e-attachment-bar.c:103
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../widgets/misc/e-attachment-bar.c:109
-#, fuzzy, c-format
-msgid "%.1f KB"
-msgstr "%s KB"
-
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.1f MB"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-bar.c:115
-#, c-format
-msgid "%.1f GB"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-bar.c:1058
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barra de anexos"
 
-#: ../widgets/misc/e-attachment-bar.c:1304
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "porcentaxe feita"
-
-#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
-#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Non se pode anexar o ficheiro %s: %s"
 
-#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Non se pode anexar o ficheiro %s: non é un ficheiro normal"
@@ -22564,11 +22896,11 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se mostre o anexo automaticamente"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1278
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
@@ -22614,29 +22946,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Largura mínima"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Largura mínima"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Espazamento"
 
-#: ../widgets/misc/e-cell-date-edit.c:292
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Agora"
 
-#: ../widgets/misc/e-cell-date-edit.c:849
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -22740,56 +23072,55 @@ msgstr "Outro..."
 msgid "Ch_aracter Encoding"
 msgstr "Codificación dos car_acteres"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Prema este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:409
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:394
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinación para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:486
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "A_gora"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Hoxe"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "O valor da data non é válido"
 
-#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "O valor da hora non é válido"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Expandido"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Se o expansor está expandido ou non"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Texto da etiqueta do expansor"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Usar subliñado"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22797,31 +23128,31 @@ msgstr ""
 "Se se define, un subliñado no texto indica que o seguinte carácter debería "
 "usarse para a tecla rápida mnemónica"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Espazo para pór entre a etiqueta e o fillo"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Widget etiqueta"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para mostrar en lugar da etiqueta habitual do expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "Tamaño do expansor"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "Tamaño da frecha do expansor"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Espazamento do indicador"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Espazamento ao redor da frecha do expansor"
 
@@ -22872,23 +23203,30 @@ msgstr "Cartafol actual"
 msgid "Current Message"
 msgstr "Mensaxe actual"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Seleccione unha imaxe"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Mapa do mundo"
 
-#: ../widgets/misc/e-map.c:629
-#, fuzzy
+#: ../widgets/misc/e-map.c:627
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "Widget con mapa interactivo baseado no rato para seleccionar o fuso horario. "
 "Os usuarios que só dispoñan de teclado poden, no seu lugar, seleccionar o "
-"fuso horario desde a caixa de combinación abaixo."
+"fuso horario desde a caixa de combinación de máis abaixo."
+
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "En liña"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "O estado do botón é conectado"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22914,63 +23252,61 @@ msgstr "Modelo de refluxo"
 msgid "Column width"
 msgstr "Largura de columna"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
-msgstr "_Buscar"
+msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
-msgstr "Prema aquí para anexar un ficheiro"
+msgstr "Prema aquí para cambiar o tipo de busca"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texto"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1018
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "Mos_trar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "Busca_r: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1047
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " e_n "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Fila de cursor"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Columna de cursor"
@@ -22987,7 +23323,7 @@ msgstr "Modo de selección"
 msgid "Cursor Mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
 
@@ -23011,10 +23347,6 @@ msgstr "<b>Seguimento de estado</b>"
 msgid "A_uto-delete sent item"
 msgstr "E_liminar automaticamente o elemento enviado"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Clasificación"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Crear un elemento enviado para o seguimento da información"
@@ -23121,14 +23453,14 @@ msgid "_When opened:"
 msgstr "_Ao abrir:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminada)"
@@ -23153,7 +23485,7 @@ msgstr "_Categorías dispoñibles:"
 msgid "categories"
 msgstr "categorías"
 
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr "lista emerxente"
 
@@ -23236,9 +23568,8 @@ msgid "Clear All"
 msgstr "Limpar todo"
 
 #: ../widgets/table/e-table-config.glade.h:4
-#, fuzzy
 msgid "Clear _All"
-msgstr "Limpar todo"
+msgstr "_Limpar todo"
 
 #: ../widgets/table/e-table-config.glade.h:5
 #: ../widgets/table/e-table-header-item.c:1583
@@ -23258,19 +23589,16 @@ msgid "Move _Up"
 msgstr "Mover _arriba"
 
 #: ../widgets/table/e-table-config.glade.h:12
-#, fuzzy
 msgid "Show _field in View"
-msgstr "Mostrar o campo na visualización"
+msgstr "Mostrar o _campo na visualización"
 
 #: ../widgets/table/e-table-config.glade.h:13
-#, fuzzy
 msgid "Show field i_n View"
-msgstr "Mostrar o campo na visualización"
+msgstr "Mostrar o campo _na visualización"
 
 #: ../widgets/table/e-table-config.glade.h:14
-#, fuzzy
 msgid "Show field in _View"
-msgstr "Mostrar o campo na visualización"
+msgstr "Mostrar o campo na _visualización"
 
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
@@ -23293,9 +23621,8 @@ msgid "_Group By..."
 msgstr "_Agrupar por..."
 
 #: ../widgets/table/e-table-config.glade.h:22
-#, fuzzy
 msgid "_Show field in View"
-msgstr "Mostrar o campo na visualización"
+msgstr "_Mostrar o campo na visualización"
 
 #: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
@@ -23349,81 +23676,81 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Alternar as cores das filas"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Debuxar a grade horizontal"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Debuxar a grade vertical"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Debuxar o foco"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Modelo de selección"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Límite de lonxitude"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Altura uniforme da fila"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Conxelado"
 
@@ -23476,15 +23803,13 @@ msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a visualización actual..."
 
 #: ../widgets/table/e-table-header-item.c:1543
-#, fuzzy
 msgid "_Sort By"
-msgstr "Ordenar por"
+msgstr "_Ordenar por"
 
 #. Custom
 #: ../widgets/table/e-table-header-item.c:1561
-#, fuzzy
 msgid "_Custom"
-msgstr "Personalizado"
+msgstr "_Personalizado"
 
 #: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
@@ -23501,24 +23826,24 @@ msgstr "Ordenar a información"
 msgid "Tree"
 msgstr "Árbore"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Cabeceira da táboa"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modelo da táboa"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Fila do cursor"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Buscar sempre"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Premer para engadir"
 
@@ -23638,175 +23963,42 @@ msgstr "Contexto MI"
 msgid "Handle Popup"
 msgstr "Tirador emerxente"
 
-#~ msgid "Permission Denied."
-#~ msgstr "Permiso denegado."
-
-#~ msgid "<b>Display</b>"
-#~ msgstr "<b>Monitor</b>"
-
-#~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>Información do servidor</b>"
-
-#~ msgid "Unknown reason"
-#~ msgstr "Razón descoñecida"
-
-#~ msgid "Open File"
-#~ msgstr "Abrir ficheiro"
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "Marcar todas as mensaxes no cartafol e subcartafoles como lidas?"
 
-#~ msgid "Cannot open file &quot;{0}&quot;."
-#~ msgstr "Non se pode abrir o ficheiro &quot;{0}&quot;."
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Quere que se realice esta operación tamén nos subcartafoles?"
 
-#~ msgid "Attach original message"
-#~ msgstr "Anexar mensaxe orixinal"
+#~ msgid "Mark All Messages as Read"
+#~ msgstr "Marcar todas as mensaxes como lidas"
 
-#~ msgid "Do not quote original message"
-#~ msgstr "Non citar a mensaxe orixinal"
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
 
-#~ msgid "Quote original message"
-#~ msgstr "Citar a mensaxe orixinal"
+#~ msgid "_Save Message"
+#~ msgstr "_Gardar mensaxe"
 
-#~ msgid "Enter a name for this signature."
-#~ msgstr "Introduza un nome para esta sinatura."
-
-#~ msgid "Name:"
-#~ msgstr "Nome:"
+#~ msgid "Time interval, in seconds, how often upload store changes to server."
+#~ msgstr ""
+#~ "Intervalo de tempo, en segundos, para a frecuencia coa que subir os "
+#~ "cambios de almacenamento ao servidor."
 
 #~ msgid ""
-#~ "Are you sure you want to permanently remove all the deleted messages in "
-#~ "folder &quot;{0}&quot;?"
+#~ "Time interval, in seconds, how often upload store changes to server. The "
+#~ "actual value cannot be less than 30 seconds."
 #~ msgstr ""
-#~ "Está seguro de que quere eliminar permanentemente todas as mensaxes "
-#~ "eliminadas no cartafol &quot;{0}&quot;?"
-
-#~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "Eliminar &quot;{0}&quot;?"
-
-#, fuzzy
-#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "Non se pode engadir o cartafol de busca &quot;{0}&quot;."
+#~ "Intervalo de tempo, en segundos, para a frecuencia coa que subir os "
+#~ "cambios de almacenamento ao servidor. O valor actual non pode ser "
+#~ "inferior a 30 segundos."
 
-#, fuzzy
-#~ msgid "Only on _Current Folder"
-#~ msgstr "Cartafol actual"
-
-#, fuzzy
-#~ msgid "Enable attachment reminder plugin"
-#~ msgstr "Activar e desactivar plugins"
-
-#, fuzzy
-#~ msgid "Enable attachment reminder plugin."
-#~ msgstr "Activar e desactivar plugins"
-
-#, fuzzy
-#~ msgid "Remind _missing attachments"
-#~ msgstr "Gardando anexo"
-
-#, fuzzy
-#~ msgid "_Continue Editing"
-#~ msgstr "Continuar"
-
-#~ msgid "_Refresh:"
-#~ msgstr "_Actualizar:"
-
-#, fuzzy
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr "Indica unha opción para imprimir o correo desde o editor"
-
-#~ msgid "Print Message"
-#~ msgstr "Imprimir mensaxe"
-
-#~ msgid "Prints the message"
-#~ msgstr "Imprimir a mensaxe"
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "Copiar a selección no portapapeis"
-
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "Cortar a selección para o portapapeis"
-
-#~ msgid "Paste from clipboard"
-#~ msgstr "Pegar desde o portapapeis"
-
-#~ msgid "Delete all but signature"
-#~ msgstr "Eliminar todo agás a sinatura"
-
-#~ msgid "For_mat"
-#~ msgstr "For_mato"
-
-#~ msgid "HT_ML"
-#~ msgstr "HT_ML"
-
-#~ msgid "Open a file"
-#~ msgstr "Abrir un ficheiro"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "Cifrar con PGP"
-
-#~ msgid "PGP Sign"
-#~ msgstr "Asinar con PGP"
-
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "Cifrar con S/MIME"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "Sinatura S/MIME"
-
-#~ msgid "Save As"
-#~ msgstr "Gardar como"
-
-#~ msgid "Save Draft"
-#~ msgstr "Gardar borrador"
-
-#~ msgid "Save in folder..."
-#~ msgstr "Gardar no cartafol..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Gardar a mensaxe nun cartafol específico"
-
-#~ msgid "Send"
-#~ msgstr "Enviar"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Enviar a mensaxe en formato HTML"
-
-#~ msgid "_Delete all"
-#~ msgstr "E_liminar todo"
-
-#~ msgid "_Open..."
-#~ msgstr "_Abrir..."
-
-#~ msgid "C_lose"
-#~ msgstr "P_echar"
-
-#~ msgid "H_TML"
-#~ msgstr "H_TML"
-
-#~ msgid "Save and _Close"
-#~ msgstr "Gardar e _Pechar"
-
-#~ msgid "Save the current file and close the window"
-#~ msgstr "Gardar o ficheiro actual e pechar a ventá"
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Engadir o cartafol á lista de cartafoles subscritos"
-
-#~ msgid "Refresh List"
-#~ msgstr "Actualizar lista"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Actualizar a lista de cartafoles"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Eliminar o cartafol da lista de cartafoles subscritos"
-
-#~ msgid "Subscribe"
-#~ msgstr "Subscribir"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Eliminar subscrición"
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr ""
+#~ "Non ten suficientes permisos no cartafol seleccionado para crear o "
+#~ "ficheiro"
 
-#~ msgid "_Invert Selection"
-#~ msgstr "_Inverter selección"
+#~ msgid "A plugin that manages the Startup wizard."
+#~ msgstr "Un plugin que manipula o asistente de inicio."
 
-#~ msgid "TimeZone Combobox"
-#~ msgstr "Caixa de combinación para o fuso horario"
+#~ msgid "Startup wizard"
+#~ msgstr "Asistente de inicio"
diff --git a/po/gu.po b/po/gu.po
index 2a0a5e6885..a165e05d6d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,19 +1,22 @@
 # translation of evolution.HEAD.gu.po to Gujarati
+#: ../shell/main.c:683
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
 # Ankit Patel <ankit@redhat.com>, 2007, 2008.
+# Sweta Kothari <swkothar@redhat.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-23 20:44+0000\n"
-"PO-Revision-Date: 2008-03-06 18:15+0530\n"
-"Last-Translator: Ankit Patel <ankit@redhat.com>\n"
-"Language-Team: Gujarati <fedora-trans-gu@redhat.com>\n"
+"POT-Creation-Date: 2008-08-04 19:00+0000\n"
+"PO-Revision-Date: 2008-08-05 17:03+0530\n"
+"Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
+"Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -88,21 +91,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "નવો સંપર્ક"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "નવી સંપર્ક યાદી"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -110,7 +113,6 @@ msgstr[0] "વર્તમાન સરનામા પુસ્તિકા ફ
 msgstr[1] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડર %s ને %d કાર્ડો છે"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "ખોલો"
 
@@ -220,7 +222,7 @@ msgid "calendar view for one or more days"
 msgstr "એક અથવા વધુ દિવસો માટે કેલેન્ડર દેખાવ"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -231,20 +233,18 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2158
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -252,10 +252,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -265,17 +265,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2174
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "જીનોમ કેલેન્ડર"
 
@@ -387,32 +385,35 @@ msgstr "કેલેન્ડર: %s થી %s સુધીનું"
 msgid "evolution calendar item"
 msgstr "ઈવોલ્યુશન કેલેન્ડર વસ્તુ"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "કોમ્બો બટન"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "મૂળભુત સક્રિય કરો"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "પોપઅપ મેનુ"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "જોડાણ પટ્ટી બદલો"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "સક્રિય કરો"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr "'{0}' એ માત્ર-વાંચી શકાય તેવી સરનામા પુસ્તિકા સ્રોત છે. સંપર્કો દેખાવમાં બદલો અને સરનામા પુસ્તિકા પ્રકાશિત કરો કે જે સંપર્કો સ્વીકારી શકે."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"'{0}' એ માત્ર-વાંચી શકાય તેવી સરનામા પુસ્તિકા સ્રોત છે. સંપર્કો દેખાવમાં બદલો અને સરનામા "
+"પુસ્તિકા પ્રકાશિત કરો કે જે સંપર્કો સ્વીકારી શકે."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -457,10 +458,11 @@ msgid "Could not remove addressbook."
 msgstr "સરનામાપોથી દૂર કરી શકાઈ નહિ."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "વર્તમાનમાં તમે ઈવોલ્યુશનમાંથી માત્ર જૂથપ્રમાણે સરનામા પુસ્તિકા જ વાપરી શકો છો. મહેરબાની "
 "કરીને અમુક અન્ય જૂથપ્રમાણે મેઈલ ક્લાઈન્ટ એકવાર વાપરો, તમારા જૂથપ્રમાણે આવૃત્તિ સંપર્કો મેળવવા "
@@ -484,7 +486,7 @@ msgstr "LDAP સર્વર સાથે સત્તાધિકરણ કર�
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "સંપર્ક કાઢી નાંખવામાં નિષ્ફળ"
 
@@ -497,26 +499,22 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "પદ્ધતિની યોગ્ય જાણકારી સાથે LDAP સર્વર જવાબ આપતું નથી."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "પરવાનગી નામંજૂર."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "સર્વર આવૃત્તિ"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "અમુક લક્ષણો તમારા વર્તમાન સર્વર સાથે યોગ્ય રીતે કામ કરશે નહિં"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "ઈવોલ્યુશન સરનામાપોથી અનિચ્છનીય રીતે બંધ થઈ ગઈ."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "તમે પસંદ કરેલ ચિત્ર મોટું છે. શું તમે તેનું માપ બદલવા માંગો છો અને તેનો સંગ્રહ કરવા માંગો છો?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
 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 "
@@ -525,19 +523,19 @@ msgstr ""
 "આ LDAP સર્વર કદાચ LDAP ની જૂની આવૃત્તિ વાપરે છે; કે જે આ વિધેયોને આધાર આપતું નથી અથવા તે "
 "કદાચ રુપરેખાંકિત થયેલ નથી. તમારા સંચાલકને શોધ માટેના આધારો માટે પૂછો."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "સરનામા પુસ્તિકા કાયમ માટે દૂર થઈ જશે."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "સરનામાપોથી ખોલી શકાઈ નહિ."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "આ સરનામાપોથી સર્વર પાસે કોઈ શોધાયેલ આધારો નથી."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -545,27 +543,27 @@ msgstr ""
 "સરનામા પુસ્તિકા કદાચ પહોંચી શકાય નહિં અથવા સર્વર નામની જોડણી ખોટી હોઈ શકે અથવા "
 "તમારું નેટવર્ક જોડાણ ધીમું હોઈ શકે."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "આ સર્વર LDAPv3 પદ્ધતિની જાણકારીને આધાર આપતું નથી."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "સરનામાપોથી ખોલવા માટે સમર્થ નથી"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "શોધ કરવામાં સમર્થ નથી."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0} સંગ્રહવામાં અસમર્થ."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "શું તમે તમારા ફેરફારો સંગ્રહવા માંગો છો?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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?"
@@ -573,7 +571,7 @@ msgstr ""
 "તમે એક સરનામાપોથીમાંથી બીજી જગ્યાએ સંપર્ક ખસેડવાનો પ્રયત્ન કરી રહ્યા છો પરંતુ તે "
 "સ્રોતમાંથી દૂર કરી શકાતો નથી. શું તમે એની જગ્યાએ તેની નકલનો સંગ્રહ કરવા માંગો છો?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -582,6 +580,10 @@ msgstr ""
 "તમે બિનઆધારભૂત GroupWise સર્વર સાથે જોડાઈ રહ્યા છો અને ઈવોલ્યુશનમાં કદાચ સમસ્યાઓ "
 "મેળવશો. શ્રેષ્ઠ પરિણામો માટે સર્વર આધારભૂત આવૃત્તિમાં સુધારાવું જોઈએ"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "આ સરનામું પુસ્તિકામાં સંપર્કો દૂર કરવા માટે તમને પરવાનગી નથી."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -616,8 +618,8 @@ msgid "_Use as it is"
 msgstr "જેમ છે તેમ વાપરો (_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -626,17 +628,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "મૂળભુત સીંક સરનામુ:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "સરનામાપોથી લાવી શકાઈ નહિ"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "પાયલોટનો સરનામા કાર્યક્રમ બ્લોક વાંચી શકાયો નહિ"
 
@@ -658,10 +660,10 @@ msgstr "આપોઆપ સંપૂર્ણ અંહિ રુપરેખા
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "સંપર્કો"
 
@@ -670,8 +672,8 @@ msgid "Evolution Address Book"
 msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા સરનામું પોપ-અપ"
+msgid "Evolution Address Book address popup"
+msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા સરનામું પોપઅપ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -702,11 +704,12 @@ msgstr "તમારા S/MIME પ્રમાણપત્રોની અંહ
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "આ કમ્પ્યુટરમાં"
 
@@ -719,28 +722,31 @@ msgstr "આ કમ્પ્યુટરમાં"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "ખાનગી"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP સર્વરો પર"
 
 #: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
 msgid "_Contact"
-msgstr "સંપર્ક(_C)"
+msgstr "સંપર્ક (_C)"
 
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "નવો સંપર્ક બનાવો"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
 msgid "Contact _List"
 msgstr "સંપર્ક યાદી (_L)"
 
@@ -749,11 +755,12 @@ msgid "Create a new contact list"
 msgstr "નવી સંપર્ક યાદી બનાવો"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "નવી સરનામા પોથી"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
 msgid "Address _Book"
 msgstr "સરનામા પોથી (_B)"
 
@@ -765,72 +772,72 @@ msgstr "નવી સરનામાપોથી બનાવો"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "સરનામા પુસ્તિકા સુયોજનો અથવા ફોલ્ડરો સુધારવામાં નિષ્ફળ."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "આધાર"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "પ્રકાર (_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:618
 msgid "Copy _book content locally for offline operation"
 msgstr "ઓફલાઈન ક્રિયાઓ માટે બુકના સમાવિષ્ટો સ્થાનીકપણે નકલ કરો (_b)"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:967
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2343
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "સામાન્ય"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "સરનામા પોથી"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:972
 msgid "Server Information"
 msgstr "સર્વર જાણકારી"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:974
 msgid "Authentication"
 msgstr "સત્તાધિકરણ"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:977
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "વિગતો"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "શોધી રહ્યા છીએ"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:980
 msgid "Downloading"
 msgstr "ડાઉનલોડ કરી રહ્યા છીએ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "સરનામાપોથીના ગુણધર્મો"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "રુપાંતરિત કરી રહ્યા છીએ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' ને રુપાંતરિત કરી રહ્યા છીએ:"
@@ -885,48 +892,48 @@ msgstr ""
 "જ્યારે ઈવોલ્યુશન તમારા પાયલોટ સીંક માહિતીનું રોનું રુપાંતર કરે ત્યારે મહેરબાની કરીને શાંતિ "
 "દાખવો..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" ફોલ્ડરને આમાં નામ બદલો:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "ફોલ્ડરનું નામ બદલો"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "ફોલ્ડર નામો '/' સમાવી શકતા નથી"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "નવી સરનામા પુસ્તિકા (_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "vCard તરીકે સંગ્રહો..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1385
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:939
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "કાઢી નાંખો (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "ગુણધર્મો (_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "સંપર્ક સ્રોત પસંદ કરનાર"
 
@@ -935,19 +942,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "અજાણી રીતે LDAP સર્વર વાપરી રહ્યા છીએ"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "સત્તાધિકરણ કરવામાં નિષ્ફળ.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (વપરાશકર્તા %s) માટે પાસવર્ડ દાખલ કરો"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "પાસવર્ડ દાખલ કરો"
@@ -1022,103 +1029,95 @@ msgid "<b>Authentication</b>"
 msgstr "<b>સત્તાધિકરણ</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>ડિસ્પ્લે</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>ડાઉનલોડ કરી રહ્યા છીએ</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>શોધી રહ્યા છીએ</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>સર્વરની જાણકારી</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>પ્રકાર:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "સરનામા પોથી ઉમેરો"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "હંમેશા"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "અનામિક રીતે"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "આધાર"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "અલગ તારવેલ નામ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "ઈ-મેઈલ સરનામુ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "ઈવોલ્યુશન આ ઈ-મેઈલ સરનામુ તમને સર્વર સાથે સત્તાધિકરણ કરવામાં વાપરશે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "શક્ય શોધ આધારો શોધો"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "પ્રવેશ (_g):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "ક્યારેય નહિ"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "કોઈ એનક્રિપ્શન નથી"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "એક"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL એનક્રિપ્શન"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "શોધ ગાળક"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "શોધનો આધાર (_b):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "શોધ ગાળક (_f):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "શોધ ગાળક"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1127,7 +1126,7 @@ msgstr ""
 "શોધ ગાળક એ શોધવા માટેનો ઓબ્જેક્ટનો પ્રકાર છે, જ્યારે શોધ કરી રહ્યા હોઈએ ત્યારે. જો આ "
 "સુધારાયેલ નહિં હોય, તો મૂળભૂત રીતે \"વ્યક્તિ\" પ્રકારના ઓબ્જેક્ટ ક્લાસ પર શોધ થશે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1135,7 +1134,7 @@ msgstr ""
 "આ વિકલ્પ પસંદ કરવાનું એટલે કે ઈવોલ્યુશન માત્ર તમારા LDAP સર્વર સાથે જોડાશે જો તમારું LDAP "
 "સર્વર SSL ને આધાર આપે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1143,7 +1142,7 @@ msgstr ""
 "આ વિકલ્પને પસંદ કરવાનું એટલે કે ઈવોલ્યુશન એ માત્ર તમારા LDAP સર્વર સાથે જોડાશે જો તમારું "
 "LDAP સર્વર એ TLS ને આધાર આપે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../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 "
@@ -1153,23 +1152,23 @@ msgstr ""
 "અર્થ એ થાય કે તમારું જોડાણ અસુરક્ષિત રહેશે, અને તમે સુરક્ષા ભંગાણો નબળા પાડવા માટે જવાબદા "
 "હશો."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "ઉપ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "આધારભૂત શોધના આધારો"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS એનક્રિપ્શન"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 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 "
@@ -1178,7 +1177,7 @@ msgstr ""
 "શોધ આધાર એ પ્રવેશનું વિસ્તૃત નામ (DN) છે કે જ્યાં તમારી શોધો શરૂ થશે. જો તમે આને ખાલી છોડી "
 "મૂકો, તો શોધ ડિરેક્ટરી વૃક્ષના મૂળથી શરૂ થશે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 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 "
@@ -1189,13 +1188,13 @@ msgstr ""
 "તમારી શોધના આધારની નીચેના બધા પ્રવેશો માટે શોધે છે. \"one\" ની શોધની હદ તમારી "
 "શોધના આધારની નીચેના એક સ્તરના પ્રવેશ સુધી જ શોધે છે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "આ તમારા ldap સર્વરનું પૂરું નામ છે. ઉદાહરણ તરીકે, \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1203,7 +1202,7 @@ msgstr ""
 "આ ડાઉનલોડ કરવા માટેના પ્રવેશોની મહત્તમ સંખ્યા છે. આ સંખ્યાને ખૂબ મોટી સંખ્યા સાથે સુયોજિત "
 "કરવાનું તમારી સરનામાપોથીને ધીમી કરી દેશે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1212,7 +1211,7 @@ msgstr ""
 "આ પદ્ધતિ તમારું સત્તાધિકરણ કરવા માટે ઈવોલ્યુશન વાપરશે.  નોંધ કરો કે આને \"ઈમેઈલ સરનામું\" "
 "માં સુયોજિત કરવાને તમારા ldap સર્વર સાથેના અનામિક વપરાશની જરૂર છે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1220,7 +1219,7 @@ msgstr ""
 "આ એ સર્વરનું નામ છે કે જે તમારા ઈવોલ્યુશન ફોલ્ડરની યાદીમાં દેખાશે. એ માત્ર પ્રદર્શન કરવા "
 "માટે જ છે. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 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 "
@@ -1230,75 +1229,75 @@ msgstr ""
 "યાદી પૂરી પાડવામાં આવેલ છે. તમારા સિસ્ટમ સંચાલકને પૂછો કે તમારા માટે કયો પોર્ટ સ્પષ્ટ "
 "કરાયેલ છે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "અલગ તારવેલ નામ (DN) વાપરી રહ્યા છીએ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "ઈ-મેઈલ સરનામુ વાપરી રહ્યા છીએ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "જ્યારે પણ શક્ય હોય ત્યારે"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "સરનામાપોથી ઉમેરો (_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "ડાઉનલોડની મર્યાદા (_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "શક્ય શોધના આધારો શોધો (_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "પ્રવેશ પદ્ધતિ (_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "નામ (_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "પોર્ટ (_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "શોધની હદ (_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "સર્વર (_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "સમય સમાપ્ત (_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "સુરક્ષિત જોડાણ વાપરો (_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "પત્રો"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "મિનિટો"
 
@@ -1339,7 +1338,7 @@ msgid "<b>Work</b>"
 msgstr "<b>કાર્ય</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1351,16 +1350,16 @@ msgid "Ca_tegories..."
 msgstr "વર્ગો (_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "સંપર્ક"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "સંપર્ક સંપાદક"
 
@@ -1373,7 +1372,7 @@ msgid "Image"
 msgstr "ઈમેજ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN સંદેશાવાહક"
 
@@ -1386,7 +1385,7 @@ msgid "Nic_kname:"
 msgstr "લાડકુ નામ (_k):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "નોવેલ જૂથ પ્રમાણે"
 
@@ -1400,11 +1399,11 @@ msgstr "ટેલિફોન"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "કાર્ય"
 
@@ -1426,7 +1425,7 @@ msgid "_Birthday:"
 msgstr "જન્મ દિવસ (_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
@@ -1516,1119 +1515,1121 @@ msgstr "ક્યાં (_W):"
 msgid "_Zip/Postal Code:"
 msgstr "ઝીપ/પોસ્ટલ કોડ (_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "સરનામું"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "ફેરફાર કરી શકાય તેવું"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "United States"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "અફઘાનિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "અલ્બેનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "અલ્જેરિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "અમેરિકન સમોઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "અન્ડોરા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "અન્ગોલા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "અન્ગ્યુલા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "એન્ટર્કટિકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "એન્ટીગ્યુઆ અને બર્બ્યુડાુડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "આર્જેન્ટિના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "અર્મેનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "અરુબા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "ઓસ્ટ્રેલિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "ઓસ્ટ્રિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "અઝર્બેઈજાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "બાહામસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "બહેરિન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "બાંગ્લાદેશ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "બાર્બાડોસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "બેલરુસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "બેલ્જિયમ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "બેલાઈઝ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "બેનીન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "બેરમ્યુડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "ભુતાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "બોલીવિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "બોસ્નીયા અને હર્ઝેગોવિના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "બોટ્સવાના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "બાઉવેટ ટાપુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "બ્રાઝિલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "બ્રિટિશ ભારતીય ઓસન ફરવાનું સ્થળ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "બ્રુનેઈ દારુસલામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "બલ્ગેરિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "બર્કિના ફાસો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "બુરુન્દી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "કમ્બોડિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "કેમેરુન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "કેનેડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "કેપ વર્ડે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "કેમેન ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "સેન્ટ્રલ આફ્રિકન રીપબ્લીક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "ચાડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "ચાઈલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "ચીન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "ક્રિસમસ ટાપુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "કોકોસ (કીલીંગ) ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "કોલમ્બિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "કોમોરોસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "કોન્ગો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "કોન્ગો, નું સામ્યવાદી સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "કુક ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "કોસ્ટા રીકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "કોટ ડીવોર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "ક્રોટીઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "ક્યુબા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "સાયપ્રસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "ચેક સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "ડેન્માર્ક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "ડીજીબોટી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "ડોમિનીકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "ડોમિનીકન સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "ઈક્વેડર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "ઈજીપ્ત"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "El સેલ્વેડોર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "ઈક્વીટોરીયલ જીનેઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "એરીટ્રીઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "ઈસ્ટોનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "ઈથીઓપિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "ફોલ્કલેન્ડ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "ફેરો ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "ફીજી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "ફિનલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "ફ્રાંસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "ફ્રેંચ જીનેઆના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "ફ્રેંચ પોલિનેસિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "ફરવાના ફ્રેંચ દક્ષિણિ સ્થળો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "ગેબન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "ગામ્બિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "જ્યોર્જિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "જર્મની"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "ઘાના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "ગીબ્રાલ્ટાર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "ગ્રીસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "ગ્રીનલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "ગ્રીનાડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "ગ્યુએડીલોપ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "ગૌમ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "ગ્યુએટમાલા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "જ્યુર્નસે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "જ્યુએનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "જ્યુએનિયા-બિસાઉ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "ગાયાના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "હાઈટી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "હર્ડ અને મેકડોનલ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "હોલી સમુદ્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "હોન્ડુરાસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "હોંગ કોંગ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "હંગરી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "ટાપુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "ભારત"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "ઈન્ડોનેશિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "ઈરાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "ઈરાક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "આર્યલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "ઈસલ ઓફ મેન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "ઈઝરાયલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "ઈટાલી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "જમાઈકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "જાપાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "જર્સી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "જોર્ડન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "કઝાકિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "કેન્યા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "કિરીબાટી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "કોરીયા, સામ્યવાદી લોકોની સ્વતંત્રતા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "કોરીયા, નું સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "કુવૈત"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "કેર્ગીઝ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "લાઓસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "લાટવિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "લેબનોન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "લેસોથો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "લાઈબેરીયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "લિબ્યા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "લીચટેન્સ્ટેન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "લીથુઆનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "લુક્ઝેમ્બર્ગ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "મેકાઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "મેકેડોનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "મડાગાસ્કાર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "માલાવી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "મલેશિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "માલદીવ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "માલી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "માલ્ટા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "માર્શલ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "માર્ટીનીક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "મૌરીટાનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "મોરેશિયસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "મેયોટે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "મેક્સિકો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "માઈક્રોનેશિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "માેલડોવા, નું સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "મોનેકો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "મોંગોલિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "મોન્ટસેરાટ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "મોરોક્કો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "મોઝામ્બિક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "મ્યાનમાર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "નામિબિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "નૌરુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "નેપાળ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "નેધરલેન્ડઝ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "નેધરલેન્ડઝ એન્ટાઈલીસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "નવુ કેલેડોનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "ન્યુઝીલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "નાઈકારાગુઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "નાઈજર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "નાઈજીરીયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "નીયુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "નોર્ફોલ્ક ટાપુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "ઉત્તરી મારીઆના ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "નોર્વે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "ઓમાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "પાકિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "પાલાઉ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "ફરવાનું સ્થળ પેલેસ્ટિયન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "પનામા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "પપુઆ ન્યુ જીનેઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "પેરાગ્યુઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "પેરુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "ફિલિપાઈન્સ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "પિટકેર્ન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "પોલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "પોર્ટુગલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "પ્યુએર્ટો રેકો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "કતાર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "રીયુનિયન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "રોમાનિઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "રશિયાઈ ફીડરેશન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "ર્વાન્ડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "કીટ્સ અને નેવીસ સંત"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "સંત લ્યુસીઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "સંત વિન્સન્ટ અને ગ્રેના ડાઈન્સ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "સમાેઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "સન મારીનો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "સાઓ ટોમ અને પ્રિન્સાઈપ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "સાઉદી અરેબિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "સિનેગલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "સર્બિયા અને મોન્ટેનેગ્રો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "સીચેલેસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "સીરા લીઓન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "સિંગાપોર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "સ્લોવેકિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "સ્લોવેનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "સોલોમન ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "સોમાલિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "દક્ષિણ આફ્રિકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "દક્ષિણ જ્યોર્જિયા અને દક્ષિણ સેન્ડવીચ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "સ્પેન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "શ્રીલંકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "સંત હેલેના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "સંત પીએરા અને મિકેલન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "સુદાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "સુરીનામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "સ્વાલબર્ડ અને જન મેયેન ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "સ્વાઝીલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "સ્વીડન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "સ્વીઝ્ઝરલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "સીરીયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "તાઈવાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "તજીકિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "તાન્ઝાનિયા, યુનાઈટેડનું સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "થાઈલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "ટાઈમોર-લેસ્તે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "ટોગો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "તોકેલાઉ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "ટોન્ગા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "ટ્રીનીદાદ અને ટોબેગો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "તનીસિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "તુર્કી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "તુર્કમેનિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "તુર્કો અને કેઈકોસ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "તુવાલુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "યુગાન્ડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "યુક્રેઈની"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "યુનાઈટેડ આરબ અમીરાતો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "યુનાઈટેડ કિંગડમ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "યુનાઈટેડ સ્ટેટ્સ માઈનોર આઉટલાઈંગ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "ઉરુગ્વે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "ઉઝ્બેકિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "વેનુએટુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "વેનેઝુએલા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "વયેટનામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "વર્જિન ટાપુઓ, બ્રિટિશ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "વર્જિન ટાપુઓ, U.S."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "વેલિસ અને ફ્યુટુના ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "પશ્ચિમિ સહારા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "યેમાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "ઝામ્બિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "ઝિમ્બાબ્વે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "નામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL તુરંત સંદેશાવાહક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "જેબર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "યાહુ મેસેન્જર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu સંદેશાવાહક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "સેવા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "જગ્યા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "વપરાશકર્તાનું નામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "ઘર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "બીજા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "યાહુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "જૂથ પ્રમાણે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "સ્રોત ચોપડી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "લક્ષ્ય ચોપડી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "નવો સંપર્ક છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "લખી શકાય તેવા ક્ષેત્રો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "જરૂરી ક્ષેત્રો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "બદલાયેલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "સંપર્ક સંપાદક - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "મહેરબાની કરીને આ સંપર્ક માટે ચિત્ર પસંદ કરો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "કોઈ ચિત્ર નથી (_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2636,47 +2637,47 @@ msgstr ""
 "સંપર્ક માહિતી અયોગ્ય છે:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' નું બંધારણ અયોગ્ય છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' નું બંધારણ અયોગ્ય છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ખાલી છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "અયોગ્ય સંપર્ક."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "સંપર્ક ઝડપી-ઉમેરો"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "સંપૂર્ણ ફેરફાર કરો (_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "પુરૂં નામ (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "ઈમેઈલ (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "સરનામા પુસ્તિકા પસંદ કરો (_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2685,7 +2686,7 @@ msgstr ""
 "શું તમે ખરેખર સંપર્ક યાદી (%s)\n"
 "કાઢી નાંખવા માંગો છો?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2693,7 +2694,7 @@ msgstr ""
 "શું તમે ખરેખર આ સંપર્ક યાદીઓ\n"
 "દૂર કરવા માંગો છો?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2702,7 +2703,7 @@ msgstr ""
 "શું તમે ખરેખર સંપર્ક (%s)\n"
 "કાઢી નાંખવા માંગો છો?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2844,12 +2845,17 @@ msgstr "નીચેની યાદીમાંથી સંપર્ક ખે
 msgid "Contact List Members"
 msgstr "સંપર્ક સભ્યોની યાદી"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "સભ્યો (_M)"
+
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "ચોપડી"
 
@@ -2857,10 +2863,6 @@ msgstr "ચોપડી"
 msgid "Is New List"
 msgstr "એ નવી યાદી છે"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "સભ્યો (_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "બદલાયેલ સંપર્ક:"
@@ -2898,40 +2900,40 @@ msgstr ""
 "આ સંપર્કનું નામ અથવા ઈ-મેઈલ સરનામું પહેલાથી જ આ\n"
 "ફોલ્ડરમાં હાજર છે. શું તમે એને કોઈપણ રીતે ઉમેરવા માંગો છો?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "સંપર્ક ભેગા કરો"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "ભેગું કરો (_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "સંપર્ક ભેગા કરો"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "ઈ-મેઈલ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "કોઈ ક્ષેત્ર સમાવે છેે"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "ઈ-મેઈલ આની સાથે શરુ થાય છે"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "નામ આની સાથે શરુ થાય છે"
+msgid "Name contains"
+msgstr "નામ સમાવે છે"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2946,9 +2948,9 @@ msgstr[1] "%d સંપર્કો"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "પ્રશ્ન"
 
@@ -2959,9 +2961,9 @@ msgstr "પુસ્તક દેખાવ મેળવવામાં ભૂલ
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "મોડેલ"
 
@@ -2969,107 +2971,109 @@ msgstr "મોડેલ"
 msgid "Error modifying card"
 msgstr "કાર્ડ સુધારતી વખતે ભૂલ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "નામ આની સાથે શરુ થાય છે"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "સ્રોત"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "પ્રકાર"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "vCard તરીકે સંગ્રહો..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1363
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ખોલો (_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "નવો સંપર્ક (_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "નવી સંપર્ક યાદી (_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "vCard તરીકે સંગ્રહો (_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "સંપર્ક આગળ ધપાવો (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "સંપર્કો આગળ ધપાવો (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "સંપર્કને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "યાદીને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "સંપર્કોને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "છાપો (_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "સરનામા પુસ્તિકામાં નકલ કરો (_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "સરનામા પુસ્તિકામાં ખસેડો (_v)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "કાપો (_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "નકલ કરો (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "ચોંટાડો (_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "કોઈપણ વર્ગ"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "બીજી ભૂલ"
 
@@ -3104,7 +3108,7 @@ msgstr "ગાડીનો ફોન"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3205,9 +3209,9 @@ msgid "Radio"
 msgstr "રેડિયો"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "ભૂમિકા"
 
@@ -3243,38 +3247,38 @@ msgid "Web Site"
 msgstr "વેબ સાઈટ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "પહોળાઈ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "ઊંચાઈ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "નો ફોકસ"
 
@@ -3294,11 +3298,21 @@ msgstr "લખાણ મોડેલ"
 msgid "Max field name length"
 msgstr "ક્ષેત્રના નામની મહત્તમ લંબાઈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "સ્તંભની પહોળાઈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"સંપર્કો માટે શોધી રહ્યા છે..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3312,7 +3326,7 @@ msgstr ""
 "\n"
 "અથવા નવો સંપર્ક બનાવવા માટે બવડું-ક્લિક કરો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3326,7 +3340,7 @@ msgstr ""
 "\n"
 "નવો સંપર્ક બનાવવા માટે અંહિ બે વાર ક્લિક કરો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3336,7 +3350,7 @@ msgstr ""
 "\n"
 "સંપર્ક માટે શોધો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3346,40 +3360,41 @@ msgstr ""
 "\n"
 "આ દેખાવમાં જોવા માટે કોઈ વસ્તુઓ નથી."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "એડેપ્ટર"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "કામનો ઈ-મેઈલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "ઘરનો ઈમેઈલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "અન્ય ઈમેઈલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "પસંદ કરેલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "ને કર્સર"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "કડીને બ્રાઉઝરમાં ખોલો (_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "કડીની જગ્યાની નકલ કરો (_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "ના પ્રતિ નવો સંદેશો મોકલો (_S)..."
 
@@ -3401,7 +3416,7 @@ msgid "map"
 msgstr "નકશો"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "સભ્યોની યાદી"
 
@@ -3422,15 +3437,15 @@ msgid "Video Chat"
 msgstr "વિડીયો સંવાદ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3439,8 +3454,7 @@ msgstr "કેલેન્ડર"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "મુક્ત/વ્યસ્ત"
 
@@ -3462,125 +3476,127 @@ msgid "Web Log"
 msgstr "વેબ લોગ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2327
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "જન્મદિવસ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2328
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "વર્ષગાંઠ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "કામનું શીર્ષક"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "ઘર પાનું"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "બ્લોગ"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "સફળતા"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "પાશ્વ ભાગ વ્યસ્ત છે"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "રીપોઝીટરી ઓફલાઈન"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "સરનામા પોથી અસ્તિત્વમાં નથી"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "પરવાનગી નથી"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "સંપર્ક મળ્યો નથી"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "સંપર્ક ID પહેલાથી જ હાજર છે"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "પ્રોટોકોલને આધાર નથી"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "નકારાઈ ગયું"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "નકારી શકાયું નહિં"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "સત્તાધિકરણ નિષ્ફળ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "સત્તાધિકરણ જરુરી છે"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS ઉપલબ્ધ નથી"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "આવો કોઈ સ્રોત નથી"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "ઓફલાઈન સ્થિતિમાં ઉપલબ્ધ નથી"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "અયોગ્ય સર્વર આવૃત્તિ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3590,7 +3606,7 @@ msgstr ""
 "માટે ચિહ્નિત નથી અથવા ઓફલાઈન વપરાશ માટે હજુ સુધી ડાઉનલોડ થયેલ નથી. મહેરબાની કરીને "
 "સરનામા પુસ્તિકાના સમાવિષ્ટો ડાઉનલોડ કરવા માટે તેને એકવાર ઓનલાઈન સ્થિતિમાં લાવો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3599,7 +3615,7 @@ msgstr ""
 "અમે આ સરનામાપોથી ખોલવા માટે સમર્થ ન હતા.  મહેરબાની કરીને ચકાસો કે પથ છે %s અસ્તિત્વમાં "
 "છે અને તમારી પાસે તેને ચલાવવાની પરવાનગી છે કે નહિં."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3607,7 +3623,7 @@ msgstr ""
 "અમે આ સરનામાપોથી ખોલવા માટે સમર્થ નથી. એનો અર્થ એ થાય કે તમે ખોટી URI દાખલ કરી હશે, "
 "અથવા LDAP સર્વર પહોંચી શકાય એમ નથી."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 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 "
@@ -3616,7 +3632,7 @@ msgstr ""
 "ઈવોલ્યુશનની આવૃત્તિ પાસે તેમાં કમ્પાઈલ થયો હોય તેવો LDAP નો આધાર નથી. જો તમે LDAP "
 "ઈવોલ્યુશનમાં વાપરવા માંગતા હોય, તો તમારે LDAP-સક્રિય ઈવોલ્યુશન પેકેજ સ્થાપિત કરવું જ જોઈએ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3624,7 +3640,7 @@ msgstr ""
 "અમે આ સરનામાપોથી ખોલવા અસમર્થ છે. એનો અર્થ એ થાય કે તમેખોટી URI દાખલ કરી છે, અથવા "
 "સર્વર પહોંચી શકાય એમ નથી."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3636,7 +3652,7 @@ msgstr ""
 "મહેરબાની કરીને ખાતરી કરો કે તમારી શોધ વધુ ચોક્કસ અથવા ડિરેક્ટરી \n"
 "સર્વરમાં પરિણામ વધારે આ સરનામાપોથી માટે."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 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"
@@ -3648,45 +3664,45 @@ msgstr ""
 "શોધ વધુ ચોક્કસ બનાવો અથવા આ સરનામાપોથી માટે \n"
 "ડિરેક્ટરી સર્વર પસંદગીઓની સમય મર્યાદા વધારો."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "આ સરનામાપોથી માટેનો પાશ્વ ભાગ આ પ્રશ્નનું પદચ્છેદન કરવા માટે અસમર્થ છે."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "આ સરનામાપોથી માટેનો પાશ્વ ભાગ આ પ્રશ્ન ઉકેલવા માટે સહમત નથી."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
 msgstr "આ પ્રશ્ન સફળતાપૂર્વક પૂર્ણ થયો નહિં."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
 msgstr "યાદી ઉમેરવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 #: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "સંપર્ક ઉમેરવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "યાદી સુધારવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "સંપર્ક સુધારવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "યાદી કાઢી નાંખવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 #: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "સંપર્ક કાઢી નાંખવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3701,16 +3717,16 @@ msgstr[1] ""
 "%d સંપર્કો ખોલવાનું %d નવી વિન્ડો ખોલવા જેવું જ છે.\n"
 "શું તમે ખરેખર આમાંના બધા સંપર્કો જોવા માંગો છો?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "દર્શાવો નહિં (_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "બધા સંપર્કો દર્શાવો (_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3719,7 +3735,7 @@ msgstr ""
 "%s પહેલાથી જ હાજર છે\n"
 "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "ઉપર ફરીથી લખો"
 
@@ -3762,27 +3778,27 @@ msgstr "સંપર્કોને અંહિ ખસેડો"
 msgid "Copy contacts to"
 msgstr "સંપર્કોની નકલ અંહિ કરો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "ઘણાબધા vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "vCard for %s"
 msgstr "%s માટે vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, c-format
 msgid "Contact information"
 msgstr "સંપર્ક જાણકારી"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s માટે સંપર્ક જાણકારી"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "સરનામાપોથીને પ્રશ્ન પૂછી રહ્યા છીએ..."
 
@@ -3810,43 +3826,43 @@ msgstr "સરનામાપોથીમાં સંગ્રહો"
 msgid "Card View"
 msgstr "કાર્ડ દેખાવ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "આયાત કરી રહ્યા છીએ..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "આઉટલુક CSV અથવા ટેબ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "આઉટલુક CSV અને ટેબ આયાત કરનાર"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "મોઝિલ્લા CSV અથવા ટેબ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "મોઝિલ્લા CSV અને ટેબ આયાત કરનાર"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ઈવોલ્યુશન CSV અથવા ટેબ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "ઈવોલ્યુશન CSV અને ટેબ આયાત કરનાર"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "ઈવોલ્યુશન LDIF આયાત કરનાર"
 
@@ -3899,11 +3915,11 @@ msgid "Format"
 msgstr "બંધારણ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "હેડર"
@@ -4006,7 +4022,7 @@ msgstr "છાયા"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4025,7 +4041,7 @@ msgid "Top:"
 msgstr "ઉપર:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "પ્રકાર:"
 
@@ -4129,11 +4145,21 @@ msgstr "બેકાબુ ભૂલ"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr "'{0}' એ માત્ર-વાંચી શકાય તેવો કેલેન્ડર સ્રોત છે. કેલેન્ડર દેખાવમાં બદલો અને કેલેન્ડર પ્રકાશિત કરો કે જે મુલાકાતો સ્વીકારી શકે."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+#, fuzzy
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"'{0}' એ માત્ર-વાંચી શકાય તેવો કેલેન્ડર સ્રોત છે. કેલેન્ડર દેખાવમાં બદલો અને કેલેન્ડર પ્રકાશિત "
+"કરો કે જે મુલાકાતો સ્વીકારી શકે."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4141,7 +4167,7 @@ msgstr ""
 "તમારી મુલાકાતને અર્થવાળો સાર ઉમેરવાનું તમારા મેળવનારાઓને ખબર પાડશે કે તમારી મુલાકાત શેના "
 "વિશે છે."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4149,271 +4175,275 @@ msgstr ""
 "તમારી બાબતને અર્થવાળો સાર ઉમેરવાનું તમારા મેળવનારાઓને ખબર પાડશે કે તમારી બાબત શેના વિશે "
 "છે."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "આ મેમોની બધી જાણકારી કાઢી નંખાશે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "આ મેમોની બધી જાણકારી કાઢી નાંખવામાં આવશે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "આ મુલાકાતો બધી જાણકારી કાઢી નંખાશે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "આ બાબતોની બધી જાણકારી કાઢી નંખાશે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "આ મુલાકાતની બધી જાણકારી કાઢી નાંખવામાં આવે છે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "આ મંત્રણાની બધી જાણકારી કાઢી નાંખવામાં આવેલ છે અને ફરીથી સંગ્રહી શકાતી નથી."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "આ મેમોની બધી જાણકારી કાઢી નાંખવામાં આવેલ છે અને ફરીથી સંગ્રહી શકાતી નથી."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "આ બાબતની બધી જાણકારી કાઢી નંખાયેલ છે અને ફરીથી સંગ્રહી શકાતી નથી."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "શું તમે ખરેખર બાબત '{0}' કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "શું તમે ખરેખર '{0}' શીર્ષકવાળી મુલાકાત કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "શું તમે ખરેખર મેમો '{0}' કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "શું તમે ખરેખર {0} મુલાકાતો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "શું તમે ખરેખર આ {0} મેમો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "શું તમે ખરેખર આ {0} બાબતો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "શું તમે ખરેખર આ મુલાકાત કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "શું તમે ખરેખર આ મંત્રણા કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "શું તમે ખરેખર આ મેમો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "શું તમે ખરેખર આ બાબત કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "શું તમે ખરેખર સાર વિના મેમો સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "શું તમે ખરેખર મુલાકાત સાર વિના મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "શું તમે ખરેખર બાબર સાર વિના મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "નવી ઘટના બનાવી શકતા નથી"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "ઘટનાનો સંગ્રહ કરી શકતા નથી"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "શું કેલેન્ડર {૦} કાઢી નાંખવું છે?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "શું મેમો યાદી '{0}' કાઢી નાંખવી છે?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "શું બાબત યાદી '{૦}' કાઢી નાંખવી છે?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "મોકલો નહિં (_n)"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ડાઉનલોડ પ્રગતિમાં છે. શું તમે મુલાકાત સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ડાઉનલોડ પ્રગતિમાં છે. શું તમે બાબત સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "સંપાદક લોડ કરી શકાયું નહિં."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "ઈ-મેઈલનું આમંત્રણ બધા સ્પર્ધકોને મોકલવામાં આવે છે અને તેમને આ બાબત સ્વીકારવાની પરવાનગી આપે છે."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "ઈ-મેઈલ આમંત્રણો બધા સ્પર્ધકોને મોકલવામાં આવશે અને તેમને પ્રત્યુત્તર કરવાની પરવાનગી આપશે."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "કેલેન્ડર લાવતી વખતે ભૂલ"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "મેમો યાદી લાવવામાં ભૂલ"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "બાબત યાદી લાવવામાં ભૂલ"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "જો તમે નકારાત્મક સૂચન મોકલો નહિં, તો બીજા સ્પર્ધકોને ખબર નહિં પડે કે મંત્રણા રદ થઈ ગઈ છે."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "જો તમે નકારાત્મક સૂચન મોકલો નહિં, તો બીજા સ્પર્ધકોને ખબર નહિં પડે કે મેમો કાઢી નંખાયેલ છે."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "જો તમે નકારાત્મક સૂચન મોકલો નહિં, તો બીજા સ્પર્ધકોને ખબર નહિં પડે કે બાબત કાઢી નંખાયેલ છે."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "સુધારેલી જાણકારી સ્પર્ધકોને મોકલવાથી તેઓ પોતાના કેલેન્ડર પર રાખી શકે છે."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "સ્પર્ધકોને સુધારેલી જાણકારી મોકલવાથી તેઓ પોતાની બાબતોની યાદી સાચવી શકે છે."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "અમુક જોડાણો ડાઉનલોડ થઈ ગયા છે. મુલાકાત સંગ્રહવાનું આ જોડાણો ગુમાવવામાં પરિણમશે."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "અમુક જોડાણો ડાઉનલોડ થઈ ગયા છે. બાબત સંગ્રહવાનું આ જોડાણોના ગુમાવવામાં પરિણમશે."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "તમારા વર્તમાન સર્વર સાથે અમુક લક્ષણો યોગ્ય રીતે કામ કરશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ઈવોલ્યુશન કેલેન્ડરમાંથી અનિચ્છનિય રીતે બહાર નીકળી ગયા."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ઈવોલ્યુશન મેમો અનિચ્છનીય રીતે બંધ થઈ ગયું."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ઈવોલ્યુશન બાબતો અનિચ્છનિય રીતે બહાર નીકળી ગઈ."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "કેલેન્ડર એ ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "મેમો યાદી ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "મેમો યાદી ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "બાબત યાદી એ ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "આ કેલેન્ડર કાયમ માટે દૂર થઈ જશે."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "મેમો યાદી કાયમ માટે દૂર થઈ જશે."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "આ બાબત યાદી કાયમ માટે દૂર થઈ જશે."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "શું તમે આ મુલાકાતના બદલાવો સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "શું તમે તમારા ફેરફારો આ મેમોમાં સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "શું તમે આ બાબતના તમારા બદલાવો સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "શું તમે આ મેમો માટે નકારાત્મક સૂચન મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "શું તમે બધા સ્પર્ધકોને નકારાત્મક સૂચન મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "શું તમે મંત્રણાનું આમંત્રણ સ્પર્ધકોને મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "શું તમે આ બાબત સ્પર્ધકોને મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "શું તમે મંત્રણાની સુધારાયેલ જાણકારી સ્પર્ધકોને મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "શું તમે સુધારેલી બાબતની જાણકારી સ્પર્ધકોને મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4422,107 +4452,106 @@ msgstr ""
 "તમે બિનઆધારભૂત જૂથપ્રમાણે સર્વર સાથે જોડાઈ રહ્યા છો અને ઈવોલ્યુશન વાપરતી વખતે સમસ્યાઓ "
 "અનુભવશો. શ્રેષ્ઠ પરિણામો માટે, સર્વર એ આધારભૂત આવૃત્તિમાં સુધારાવું જોઈએ."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "તમે આ મુલાકાત બદલી નાંખી છે, પરંતુ હજુ સંગ્રહી નથી."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "તમે આ બાબતમાં ફેરફારો કર્યા છે, પરંતુ હજુ સંગ્રહ્યા નથી."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "તમે આ મેમોમાં ફેરફારો કર્યા છે, પરંતુ તેમને હજુ સુધી સંગ્રહ્યા નથી."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "તમારા કેલેન્ડરો જ્યાં સુધી ઈવોલ્યુશન ફરીથી ચાલુ નહિં થાય ત્યાં સુધી ઉપલબ્ધ નહિં હોય."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "તમારા મેમો ઈવોલ્યુશન પુનઃશરૂ થાય નહિં ત્યાં સુધી ઉપલબ્ધ રહેશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "જ્યાં સુધી ઈવોલ્યુશન ફરીથી ચાલુ નહિં થાય ત્યાં સુધી તમારી બાબતો ઉપલબ્ધ નહિં હોય."
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "ફેરફારો અવગણો (_D)"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "સંગ્રહો (_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "ફેરફારો સંગ્રહો (_S)"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "મોકલો (_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "સૂચન મોકલો (_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "ઘણા બધા દિવસોની બાબતો છુટી પાડો:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "ઈવોલ્યુશન-માહિતી-સર્વર ચાલુ કરી શકાયુ નહિં"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "પાયલોટનો કેલેન્ડર કાર્યક્રમ બ્લોક વાંચી શક્યા નથી"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "પાયલોટનો મેમો કાર્યક્રમ બ્લોક વાંચી શક્યા નહિં"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "પાયલોટનો મેમો કાર્યક્રમ બ્લોક લખી શક્યા નહિં"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "મૂળભુ પ્રાધાન્ય:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "પાયલોટના કરવાના કાર્યક્રમોનો બ્લોક વાંચી શકાયો નથી"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "પાયલોટનો કરવાનો કાર્યક્રમ બ્લોક લકી શક્યા નહિં"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "કેલેન્ડર અને બાબતો"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "કેલેન્ડરો"
 
@@ -4563,25 +4592,25 @@ msgid "Memo_s"
 msgstr "મેમો (_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "મેમો"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "બાબતો"
@@ -4599,25 +4628,25 @@ msgstr "બાબતો (_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ઈવોલ્યુશન કેલેન્ડર એલાર્મ સૂચન સેવા"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "મિનિટ"
 msgstr[1] "મિનિટો"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "કલાકો"
 msgstr[1] "કલાકો"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "શરૂઆતનો સમય"
 
@@ -4628,9 +4657,9 @@ msgstr "મુલાકાતો"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "સ્થળ:"
@@ -4640,17 +4669,15 @@ msgid "Snooze _time:"
 msgstr "પુનરાવર્તન સમય (_t):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "ફેરફાર કરો (_E)"
 
@@ -4662,32 +4689,32 @@ msgstr "પુનરાવર્તન (_S)"
 msgid "location of appointment"
 msgstr "મુલાકાતનું સ્થાન"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "કોઈ સાર ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "કોઈ વર્ણન ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "કોઈ જગ્યા જાણકારી ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "તમારી પાસે %d એલાર્મો છે"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "ચેતવણી"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4699,7 +4726,7 @@ msgstr ""
 "ઈ-મેઈલ મોકલવા સાથે રુપરેખાંકિત થયો નથી. ઈવોલ્યુશન\n"
 "સામાન્ય રીમાઈન્ડર સાથે સંવાદ બોક્સ પ્રદર્શિત થશે."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4716,15 +4743,15 @@ msgstr ""
 "\n"
 "શું તમે ખરેખર આ કાર્યક્રમ ચલાવવા માંગો છો?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "મને આ કાર્યક્રમ વિશે ફરીથી પૂછશો નહિં."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "બોનોબો શરુ કરી શક્યા નથી"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4735,7 +4762,7 @@ msgid "invalid time"
 msgstr "અયોગ્ય સમય"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4744,7 +4771,7 @@ msgstr[0] "%d કલાક"
 msgstr[1] "%d કલાકો"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4755,7 +4782,7 @@ msgstr[1] "%d મિનિટો"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4994,12 +5021,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં પરિસ્થિતિ ક્ષેત્ર બતાવો"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"પૂર્વદર્શન\" તકતી બતાવો"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"પૂર્વદર્શન\" તકતી બતાવો."
 
@@ -5175,66 +5202,66 @@ msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્ય�
 msgid "daylight savings time"
 msgstr "દિવસીય બચાવ સમય"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "સાર સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "વર્ણન સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "વર્ગ"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "ટિપ્પળી સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "સ્થાન સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "બંધબેસતા નથી"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "આગળના ૭ દિવસોની બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "સક્રિય બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "જતી રહેલ બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "સમાપ્ત થયેલ બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "જોડાણો સાથેની બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "સક્રિય મુલાકાતો"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "આગળના ૭ દિવસની મુલાકાતો"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "છાપો"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5243,16 +5270,16 @@ msgstr ""
 "આ પ્રક્રિયા પસંદ કરેલ સમય કરતાં જૂની બધી ઘટનાઓને કાયમ માટે કાઢી નાંખશે. જો તમે ચાલુ "
 "રાખો, તો તમે આ ઘટનાઓને ફરીથી મેળવી શકો નહિં."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "ના કરતાં જૂની ઘટનાઓ કાઢો"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:403
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "દિવસો"
 
@@ -5260,103 +5287,103 @@ msgstr "દિવસો"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "વેબ પર"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "જન્મદિવસો અને સાલગીરીઓ"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "હવામાન"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "નવું કેલેન્ડર (_N)"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "નકલ કરો (_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "ગુણધર્મો (_P)"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "કેલેન્ડરો સુધારવામાં નિષ્ફળ."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે કેલેન્ડર '%s' ખોલવા માટે અસમર્થ"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ત્યાં ઘટનાઓ અને મંત્રણાઓ બનાવવા ામટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "કેલેન્ડર સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "નવી મુલાકાત"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "મુલાકાત (_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "નવી મુલાકાત બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "નવી મંત્રણા"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "મંત્રણા (_e)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "નવી મંત્રણા મંજૂરી બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "નવી બધા દિવસની મુલાકાત"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "બધા દિવસની મુલાકાત (_p)"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "નવી બધા દિવસની મુલાકાત બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "નવું કેલેન્ડર"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "કેલેન્ડર (_n)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "નવું કેલેન્ડર બનાવો"
 
@@ -5377,15 +5404,220 @@ msgid "Month View"
 msgstr "મહિનાનો દેખાવ"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "કોઇપણ ક્ષેત્ર"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "જોડાણો"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "સભા ભરનાર"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "ધંધો"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "વર્ગ"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "વર્ગીકરણ"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "હરીફાઇ"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "વિશ્વાસજનક"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "વર્ણન"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "વર્ણન સમાવે છે"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "અસ્તિત્વમાં નથી"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "હાજર છે"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "માનીતાંઓ"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "ભેટો"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "લક્ષ્યો/ઉદ્દેશો"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "રજા"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "રજા કાર્ડો"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "વધારે માંગવાળા વાળા સંપર્કો"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "વિચારો"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "આન્તરરાષ્ટ્રીય"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "કી કસ્ટમર"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "વિવિધ"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "પછીના ૭ દિવસો"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "આયોજક"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "ફોન કોલો"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "ખાનગી"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "જાહેર"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "વળતર"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "સ્થિતિ"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "નિતિઓ"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "સાર"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "સાર સમાવે છે"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "વળતા જવાબો"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "સમય &amp; ખર્ચ"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "રાહ જોઈ રહ્યા છીએ"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "સમાવે છે"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "સમાવતું નથી"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "છે"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "એ નથી"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "કેલેન્ડર ખોલતી વખતે ભૂલ"
@@ -5398,11 +5630,11 @@ msgstr "કેલેન્ડર ખોલતી વખતે પદ્ધતિ
 msgid "Permission denied to open the calendar"
 msgstr "કેલેન્ડર ખોલવા માટે પરવાનગી નથી"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "અજ્ઞાત ભૂલ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "એલાર્મમાં ફેરફાર કરો"
 
@@ -5435,17 +5667,17 @@ msgid "Mes_sage:"
 msgstr "સંદેશો (_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "ધ્વનિ વગાડો"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "ચેતવણી દર્શાવો"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "કાર્યક્રમ ચલાવો"
 
@@ -5458,7 +5690,7 @@ msgid "Send To:"
 msgstr "ને મોકલો:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "ઈ-મેઈલ મોકલો"
 
@@ -5505,7 +5737,10 @@ msgstr "દરેક માટે વધારાનો સમય"
 msgid "hour(s)"
 msgstr "કલાક(ો)"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "મિનિટ(ો)"
 
@@ -5513,7 +5748,7 @@ msgstr "મિનિટ(ો)"
 msgid "start of appointment"
 msgstr "મુલાકાતની શરુઆત"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "ક્રિયા/ફેરબદલી"
 
@@ -5524,16 +5759,15 @@ msgstr "ઉમેરો (_d)"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "એલાર્મ"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "જોડાણનું આપોઆપ પ્રદર્શન સૂચવો (_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "ફાઈલો જોડો"
 
@@ -5599,8 +5833,8 @@ msgid "Display"
 msgstr "ડિસ્પ્લે"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "શુક્રવાર"
 
@@ -5615,8 +5849,8 @@ msgstr ""
 "દિવસો"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "સોમવાર"
 
@@ -5639,7 +5873,7 @@ msgstr ""
 "રવિવાર"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "રંગ પસંદ કરો"
 
@@ -5649,8 +5883,8 @@ msgid "S_un"
 msgstr "સુર્ય (_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "શનિવાર"
 
@@ -5667,8 +5901,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "તારીખ બતાવનારમાં અઠવાડિયાનો ક્રમાંક બતાવો (_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "રવિવાર"
 
@@ -5686,8 +5920,8 @@ msgid "Template:"
 msgstr "ટેમ્પલેટ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ગુરુવાર"
 
@@ -5701,14 +5935,14 @@ msgid "Time format:"
 msgstr "સમયનું બંધારણ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "મંગળવાર"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "બુધવાર"
 
@@ -5786,302 +6020,454 @@ msgstr "બુધ (_W)"
 msgid "before every appointment"
 msgstr "દરેક મુલાકાત પહેલા"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ઓફલાઈન પ્રક્રિયા માટે કેલેન્ડરના સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ઓફલાઈન પ્રક્રિયા માટે બાબત યાદી સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ઓફલાઈન પ્રક્રિયા માટે મેમો યાદી સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "રંગ (_o):"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "રંગ (_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "બાબત યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "મેમો યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "કેલેન્ડર ગુણધર્મો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "નવું કેલેન્ડર"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "બાબત યાદી ગુણધર્મો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "નવી કામ યાદી"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "મેમો યાદી ગુણધર્મો"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "નવી મેમો યાદી"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "આ બાબત કાઢી નંખાયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "આ બાબત કાઢી નંખાયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "આ મેમો કાઢી નંખાયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  તમે બદલાવો કર્યા છે. તે બદલાવો ભૂલી જાઓ અને સંપાદક બંધ કરો?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  તમે કોઈ ફેરફારો કર્યા નથી, સંપાદક બંધ કરવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "આ ઘટના પહેલાથી જ બદલાઈ ગઈ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "બાબત બદલાઈ ગયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "આ મેમો બદલાઈ ગયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  તમે ફેરફારો કર્યા છે. આ બદલાવો ભુલી જાવ અને સંપાદક સુધારો?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  તમે કોઈ ફેરફારો કર્યા નથી, સંપાદક સુધારવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "ચકાસણી ભૂલ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " પ્રતિ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (પૂર્ણ થયું "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "પૂર્ણ થયું "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (કારણે "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "કારણે "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "જોડાણ સંદેશો - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "જોડાયેલ સંદેશો"
 msgstr[1] "%d જોડાયેલ સંદેશાઓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "ખસેડો (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "ખેંચવાનું રદ કરો (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "જોડાણ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "ઓબ્જેક્ટ સુધારી શક્યા નથી"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "મુલાકાતમાં ફેરફાર કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "મંત્રણા - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "મુલાકાત - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "સોંપાયેલ બાબત - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "બાબત - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "મેમો - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "કોઈ સાર નથી"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "વર્તમાન વિન્ડો ખોલવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "પસંદ કરેલ લખાણને ક્લિપબોર્ડમાં નકલ કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "પસંદ કરેલ લખાણને ક્લિપબોર્ડમાં કાપો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "ઉપલબ્ધ મદદ જોવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "ક્લિપબોર્ડમાંથી લખાણ ચોંટાડો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "વર્તમાન વિન્ડો સંગ્રહવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "બધું લખાણ પસંદ કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "વર્ગીકરણ (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "ફાઈલ (_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "મદદ (_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "દાખલ કરો (_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "વિકલ્પો (_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "દેખાવ (_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "જોડાણ (_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "ફાઈલો જોડવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "વર્ગો (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "શું વર્ગો દર્શાવવા તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "ટાઈમ ઝોન (_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "શું ટાઈમ ઝોન દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "જાહેર (_b)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "જાહેર તરીકે વર્ગીકૃત કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "ખાનગી (_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "ખાનગી તરીકે વર્ગીકૃત કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "વિશ્વાસજનક (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "વિશ્વાસજનક તરીકે વર્ગીકૃત કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "ભૂમિકા ક્ષેત્ર (_o)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "શું ભૂમિકા ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "શું RSVP ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "પરિસ્થિતિ ક્ષેત્ર (_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "શું પરિસ્થિતિ ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "પ્રકાર ક્ષેત્ર (_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "શું સભાજન પ્રકાર ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "તાજેતરનો દસ્તાવેજ (_m)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "જોડો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> જોડાણ"
 msgstr[1] "<b>%d</b> જોડાણો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "જોડાણ પટ્ટી છુપાવો (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "જોડાણ પટ્ટી બતાવો (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "દૂર કરો (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "જોડાણ ઉમેરો (_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "જોડાણો બતાવો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "જોડાણ પટ્ટી બદલવા માટે સ્પેસ કી દબાવો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "મુલાકાતમાં ફેરફાર કરો"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "મંત્રણા - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "મુલાકાત - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "સોંપાયેલ બાબત - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "બાબત - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "મેમો - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "કોઈ સાર નથી"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "આ વસ્તુમાં કરેલા ફેરફારો રદ કરાશે જો સુધારો થાય તો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "વર્તમાન આવૃત્તિ વાપરવા માટે અસમર્થ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "સ્રોત ખોલી શક્યા નથી"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "અંતિમ મુકામ ખોલી શક્યા નથી"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "અંતિમ મુકામ માત્ર વાંચી શકાય તેવું છે"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "શું બાકીના બધા મેળવનારાઓના મેઈલબોક્સમાંથી આ વસ્તુને કાઢી નાંખવી છે (_D)?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે ઘટના કાઢી શકાય નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે બાબત કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે મેમો કાઢી શક્યા નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે વસ્તુ કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr "પરવાનગી મળી નહિં આથી ઘટના કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "બાબત કાઢી શકાઈ નહિં કારણકે પરવાનગી નથી"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr "મેમો કાઢી શક્યા નહિં કારણકે પરવાનગી નથી"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr "વસ્તુ કાઢી શકાઈ નહિં કારણકે પરવાનગી નથી"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "ઘટના ભૂલને કારણે કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "ભૂલને કારણે બાબત કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "ભૂલને કારણે મેમો કાઢી શક્યા નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "ભૂલને કારણે વસ્તુ કાઢી શકાઈ નહિં"
 
@@ -6090,7 +6476,7 @@ msgid "Contacts..."
 msgstr "સંપર્કો..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "ને ડિલિગેટ:"
 
@@ -6098,135 +6484,181 @@ msgstr "ને ડિલિગેટ:"
 msgid "Enter Delegate"
 msgstr "ડિલિગેટ દાખલ કરો"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "એલાર્મ (_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "આ ઘટના માટે એલાર્મો સુયોજિત અથવા અસુયોજિત કરવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "વળતર (_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "આને રીકરીંગ ઘટના બનાવો"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "મોકલોના વિકલ્પો"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "અદ્યતન મોકલો વિકલ્પો દાખલ કરો"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "બધા દિવસની ઘટના (_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "શું બધા દિવસની ઘટના હોવી જોઈએ તે બદલે છે"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "સમયને વ્યસ્ત બતાવો (_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "શું સમયને વ્યસ્ત તરીકે બતાવો તે બદલે છે"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "મુક્ત/વ્યસ્ત (_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "સભાજનો માટે મુક્ત / વ્યસ્ત જાણકારીનો પ્રશ્ન પૂછો"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "મુલાકાત (_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "વળતર"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "આ ઘટનાને એલાર્મો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "આયોજક (_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "પ્રતિનિધિઓ (_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "સભાજનો (_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "શરુઆતની તારીખ વગરની ઘટના"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "અંતિમ તારીખ વગરની ઘટના"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "શરુઆતની તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "અંતિમ તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "શરુઆતનો સમય ખોટો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "અંતિમ સમય ખોટો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "પસંદ થયેલ આયોજકને લાંબા સમય સુધી ખાતુ મળશે નહિં."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "આયોજક જરુરી છે."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "ઓછામાં ઓછો એક સભા ભરનાર તો હોવો જ જોઈએ."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "ઉમેરો (_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "કેલેન્ડર '%s' ખોલી શકાય એમ નથી."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "તમે %s ના વતી કામ કરી રહ્યા છો"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "મુલાકાત પહેલાનો %d દિવસ"
 msgstr[1] "મુલાકાત પહેલાના %d દિવસો "
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "મુલાકાત પહેલાનો %d કલાક"
 msgstr[1] "મુલાકાત પહેલાના %d કલાકો"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "મુલાકાત પહેલાં %d મિનિટ"
 msgstr[1] "મુલાકાત પહેલાં %d મિનિટો"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "વૈવિધ્યપૂર્ણ બનાવો"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2011
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "કંઈ નહિં"
 
@@ -6298,28 +6730,24 @@ msgstr "આયોજક બદલો (_h)"
 msgid "Co_ntacts..."
 msgstr "સંપર્કો (_n)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "આયોજક"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "આયોજક:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "મેમો"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' માં મેમો ખોલવામાં અસમર્થ."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "પ્રતિ"
 
@@ -6337,58 +6765,58 @@ msgid "_Description:"
 msgstr "વર્ણન (_D):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "જૂથ (_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "તમે રીકરીંગ ઘટના સુધારી રહ્યા છો. તમે શું સુધારવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "તમે રીકરીંગ ઘટનાનું પ્રતિનિધિત્વ કરી રહ્યા છો. તમે શાનું પ્રતિનિધિત્વ કરવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "તમે રીકરીંગ બાબત સુધારી રહ્યા છો. તમે શું સુધારવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "તમે રીકરીંગ મેમો સુધારી રહ્યા છો. તમે શું સુધારવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "માત્ર આ જ ઘટકે"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "આ અને પહેલાની પળો"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "આ અને ભવિષ્યની પળો"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "બધી પળો"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "આ મુલાકાત વળતર કે જેમાં ઈવોલ્યુશન ફેરફાર કરી શકતું નથી તેને સમાવે છે."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "વળતરવની તારીખ અયોગ્ય છે"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "પર"
 
@@ -6396,7 +6824,7 @@ msgstr "પર"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "પ્રથમ"
 
@@ -6405,7 +6833,7 @@ msgstr "પ્રથમ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "દ્વિતિય"
 
@@ -6413,7 +6841,7 @@ msgstr "દ્વિતિય"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "તૃતિય"
 
@@ -6421,7 +6849,7 @@ msgstr "તૃતિય"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "ચતુર્થ"
 
@@ -6429,13 +6857,13 @@ msgstr "ચતુર્થ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "અંતિમ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "બીજી તારીખ"
 
@@ -6443,7 +6871,7 @@ msgstr "બીજી તારીખ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "૧ થી ૧૦"
 
@@ -6451,7 +6879,7 @@ msgstr "૧ થી ૧૦"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "૧૧ થી ૨૦"
 
@@ -6459,45 +6887,45 @@ msgstr "૧૧ થી ૨૦"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "૨૧ થી ૩૧"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "દિવસ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "ના પર"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "વારાઓ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "અપવાદ ઉમેરો"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "સુધારવા માટે પસંદગી મેળવી શક્યા નહિં."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "અપવાદ સુધારો"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "કાઢી નાંખવા માટે પસંદગી મેળવી શક્યા નહિં."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "તારીખ/સમય"
 
@@ -6548,12 +6976,12 @@ msgstr "અઠવાડિયા"
 msgid "year(s)"
 msgstr "વર્ષો"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "સમાપ્ત થયેલ તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "વેબ પાનું"
 
@@ -6568,51 +6996,55 @@ 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:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "સમાપ્ત"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "ઊંચુ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "પ્રગતિમાં છે"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "નીચું"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "સામાન્ય"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "શરુ થયું નથી"
 
@@ -6625,7 +7057,7 @@ msgid "Stat_us:"
 msgstr "પરિસ્થિતિ (_u):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "વ્યાખ્યાયિત નથી"
 
@@ -6634,7 +7066,7 @@ msgid "_Date completed:"
 msgstr "પૂર્ણ થયેલ તારીખ (_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "પ્રાધાન્ય (_P):"
 
@@ -6642,25 +7074,37 @@ msgstr "પ્રાધાન્ય (_P):"
 msgid "_Web Page:"
 msgstr "વેબ પાનું (_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "પરિસ્થિતિ વિગતો (_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "ક્રિયાની પરિસ્થિતિ વિગતો બદલવા અથવા દેખવા ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "મોકલોના વિકલ્પો (_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "બાબત (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "ક્રિયા વિગતો"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "આયોજક (_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "નક્કી થયેલ તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' માં બાબતો ખોલવા સમર્થ નથી."
@@ -6686,7 +7130,7 @@ msgid "_Due date:"
 msgstr "પહેલાની તારીખ (_D):"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6694,142 +7138,126 @@ msgstr[0] "%d દિવસ"
 msgstr[1] "%d દિવસો"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d અઠવાડિયુ"
 msgstr[1] "%d અઠવાડિયાઓ"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "અજ્ઞાત ક્રિયા થઈ ગઈ છે"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s મુલાકાત શરુ થવા પહેલા"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s મુલાકાત શરુ થયા પછી"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s મુલાકાત શરુ થતી વખતે"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s મુલાકાત અંત થયા પહેલા"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s મુલાકાત પૂરી થયા પછી"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s મુલાકાત પૂરી થતી વખતે"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s તરફ %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s અજ્ઞાત પ્રકારની ફેરબદલી માટે"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ખોલવા માટે ક્લિક કરો"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "શીર્ષક વગરનું"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "શરુઆતની તારીખ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "વર્ણન:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "વેબ પાનું:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "સાર:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "પહેલાની તારીખ:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "સ્થિતિ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "પ્રાધાન્ય:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "જાહેર"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "ખાનગી"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "વિશ્વાસજનક"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "અંતિમ તારીખ"
@@ -6839,21 +7267,14 @@ msgstr "અંતિમ તારીખ"
 msgid "Start Date"
 msgstr "શરુઆતની તારીખ"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "સાર"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "મુક્ત"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "વ્યસ્ત"
 
@@ -6868,34 +7289,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "હા"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ના"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:405
-#: ../plugins/itip-formatter/itip-formatter.c:2036
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
+#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
@@ -6907,159 +7328,185 @@ msgstr "વળતર"
 msgid "Assigned"
 msgstr "સોંપેલ"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
 msgid "Select folder to save selected attachments..."
 msgstr "પસંદિત જોડાણો સંગ્રહવા માટે ફોલ્ડર પસંદ કરો..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:924
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "આ રીતે સંગ્રહો (_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "પાશ્વ ભાગ તરીકે સુયોજિત કરો (_B)"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "પસંદ કરેલ સંગ્રહો (_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "%s માં ખોલો..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* કોઈ સાર નથી *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "આયોજક: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "આયોજક: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "શરુ કરો: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "કારણે: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "૦%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "૧૦%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "૨૦%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "૩૦%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "૪૦%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "૫૦%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "૬૦%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "૭૦%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "૮૦%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "૯૦%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "૧૦૦%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "પસંદ કરેલા ઓબ્જેક્ટો કાઢી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-table.c:952
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "ઓબ્જેક્ટો સુધારી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-table.c:1137
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:819
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "નવી બાબત (_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1364 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "વેબ પાનું ખોલો (_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "છાપો (_r)..."
 
-#: ../calendar/gui/e-calendar-table.c:1370
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "કાપો (_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ચોંટાડો (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1376 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "બાબત સોંપો (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1377 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar તરીકે આગળ ધપાવો (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "પૂર્ણ થયેલ હોય એમ ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "પસંદ કરેલ બાબતોને પૂર્ણ થયેલ હોય એમ ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "અપૂર્ણ તરીકે ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "પસંદ કરેલ ક્રિયાઓને અપૂર્ણ તરીકે ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1386
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "પસંદ કરેલ બાબતોને કાઢી નાંખો (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1623
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "બાબત ઉમેરવા માટે ક્લિક કરો"
@@ -7082,7 +7529,8 @@ msgid "Due date"
 msgstr "પહેલાની તારીખ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "પ્રાધાન્ય"
 
@@ -7090,112 +7538,93 @@ msgstr "પ્રાધાન્ય"
 msgid "Start date"
 msgstr "શરુઆતની તારીખ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "સ્થિતિ"
-
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "વસ્તુઓ ખસેડી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "વસ્તુઓની નકલ કરી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "નવી મુલાકાત (_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "નવી બધા દિવસની ઘટના (_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "નવી મંત્રણા (_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "વર્તમાન દેખાવ (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "આજનો દિવસ પસંદ કરો (_d)"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "તારીખ પસંદ કરો (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "છાપો (_n)..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "કેલેન્ડરમાં નકલ કરો (_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "કેલેન્ડરમાં ખસેડો (_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "પ્રતિનિધી મંત્રણા (_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "સમયક્રમ મંત્રણા (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar તરીકે આગળ ધપાવો (_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "પ્રત્યુત્તર (_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "બધાને વળતો જવાબ આપો (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "આ વારાને ખસેડાય તેવો બનાવો (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "આ વારો કાઢી નાંખો (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "બધા વારાઓ કાઢી નાંખો (_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "આયોજક: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2206
-#, c-format
-msgid "Organizer: %s"
-msgstr "આયોજક: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "સ્થળ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "સમય: %s %s"
@@ -7223,7 +7652,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i મિનિટ ભાગલાઓ"
@@ -7234,46 +7663,34 @@ msgstr "%02i મિનિટ ભાગલાઓ"
 #. 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:1359
-#: ../calendar/gui/e-day-view.c:2141
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
-#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "સવાર"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
-#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "સાંજ"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "હા. (જટિલ વળતર)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "દર રોજ"
 msgstr[1] "દર %d દિવસો"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7281,9 +7698,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "દર અઠવાડિયુ"
 msgstr[1] "દર %d અઠવાડિયાઓ"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7291,51 +7706,35 @@ msgstr[0] "દર અઠવાડિયા પર"
 msgstr[1] "દર %d અઠવાડિયાઓ પર"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " અને "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s નો દિવસ "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s નો "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "દર મહિનો"
 msgstr[1] "દર %d મહિનાઓ"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "દર વર્ષ"
 msgstr[1] "દર %d વર્ષે"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7343,332 +7742,332 @@ msgstr[0] "%d સમયનું કુલ"
 msgstr[1] " %d સમયોનું કુલ"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", અંત થાય છે "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "શરુ થાય છે"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "અંત થાય છે"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "પહેલા"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar જાણકારી"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar ભૂલ"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "અજ્ઞાત વ્યક્તિ"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> મહેરબાની કરીને નીચેની જાણકારી જુઓ, અને નીચેના મેનુમાંથી ક્રિયા પસંદ કરો."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2024
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "સ્વીકારાયેલ"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2027
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "ભાર મૂકીને સ્વીકારાયેલ છે"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2030
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "નકારાયેલ છે"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "મંત્રણા રદ થઈ ગયેલ છે, તેમછતાં પણ તે તમારા કેલેન્ડરોમાં મેળવી શકાશે નહિં"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "બાબત રદ થઈ ગયેલ છે, તેમછતાં પણ તે તમારી બાબત યાદીમાં મેળવી શકાઈ નથી"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> એ મંત્રણાની જાણકારી મોકલી છે."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "મંત્રણા જાણકારી"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, 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:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> મંત્રણા સમયે તમારી હાજરીની માંગ કરે છે."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "મત્રણાનો પ્રસ્તાવ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> હાલની મંત્રણામાં ઉમેરાવાની ઈચ્છા ધરાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "મંત્રણા સુધારો"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> મંત્રણાની તાજી જાણકારી મેળવવાની ઈચ્છા ધરાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "મંત્રણા સુધારાની મંજૂરી"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> એ મંત્રણાની મંજૂરીને વળતો જવાબ આપ્યો."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "મંત્રણાનો વળતો જવાબ"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> એ મંત્રણા રદ કરી નાંખી."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "મંત્રણા રદ"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> એ હોશિયાર નહિં હોય એવો સંદેશો મોકલ્યો."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "મંત્રણાના ખરાબ સંદેશો"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> એ બાબતની જાણકારી પ્રકાશિત કરી."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "બાબતની જાણકારી"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> એ %s ને બાબત કરવા માટે મંજૂરી મોકલે છે."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> એ તમને બાબત કરવા માટે મંજૂરી મોકલે છે."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "બાબતનો પ્રસ્તાવ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> હાલની ક્રિયામાં ઉમેરવાની ઈચ્છા ધરાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "બાબતનો સુધારો"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> એ બાબતની તાજી જાણકારી મેળવવાની ઈચ્છા ધરાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "બાબત સુધારોની મંજૂરી"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> એ બાબતની સોંપણી માટે વળતો જવાબ આપ્યો."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "બાબતનો વળતો જવાબ"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> એ બાબત નકારી કાઢી હતી."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "બાબત રદ"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "ખરાબ બાબત સંદેશો"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> એ મુક્ત/વ્યસ્ત જાણકારી પ્રકાશિત કરી હતી."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> તમારી મુક્ત/વ્યસ્ત જાણકારી માટે મંજૂરી મોકલે છે."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "મુક્ત/વ્યસ્ત મંજૂરી"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> એ મુક્ત/વ્યસ્ત મંજૂરી માટે વળતો જવાબ આપ્યો."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "મુક્ત/વ્યસ્ત વળતો જવાબ"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "ખરાબ મુક્ત/વ્યસ્ત સંદેશો"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "સંદેશો યોગ્ય રીતે ઘડાયેલ હોય એમ લાગતું નથી"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "સંદેશો માત્ર બિનઆધારભૂત મંજૂરીઓ સમાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "જોડાણ એ માન્ય કેલેન્ડર સંદેસો સમાવતું નથી"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "જોડાણ પાસે કોઈ જોઈ શકાય તેવી કેલેન્ડર વસ્તુઓ નથી"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "સુધારો પૂર્ણ થયો\n"
 
-#: ../calendar/gui/e-itip-control.c:1988
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ઓબ્જેક્ટ અયોગ્ય છે અને સુધારી શકાશે નહિં\n"
 
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "આ જવાબ એ વર્તમાન સભાસદમાંથી નથી.  સભાસદ તરીકે ઉમેરવો છો?"
 
-#: ../calendar/gui/e-itip-control.c:2023
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "સભાસદ સ્થિતિ સુધારી શકાઈ નથી અમાન્ય સ્થિતિને કારણે!\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "સભાસદની સ્થિતિ સુધારાઈ ગઈ\n"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1242
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "સભાસદની સ્થિતિ સુધારી શકાશે નહિં કારણકે વસ્તુ લાંબો સમય સુધી અસ્તિત્વમાં રહેવાની નથી"
 
-#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "વસ્તુ મોકલી દીધી!\n"
 
-#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "વસ્તુ મોકલી શકાઈ નથી!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "ક્રિયા પસંદ કરો:"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "સુધારો"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "સ્વીકારો"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "ભાર મૂકીને સ્વીકારો"
 
-#: ../calendar/gui/e-itip-control.c:2331
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "નકારો"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી મોકલો"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "જવાબ આપવાની સ્થિતિ સુધારો"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "તાજી જાણકારી મોકલો"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "રદ કરો"
@@ -7697,112 +8096,112 @@ msgstr "કેલેન્ડર લાવી રહ્યા છીએ..."
 msgid "Server Message:"
 msgstr "સર્વર સંદેશો:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "સભામંત્રી"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "ી ભાગ લેનાર જરુરી છેાઓ"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "વૈકલ્પિક સ્પર્ધકો"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "સ્રોતો"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "સભાજનો"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "અંગત"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "જૂથ"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "સ્રોત"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "ખંડ"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "ખુરશી"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "જરુરી સ્પર્ધક"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "વૈકલ્પિક સ્પર્ધક"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "સ્પર્ધક નથી"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "ક્રિયા જરુરી છે"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "જરુરી"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "ડિલિગેટ થયેલ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "સભાજન                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7810,85 +8209,81 @@ msgstr "%A, %B %d, %Y"
 #. 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.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "ઓફિસની બહાર"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "કોઈ જાણકારી નથી"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "સભાજનો (_t)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "વિકલ્પો (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "માત્ર કામ કરવાના કલાકો બતાવો (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "નાનું કરેલ બતાવો (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "સુધારો મુક્ત/વ્યસ્ત (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "આપોઆપ લઈ લો (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "બધા લોકો અને સ્રોતો (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "બધા લોકો અને એક સ્રોત (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "જરુરી લોકો (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "જરુરી લોકો અને એક સ્રોત (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "શરુઆતનો સમય (_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "અંતિમ સમય (_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "સભા ભરનાર"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "સભા ભરનાર ઉમેરવા માટે અંહિ ક્લિક કરો"
@@ -7913,16 +8308,16 @@ msgstr "ભાષા"
 msgid "Member"
 msgstr "સભ્ય"
 
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "પસંદ કરેલ મેમો કાઢી નાંખો (_D)"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "મેમો ઉમેરવા માટે ક્લિક કરો"
 
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7931,85 +8326,84 @@ msgstr ""
 "%s પર ભૂલ છે:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "મેમો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s આગળ મેમો ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "પસંદ કરેલ ઓબ્જેક્ટો કાઢી રહ્યા છીએ..."
 
-#: ../calendar/gui/e-tasks.c:975
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "બાબતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/e-tasks.c:1065
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s તરફ બાબતો ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/e-tasks.c:1310
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "બાબતો પૂર્ણ કરી રહ્યા છીએ..."
 
-#: ../calendar/gui/e-tasks.c:1360
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "અર્થ કાઢી રહ્યા છીએ"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 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/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "પ્રશ્ન સુધારી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "વૈવિધ્યપૂર્ણ દેખાવ (_C)"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "વૈવિધ્યપૂર્ણ દેખાવ સંગ્રહો (_S)"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "દેખાવો વ્યાખ્યાયિત કરો (_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s તરફ મુલાકાતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s તરફ બાબતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s આગળ મેમો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "%s ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "ભેગું કરી રહ્યા છીએ"
 
@@ -8069,136 +8463,143 @@ msgstr "સપ્ટેમ્બર"
 msgid "_Select Today"
 msgstr "આજનો દિવસ પસંદ કરો (_S)"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "આયોજક સુયોજિત કરેલો જ હોવો જોઈએ."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "ઓછામાં ઓછો એક સભાસદ હોવો જરુરી છે"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "ઘટનાની જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "બાબતની જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "મેમો જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "કેલેન્ડર જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "સુધારાયેલ"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "ફરી તાજુ કરો"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "ગળકનો પ્રસ્તાવ"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી (%s ને %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "તમે ઘટનાના સભાસદ હોવા જ જોઈએ."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "નવી મેમો યાદી (_N)"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d મેમો"
 msgstr[1] "%d મેમો"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d પસંદ થયેલ"
 msgstr[1] ", %d પસંદ થયેલ"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "મેમો સુધારવામાં નિષ્ફળ."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે મેમો યાદી '%s' ખોલવામાં અસમર્થ"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "મેમો બનાવવા માટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "મેમો સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "નવી મેમો"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "મેમો (_o)"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "નવી મેમો બનાવો"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "નવો વહેંચાયેલ મેમો"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "વહેંચાયેલ મેમો (_S)"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "વહેંચાયેલ નવો મેમો બનાવો"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "નવી મેમો યાદી"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "મેમો યાદી (_s)"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "નવી મેમો યાદી બનાવો"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "મેમો છાપો"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "આગળના ૭ દિવસો"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8209,7 +8610,7 @@ msgstr ""
 "\n"
 "મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ખસેડે ત્યાં સુધી શાંતિ દાખવો..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8221,27 +8622,27 @@ msgstr ""
 "મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ખસેડે ત્યાં સુધી શાંતિ દાખવો..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb માંથી જૂના સુયોજનો ફેરવવામાં અસમર્થ"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "કેલેન્ડર `%s' ને ફેરવવામાં અસમર્થ"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "બાબતો `%s' ફેરવવામાં અસમર્થ"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "નોંધો"
 
@@ -8398,118 +8799,125 @@ msgstr "શુક્ર"
 msgid "Sa"
 msgstr "શનિ"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "મુલાકાત"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "બાબત"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "સાર: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "સભાજનો: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "સ્થિતિ: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "પ્રાધાન્ય: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "પૂર્ણ થયેલ ટકા: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "વર્ગો: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "સંપર્કો: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "આવી રહેલ મુલાકાતો"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "નવી બાબત યાદી (_N)"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d બાબત"
 msgstr[1] "%d બાબતો"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "બાબતો સુધારવામાં નિષ્ફળ ગયા."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે બાબત યાદી '%s' ખોલવામાં અસમર્થ"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "બાબતો બનાવવા માટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "બાબત સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "નવી બાબત"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "બાબત (_T)"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "નવી બાબત બનાવો"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "નવી સોંપાયેલ બાબત"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "સોંપાયેલ બાબત (_d)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "નવી સોંપાયેલ બાબત બનાવો"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "નવી બાબત યાદી"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "બાબત યાદી (_k)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "નવી બાબત યાદી બનાવો"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8521,49 +8929,70 @@ msgstr ""
 "\n"
 "શું ખરેખર આ બાબતો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "મને ફરી વાર પૂછશો નહિં."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "બાબતો છાપો"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% પૂરુ થયું"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "નકારાઈ ગયું"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "પ્રગતિમાં છે"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "ના કરતાં મોટું છે"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "ના કરતાં નાનું છે"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "મુલાકાતો અને મંત્રણાઓ"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "કેલેન્ડર ખોલી રહ્યા છીએ"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ફાઈલો (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "ઈવોલ્યુશન iCalendar આયાત કરનાર"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "યાદ અપાવનાર!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar ફાઈલો (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "ઈવોલ્યુશન vCalendar આયાત કરનાર"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "કેલેન્ડર ઘટનાઓ"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "ઈવોલ્યુશન કેલેન્ડર હોશિયાત આયાત કરનાર"
 
@@ -10097,123 +10526,303 @@ msgstr "પેસિફિક/વાલિસ"
 msgid "Pacific/Yap"
 msgstr "પેસિફિક/યેપ"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "સરનામાપોથી માટે અંહિ ક્લિક કરો"
+#: ../composer/e-composer-autosave.c:275
+#, fuzzy
+msgid "Could not open autosave file"
+msgstr "ફાઈલ ખોલી શક્યા નથી"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "અંતિમ મુકામ મોકલી રહ્યા છીએ"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "સંપાદકમાંથી સંદેશો મેળવવા સમર્થ નથી"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "સંદેશાઓ મોકલવા માટે ફોલ્ડર પસંદ કરો."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "જોડાણ ઉમેરો"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "અંહિ પોસ્ટ કરવા માટે ફોલ્ડરો પસંદ કરો"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "જોડો (_t)"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "સહી (_g):"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "શીર્ષક વગરનો સંદેશો"
+
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "ફાઈલ જોડો"
+
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "બંધ કરો (_C)"
+
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "વર્તમાન ફાઈલ બંધ કરો"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "છાપો (_P)..."
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "છાપનનું પૂર્વદર્શન (_v)"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "વર્તમાન ફાઈલ સંગ્રહો"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "આ રીતે સંગ્રહો (_A)..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "વર્તમાન ફાઈલ અલગ નામથી સંગ્રહો"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "ડ્રાફ્ટ સંગ્રહો (_D)"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "ડ્રાફ્ટ તરીકે સંગ્રહો"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "મોકલો (_e)"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "આ સંંદેશાને મોકલો"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "મોકલો વિકલ્પો દાખલ કરો"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "નવો સંદેશો (_M)"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "નવા સંદેશા વિન્ડો ખોલો"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "અક્ષરોની સંગ્રહપદ્ધતિ (_E)"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "સુરક્ષા (_S)"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "PGP એનક્રિપ્ટ (_E)"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "આ સંદેશાને PGP સાથે એનક્રિપ્ટ કરો"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "PGP સહી (_S)"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "આ સંદેશાને તમારી PGP કી સાથે સહી કરો"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "સંદેશાનું પ્રાધાન્યકરણ કરો (_P)"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "સંદેશા પ્રાધાન્યને ઊંચી સુયોજિત કરો"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "વાંચન રસીદની અરજી કરો (_q)"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "જ્યારે તમારો સંદેશો વંચાય ત્યારે પહોંચ સૂચન મેળવો"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "S/MIME એનક્રિપ્ટ (_c)"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "તમારા S/MIME એનક્રિપ્શન પ્રમાણપત્ર સાથે આ સંદેશો એનક્રિપ્ટ કરો"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S/MIME સહી (_n)"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "આ સંદેશાને તમારી S/MIME સહી પ્રમાણપત્ર સાથે સહી કરો"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "આને પણ ખબર વિના ક્ષેત્ર (_B)"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "આને પણ ખબર વિના ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "આને પણ ક્ષેત્ર (_C)"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "આને પણ ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "તરફથી ક્ષેત્ર (_F)"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "શું તરફથી પસંદ કરનાર પ્રદર્શિત છે તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "ને પોસ્ટ કરો ક્ષેત્ર (_P)"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "શું ને પોસ્ટ કરો ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "ને વળતો જવાબ આપો ક્ષેત્ર (_R)"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "શું ને વળતો જવાબ આપો ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "વિષય ક્ષેત્ર (__S)"
+
+#: ../composer/e-composer-actions.c:651
+#, fuzzy
+msgid "Toggles whether the Subject field is displayed"
+msgstr "શું પરિસ્થિતિ ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "પ્રતિ ક્ષેત્ર (_T)"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "શું પ્રતિ ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "સંદેશાના મેળવનારાઓ દાખલ કરો"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "સરનામાઓ દાખલ કરો કે જેઓ પણ સંદેશાની કાર્બન નકલ મેળવે"
+
+#: ../composer/e-composer-header-table.c:71
+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-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "તરફથી (_o):"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "પ્રતિ-પ્રત્યુત્તર આપો (_R):"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "પ્રતિ (_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "સંદેશાના મેળવનારાઓ દાખલ કરો"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "આને પણ (_C):"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "સરનામાઓ દાખલ કરો કે જેઓ પણ સંદેશાની કાર્બન નકલ મેળવે"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "આને પણ ખબર વિના (_B):"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-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-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "ને પોસ્ટ કરો (_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "વિષય (_u):"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "જોડો (_t)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "સહી (_g):"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "જોડાણ ઉમેરો"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "સરનામાપોથી માટે અંહિ ક્લિક કરો"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "અંતિમ મુકામ મોકલી રહ્યા છીએ"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "સંદેશાઓ મોકલવા માટે ફોલ્ડર પસંદ કરો."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "અંહિ પોસ્ટ કરવા માટે ફોલ્ડરો પસંદ કરો"
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "તાજેતરનાં દસ્તાવેજો (_D)"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "જોડાણ પટ્ટી બતાવો (_A)"
+
+#: ../composer/e-msg-composer.c:873
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "જતા સંદેશાઓની સહી કરી શકતા નથી: આ ખાતા માટે સહી કરવાનું કોઈ પ્રમાણપત્ર નથી"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "જતા સંદેશાઓને એનક્રિપ્ટ કરી શકતા નથી: આ ખાતા માટે કોઈ એનક્રિપ્શન પ્રમાણપત્ર નથી"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "જોડાણ"
+msgstr[1] "જોડાણો"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "જોડાણપટ્ટી છુપાવો (_A)"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "જોડાણ પટ્ટી બતાવો (_A)"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "અજ્ઞાત કારણ"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "ફાઈલ ખોલી શક્યા નથી"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "સંપાદકમાંથી સંદેશો મેળવવા સમર્થ નથી"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "શીર્ષક વગરનો સંદેશો"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "ફાઈલ ખોલો"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "સંદેશો બનાવો"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10241,8 +10850,7 @@ msgstr "શું તમે સંદેશો કાઢી નાંખવા �
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "કારણ &quot;{0}&quot;, તમારે અલગ મેઈલ વિકલ્પો પસંદ કરવાની જરુર છે."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "કારણ કે &quot;{1}&quot;."
 
@@ -10353,23 +10961,27 @@ msgstr "તમે આ મદદપત્રિકામાં ફાઈલ `{0}'
 msgid "You need to configure an account before you can compose mail."
 msgstr "તમે મેઈલ કમ્પોઝ કરો તે પહેલા ખાતુ રુપરેખાંકિત કરવાની જરુર છે."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "ફેરફાર ચાલુ રાખો (_C)"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "પાછા મેળવો નહિં (_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "પાછા મેળવો (_R)"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "સંદેશો સંગ્રહો (_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "ડ્રાફ્ટ સંગ્રહો (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "ઈવોલ્યુશન મેઈલ અને કેલેન્ડર"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "ગ્રુપવેર સ્યુટ"
 
@@ -10385,55 +10997,78 @@ msgstr "સરનામા કાર્ડ"
 msgid "calendar information"
 msgstr "કેલેન્ડર જાણકારી"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "ઈવોલ્યુશન ભૂલ"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "ઈવોલ્યુશન ચેતવણી"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "ઈવોલ્યુશન જાણકારી"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "ઈવોલ્યુશન પ્રશ્ન"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "આંતરિક ભૂલ, અજ્ઞાત ભૂલ '%s' ની અરજી થઈ"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "ઘટક"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "ઘટકનું નામ લોગ કરી દેવામાં આવ્યુ છે"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "સક્રિય કરેલ છે"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "શું પ્લગઇન સક્રિય થયેલ છે"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "છાપતી વખતે ભૂલ ઉદ્ભવી"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "છાપન સિસ્ટમે ભૂલ વિશે નીચેની વિગતોનો અહેવાલ આપ્યો:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid "The printing system did not report any additional details about the error."
 msgstr "છાપન સિસ્ટમ ભૂલ વિશે કોઈપણ વધારાની વિગતોનો અહેવાલ આપ્યો નથી."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "કારણ કે \"{1}\"."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "ફાઈલ ખોલી શકાતી નથી &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
+msgstr "ફાઈલ ખોલી શકાસે નહિં \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "ફાઈલ સંગ્રહી શકાતી નથી &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
+msgstr "ફાઈલ સંગ્રહી શકાતી નથી \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "ફાઈલ હાજર છે &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
+msgstr "ફાઈલ હાજર છે \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10443,50 +11078,62 @@ msgstr "શું તેના ઉપર ફરીથી લખવું છે?
 msgid "_Overwrite"
 msgstr "ની ઉપર ફરીથી લખવું (_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "મહત્વનું (_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "કાર્ય (_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "ખાનગી (_W)"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "કરવાનું (_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "પછી (_L)"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "લેબલ નામ (_N):"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "લેબલમાં ફેરફાર કરો"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "લેબલ ઉમેરો"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "લેબલ નામ ખાલી રાખી શકાતું નથી."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+#: ../e-util/e-util-labels.c:356
+#, fuzzy
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr "એ જ ટેગવાળું લેબલ પહેલાથી જ હાજર છે. તમારા લેબલનું નામ મહેરબાની કરીને બદલો."
 
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf ભૂલ: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "ટર્મિનલ પર ફક્ત બધી આગળની ભૂલો બતાવેલ છે."
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10603,65 +11250,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "ની સાથે સરખાવવા માટે સમય પસંદ કરો"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "ફાઈલ પસંદ કરો"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "ચકાસણી"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "નિયમ નામ (_u):"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "વસ્તુઓ શોધો કે જે નીચેની વિચારધારાને મળી આવે"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "ગાળક વિચારધારા ઉમેરો (_d)"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "જો બધી વિચારધારાઓ મળી જાય"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "જો કોઈ પણ વિચારધારા મળી જાય"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "વસ્તુઓ શોધો (_F):"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "બધું સંબંધિત"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "વળતા જવાબો"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "વળતા જવાબો અને પિતૃઓ"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "કોઈ પ્રત્યુત્તર અથવા પિતૃ નથી"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "થ્રેડો સમાવે છે (_n)"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "આવતા"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "જતા"
 
@@ -10685,7 +11332,7 @@ msgstr "ખોવાયેલ તારીખ."
 msgid "Missing file name."
 msgstr "ફાઈલ નામ ખોવાયેલ છે."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "નામ ખોવાયું છે."
 
@@ -10761,7 +11408,7 @@ msgstr "ભવિષ્યમાં"
 msgid "months"
 msgstr "મહિનાઓ"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "સેકન્ડો"
 
@@ -10773,9 +11420,9 @@ msgstr "વર્તમાન સમય"
 msgid "the time you specify"
 msgstr "તમે સ્પષ્ટ કરો એ સમય"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "અઠવાડિયાઓ"
 
@@ -10791,7 +11438,7 @@ msgstr "નિયમ ઉમેરો"
 msgid "Edit Rule"
 msgstr "નિયમમાં ફેરફાર કરો"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "નિયમનું નામ"
 
@@ -10812,57 +11459,69 @@ msgid "Configure your email accounts here"
 msgstr "તમારા ઈ-મેઈલ ખાતાઓ અંહિ રુપરેખાંકિત કરો"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "તમારા નેટવર્ક જોડાણ સુયોજનાઓ અંહિ રુપરેખાંકિત કરો"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "ઈવોલ્યુશન મેઈલ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "ઈવોલ્યુશન મેઈલ ખાતાઓ રુપરેખાંકન નિયંત્રણ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "ઈવોલ્યુશન મેઈલ કમ્પોનન્ટ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "ઈવોલ્યુશન મેઈલ કમ્પોઝર"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "ઈવોલ્યુશન મેઈલ કમ્પોઝર રુપરેખાંકન નિયંત્રણ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "ઈવોલ્યુશન મેઈલ પસંદગીઓ નિયંત્રણ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "ઈવોલ્યુશન નેટવર્ક રૂપરેખાંકન નિયંત્રણ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "મેઈલ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "મેઈલ ખાતાઓ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "મેઈલ પસંદગીઓ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "નેટવર્ક પસંદગીઓ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "મેઈલ (_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s લાઈસન્સ મંજૂરીપત્ર"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10875,115 +11534,109 @@ msgstr ""
 "%s માટે વાંચો કે જે નીચે પ્રદર્શિત છે\n"
 "અને તેને સ્વીકારવા માટે ચકાસણી બોક્સ ચિહ્નિત કરો\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "ફોલ્ડર પસંદ કરો"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "આપોઆપ બનતુ"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "દરેક સંદેશા માટે પૂછો"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "ઓળખ"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "ઈ-મેઈલ મેળવી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "આ દરે નવા સંદેશાઓ માટે ચકાસો (_n)"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "મિનિટો (_t)"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "ઈ-મેઈલ મોકલી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "મૂળભુતો"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "સુરક્ષા"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "વિકલ્પો મેળવી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "નવા સંદેશાઓ માટે ચકાસી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ખાતા સંપાદક"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "ઈવોલ્યુશન ખાતા મદદનીશ"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[મૂળભુત]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "સક્રિય કરેલ છે"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "ખાતા નામ"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "પ્રોટોકોલ"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "નામ વિનાનું"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "ભાષાઓ"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "સહી સ્ક્રિપ્ટ ઉમેરો"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "સહીઓ"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- સંદેશો આગળ ધપાવો --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 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:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10991,11 +11644,11 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} પર ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} જગ્યાએ આ લખાયેલ હતું:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----મૂળ સંદેશો-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "ગાળક નિયમો (_F)"
 
@@ -11012,10 +11665,6 @@ msgstr "રંગ નક્કી કરો"
 msgid "Assign Score"
 msgstr "સ્કોર નક્કી કરો"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "જોડાણો"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11032,10 +11681,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "પર પૂર્ણ થયું"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "સમાવે છે"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "આ ફોલ્ડરમાં નકલ કરો"
@@ -11049,7 +11694,7 @@ msgid "Date sent"
 msgstr "મોકલ્યાની તારીખ"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11060,10 +11705,6 @@ msgstr "કાઢી નાખો"
 msgid "Deleted"
 msgstr "કાઢી નંખાયેલ છે"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "સમાવતું નથી"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "આની સાથે અંત થતો નથી"
@@ -11084,10 +11725,6 @@ msgstr "આના જેવું સંભળાતું નથી"
 msgid "does not start with"
 msgstr "ની સાથે શરુ થતું નથી"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "અસ્તિત્વમાં નથી"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "ડ્રાફ્ટ"
@@ -11096,10 +11733,6 @@ msgstr "ડ્રાફ્ટ"
 msgid "ends with"
 msgstr "ની સાથે અંત થાય છે"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "હાજર છે"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "હાજર છે"
@@ -11112,14 +11745,10 @@ msgstr "સમીકરણ"
 msgid "Follow Up"
 msgstr "ને અનુસરો"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "મહત્વનું"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "છે"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "એ પછી"
@@ -11132,18 +11761,6 @@ msgstr "એ પહેલા"
 msgid "is Flagged"
 msgstr "એ નિશાનિત છે"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "ના કરતાં મોટું છે"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "ના કરતાં નાનું છે"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "એ નથી"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "એ નિશાનિત નથી"
@@ -11156,7 +11773,7 @@ msgstr "એ સુયોજીત નથી"
 msgid "is set"
 msgstr "એ સુયોજીત છે"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "નકામુ"
@@ -11165,7 +11782,7 @@ msgstr "નકામુ"
 msgid "Junk Test"
 msgstr "બગડેલ ચકાસણી"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "લેબલ"
 
@@ -11207,7 +11824,7 @@ msgstr "ધ્વનિ વગાડો"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "વાંચો"
 
@@ -11279,10 +11896,9 @@ msgstr "ની સાથે શરુ થાય છે"
 msgid "Stop Processing"
 msgstr "પ્રક્રિયા કરવાનું બંધ કરો"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11293,11 +11909,11 @@ msgid "Unset Status"
 msgstr "સ્થિતિ અસુયોજિત કરો"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "પછી"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "ક્રિયા ઉમેરો (_t)"
 
@@ -11341,16 +11957,16 @@ msgstr "મહત્વના સંદેશાઓ"
 msgid "Messages Not Junk"
 msgstr "સંદેશાઓ બગડેલ નથી"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "ખાતા શોધ"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "બધા ખાતા શોધ"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "નહિં વાંચેલ સંદેશાઓ:"
@@ -11358,31 +11974,45 @@ msgstr[1] "નહિં વાંચેલ સંદેશાઓ:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "કુલ સંદેશાઓ:"
 msgstr[1] "કુલ સંદેશાઓ:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "ક્વોટા વપરાશ"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "ઈનબોક્સ"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "ફોલ્ડરના ગુણધર્મો"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "&lt;ફોલ્ડર પસંદ કરવા માટે અંહિ ક્લિક કરો&gt;"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "બનાવો (_r)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "ફોલ્ડર નામ (_n):"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "શોધ ફોલ્ડરો"
 
@@ -11391,27 +12021,19 @@ msgstr "શોધ ફોલ્ડરો"
 msgid "UNMATCHED"
 msgstr "નહિં બંધબેસેલા"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "ડ્રાફ્ટો"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "ઈનબોક્સ"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "આઉટબોક્સ"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "મોકલાયેલ"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "લાવી રહ્યા છીએ..."
 
@@ -11430,86 +12052,79 @@ msgstr "લાવી રહ્યા છીએ..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "મેઈલ ફોલ્ડર વૃક્ષ"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "ફોલ્ડર %s ખસેડી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "ફોલ્ડર %s નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "સંદેશાઓ ફોલ્ડર %s માં ખસેડી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "સંદેશાઓ ફોલ્ડર %s માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ઉચ્ચ સ્તરના સંગ્રહસ્થાનમાં સંદેશાઓ મૂકી શકતા નથી"
 
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "આ ફોલ્ડરમાં નકલ કરો (_C)"
 
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "આ ફોલ્ડરમાં ખસેડો (_M)"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" માં ફોલ્ડરો ચકાસી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "દેખાવ (_V)"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "નવી વિન્ડોમાં ખોલો (_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "નવું ફોલ્ડર (_N)..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "ખસેડો (_M)..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "નામ બદલો (_R)..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "પુનઃતાજું કરો (_f)"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "આઉટબોક્સ ફ્લશ કરો (_u)"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "કચરાપેટી ખાલી કરો (_E)"
 
@@ -11518,13 +12133,13 @@ msgstr "કચરાપેટી ખાલી કરો (_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ને `%s' માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "ફોલ્ડર પસંદ કરો"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "નકલ કરો (_o)"
 
@@ -11546,267 +12161,259 @@ msgstr "ફોલ્ડર બનાવો"
 msgid "Specify where to create the folder:"
 msgstr "સ્પષ્ટ કરો કે ક્યાં ફોલ્ડર બનાવવું છે:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "મેઈલ કાઢવામાં નિષ્ફળ"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "આ મેઈલ કાઢવા માટે તમારી પાસે પૂરતી પરવાનગીઓ નથી."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "મોકલનારને વળતો જવાબ આપો (_R)"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "આગળ ધપાવો (_F)"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "નવા સંદેશાઓમાં ફેરફાર કરો (_E)..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "છાપો (_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "કાઢી નંહિ (_n)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "ફોલ્ડરમાં ખસેડો (_M)..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "આ ફોલ્ડરમાં નકલ કરો (_C)..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "વાંચ્યુ હોય એમ નિશાનિત કરો (_k)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "નહિં વાંચેલ છે એમ ચિહ્નિત કરો (_U)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "મહત્વનું એમ નિશાનિત કરો (_I)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "મહત્વનું નથી એમ નિશાનિત કરો (_i)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "બગડેલ છે એમ નિશાનિત કરો (_J)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "બગડેલ નથી એમ નિશાનિત કરો (_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "અનુસરણ માટેનું ચિહ્ન (_w)..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "લેબલ (_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "કંઈ નહિં (_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "નવું લેબલ (_N)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "નિશાની પૂર્ણ થયેલ છે (_g)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "નિશાની સાફ કરો (_e)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "સંદેશામાંથી નિયમ બનાવો (_t)"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "વિષય પર આધાર રાખીને ફોલ્ડર શોધો (_S)"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "મોકલનાર પર આધાર રાખીને ફોલ્ડરમાં શોધો (_n)"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "મેળવનારાઓ પર આધાર રાખીને ફોલ્ડરમાં શોધો (_R)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "મેઈલિંગ લીસ્ટ પર આધાર રાખીને ફોલ્ડરમાં શોધો (_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "વિષય આધારિત ગાળણ (_j)"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "મોકલનાર આધારિત ગાળણ (_d)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "મેળવનાર આધારિત ગાળણ (_c)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "મેઈલિંગ લીસ્ટ આધારિત ગાળણ (_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "મૂળભુત"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "સંદેશો પાછો મેળવવા સમર્થ નથી"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "સંદેશો પુનઃપ્રાપ્ત કરી રહ્યા છીએ..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "ને કોલ કરો (_a)..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "શોધ ફોલ્ડર બનાવો (_S)"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "આ સરનામા તરફથી (_F)"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "આ સરનામા પ્રતિ (_T)"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "મેઈલ %s કરવા માટે ક્લિક કરો"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ને કોલ કરવા માટે ક્લિક કરો"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "સંદેશાઓ છુપાવવા/બતાવવા ક્લિક કરો"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "બંધબેસતા: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:616
 msgid "Fin_d:"
 msgstr "શોધો (_d):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:640
 msgid "_Previous"
 msgstr "પાછળ (_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:645
 msgid "_Next"
 msgstr "આગળ (_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:650
 msgid "M_atch case"
 msgstr "જોડણી સરખાવો (_a)"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "સહી કરેલ નથી"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "સંદેશો સહી કરેલ નથી. સંદેશો યોગ્ય હોય એની કોઈ ગેરંટી નથી."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "માન્ય સહી"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:950
 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:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "અયોગ્ય સહી"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "આ સંદેશાની આ સહી ચકાસાયેલ નથી, તે પરિવહન દરમ્યાન બદલી દેવાયેલ છે."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "માન્ય સહી, પરંતુ મોકલનારને ચકાસી શકતા નથી"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:952
 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:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "સહી અસ્તિત્વમાં છે, પરંતુ જાહેર કી જરૂરી"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "આ સંદેશો સહી સાથે સહી કરાયેલ છે, પરંતુ ત્યાં કોઈ લાગતીવળગતી જાહેર કી નથી."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "એનક્રિપ્ટ થયેલ નથી"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "સંદેશો એનક્રિપ્ટ થયેલ નથી. તેના સમાવિષ્ટો ઈન્ટરનેટ પર પરિવહન દરમ્યાન દેખાઈ શકે છે."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "એનક્રિપ્ટ થયેલ, નબળુ"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11815,21 +12422,21 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, પરંતુ નબળા એનક્રિપ્શન અલગોરિધમ સાથે. તે મુશ્કેલ હશે, પરંતુ એ "
 "બહારના વ્યક્તિ માટે પ્રાયોગિક સમય દરમ્યાન સંદેશાના સમાવિષ્ટો જોવાનું અશક્ય નથી."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "એનક્રિપ્ટ થયેલ"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:962
 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:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "એનક્રિપ્ટ થયેલ, મજબૂત"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:963
 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 "
@@ -11838,94 +12445,90 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, મજબૂત એનક્રિપ્શન અલગોરિધમ સાથે. બહારની વ્યક્તિ માટે પ્રાયોગિક "
 "સમય દરમ્યાન આ સંદેશાના સમાવિષ્ટોને જોવાનું મુશ્કેલ થઈ જશે."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "પ્રમાણપત્ર જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1079
 msgid "This certificate is not viewable"
 msgstr "આ પ્રમાણપત્ર જોઈ શકાય એમ નથી"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p પૂર્ણ થઈ જશે"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "ઈચ્છિત સમયે નહિં થયેલ કાર્ય:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p દ્વારા"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1461
 msgid "_View Inline"
 msgstr "લીટીમાં જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1462
 msgid "_Hide"
 msgstr "છુપાવો (_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1463
 msgid "_Fit to Width"
 msgstr "પહોળાઈમાં બંધબેસાડો (_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1464
 msgid "Show _Original Size"
 msgstr "મૂળ માપ બતાવો (_O)"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "જોડાણ"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1984
 msgid "Save attachment as"
 msgstr "જોડાણ આ રીતે સંગ્રહો"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
 msgstr "બધા જોડાણો સંગ્રહવા માટે ફોલ્ડર પસંદ કરો"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
 msgstr "પસંદિત સંગ્રહો (_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2106
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d જોડાણ (_t)"
 msgstr[1] "%d જોડાણો (_t)"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
 msgid "S_ave"
 msgstr "સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2124
 msgid "S_ave All"
 msgstr "બધું સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2198
 msgid "No Attachment"
 msgstr "કોઈ જોડાણ નથી"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "બંધારણવિનાનું જુઓ (_U)"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2341
 msgid "Hide _Unformatted"
 msgstr "બંધારણવિનાનું છુપાવો (_U)"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2396
 msgid "O_pen With"
 msgstr "ની સાથે ખોલો (_p)"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2467
+#, fuzzy
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "ઈવોલ્યુશન આ ઈમેઈલ રેન્ડર કરી શકતો નથી કારણ કે તે સંભાળવા માટે ખૂબ મોટો છે. તમે તેને "
@@ -11936,274 +12539,289 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "પાનુ %d %d નું"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' મેળવી રહ્યા છીએ"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "અજ્ઞાત બાહ્ય-શરીર ભાગ."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "બાહ્ય ભાગનો કદરુપો ભાગ."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP સાઈટ (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "સ્થાનિક ફાઈલ (%s) નો નિર્દેશક સાઈટ \"%s\" માન્ય છે"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "સ્થાનિક ફાઈલ (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "દૂરસ્થા માહિતી (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "અજ્ઞાત બાહ્ય માહિતી (\"%s\" પ્રકારની) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "સંદેસાનું બંધારણ ઘડી રહ્યા છીએ"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "સંદેસાનું બંધારણ ઘડી રહ્યા છીએ..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "ને પણ"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "આને પણ ખબર વિના"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "મેઈલ મોકલનાર"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "તારીખ"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "સમાચાર જૂથો"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "આ સંદેશો <b>%s</b> દ્વારા <b>%s</b> વતી મોકલાયેલ હતો"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "તરફથી"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "ને જવાબ આપો"
 
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "તારીખ"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "સમાચાર જૂથો"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s જોડાણ"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME સંદેશાનું પદચ્છેદ કરી શક્યા નહિં: અજ્ઞાત ભૂલ"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME સંદેસાનું પદચ્છેદ કરી શક્યા નહિં. સ્રોત તરીકે બતાવી રહ્યા છીએ."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encrypted માટે આધારભૂત નહિં એવો એનક્રિપ્શન પ્રકાર"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME સંદેશાનું પદચ્છેદન કરી શક્યા નહિં"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME સંદેશાનું પદચ્છેદન કરી શક્યા નહિં: અજ્ઞાત ભૂલ"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "સહીનું બંધારણ આધારભૂત નથી"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "સહી ચકાસણીમાં ભૂલ"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "સહી ચકાસણી કરતી વખતે અજ્ઞાત ભૂલ"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "PGP સંદેશાનું પદચ્છેદન કરી શક્યા નહિં"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP સંદેશાનું પદચ્છેદન કરી શક્યા નહિં: અજ્ઞાત ભૂલ"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "દર વખતે"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "દિવસમાં એક વાર"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "અઠવાડિયામાં એક વાર"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "મહિનામાં એક વાર"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "વૈવિધ્યપૂર્ણ બગડેલ હેડર ઉમેરો"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "હેડર નામ:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "હેડર કિંમત આ બધું સમાવે છે:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "કિંમત સમાવે છે"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "રંગ"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "ટેગ"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s પ્લગઈન ઉપલબ્ધ છે અને બાઈનરી સ્થાપિત થયેલ છે."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s પ્લગઈન ઉપલબ્ધ નથી. મહેરબાની કરીને ચકાસો કે શું પેકેજ સ્થાપિત થયેલ છે."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "કોઈ બગડેલ પ્લગઈન ઉપલબ્ધ નથી"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "કરવાનું"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "પછી"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"ઈવોલ્યુશન 1.x આવ્યું ત્યારથી ઈવોલ્યુશન મેઈલબોક્સ ફોલ્ડરોની જગ્યા અને વંશવેલો બદલાઈ ગયો.\n"
-"\n"
-"મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ફેરવે ત્યાં સુધી શાંતિ દાખવો..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "`%s' ને એક જગ્યાએથી બીજી જગ્યાએ લઇ રહ્યા છે:"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "નવું ફોલ્ડર `%s' બનાવવામાં સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ફોલ્ડર `%s' ને `%s' માં નકલ કરવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "વર્તમાન મેઈલબોક્સને `%s' આગળ ચકાસવા માટે સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1868
+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 ""
+"ઈવોલ્યુશન 1.x આવ્યું ત્યારથી ઈવોલ્યુશન મેઈલબોક્સ ફોલ્ડરોની જગ્યા અને વંશવેલો બદલાઈ ગયો.\n"
+"\n"
+"મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ફેરવે ત્યાં સુધી શાંતિ દાખવો..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "જૂની POP keep-on-server માહિતી `%s' ખોલવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 keep-on-server માહિતી ડિરેક્ટરી `%s' બનાવવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server માહિતી `%s' નકલ કરવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "સ્થાનિક મેઈલ સંગ્રહસ્થાન `%s' બનાવવામાં નિષ્ફળ: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"ઈવોલ્યુશન 1.x આવ્યું ત્યારથી ઈવોલ્યુશન મેઈલબોક્સ ફોલ્ડરોની જગ્યા અને વંશવેલો બદલાઈ ગયો.\n"
+"\n"
+"મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ફેરવે ત્યાં સુધી શાંતિ દાખવો..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s' જગ્યાએ સ્થાનિક મેઈલ ફોલ્ડરો બનાવવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12211,62 +12829,65 @@ msgstr ""
 "પહેલાના ઈવોલ્યુશનના સ્થાપનમાંથી સુયોજનો વાંચવા સમર્થ નથી, `evolution/config.xmldb' "
 "અસ્તિત્વમાં નથી અથવા બગડેલ છે."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "મોકલનારને જવાબ આપો (_R)"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "યાદીને જવાબ આપો (_L)"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "સરનામા પુસ્તિકામાં ઉમેરો (_A)"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "આ સ્ટોર ઉમેદવારીને આધાર આપતી નથી, અથવા તેઓ સક્રિય નથી."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "ઉમેદવારી"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "ફોલ્ડર"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "મહેરબાની કરીને સર્વર પસંદ કરો."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "કોઈ સર્વર પસંદ થયેલ નથી"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "આ સંદેશો ફરીથી બતાવશો નહિં (_D)."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "સંદેશા ગાળકો"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "સંદેશો"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "સંદેશો સંગ્રહો..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "સરનામુ ઉમેરો"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "%s માંથી સંદેશાઓ"
@@ -12280,189 +12901,237 @@ msgid "Search Folder source"
 msgstr "ફોલ્ડર સ્રોત શોધો"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"મેઈલ મોકલો અને મેળવો\" વિન્ડો ઊંચાઇ"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"મેઈલ મોકલો અને મેળવો\" વિન્ડો મહત્તમ સ્ટેટ"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"મેઈલ મોકલો અને મેળવો\" વિન્ડો પહોળાઇ"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "ઈવોલ્યુશનને મર્યાદિત માપનો લખાણ ભાગ દર્શાવવા માટે પરવાનગી આપે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "હંમેશા વાંચન રસીદની અરજી કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "પરિસ્થિતિદર્શક પટ્ટી પર ભૂલ બતાવવામાં આવવી જોઈએ તે સમયનો જથ્થો સેકન્ડોમાં."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "આપોઆપ ચિહ્ન ઓળખ"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "આપોઆપ કડી ઓળખો"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "આવતા મેઈલોને બગડેલા છે કે નહિં તે ચકાસો"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "સાઈટનો પ્રકાશક રંગ"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "સાઈટનો પ્રકાશક રંગ."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "કમ્પોઝર ભાર/ડિરેક્ટરી જોડો"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "સરનામાઓનું દૃશ્ય TO/CC/BCC માં સંકુચિત કરે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "સરનામાઓનું દૃશ્ય TO/CC/BCC માં address_count માં સ્પષ્ટ થયેલ નંબર પ્રમાણે સંકુચિત કરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
+#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr "બગડેલ માટે ચકાસવા માટેની હેડર સ્પષ્ટ કરે છે."
+
+#: ../mail/evolution-mail.schemas.in.h:19
+#, fuzzy
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr "બગડેલ માટે ચકાસવા માટેની હેડર સ્પષ્ટ કરે છે. gconf માં headername=value બંધારણ છે."
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બનાવવાના છે"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બનાવવાના છે."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બતાવવાના છે"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બતાવવાના છે."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "મૂળભુત આગળ ધપાવવાની શૈલી"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "કમ્પોઝર વિન્ડોની મૂળભૂત ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "સંદેશા વિન્ડોની મૂળભૂત ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "ઉમેદવારી સંવાદની મૂળભૂત ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "વળતા જવાબની મૂળભુત શૈલી"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "થ્રેડ વિસ્તરણ સ્થિતિ માટે મૂળભૂત કિંમત"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "કમ્પોઝર વિન્ડોની મૂળભૂત પહોળાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "સંદેશા વિન્ડોની મૂળભૂત પહોળાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "ઉમેદવારી સંવાદની મૂળભૂત પહોળાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr "નક્કી કરે છે કે શું મોકલનાર ઈમેઈલ માટે સરનામાપુસ્તિકામાં જોવું કે નહિં"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "નક્કી કરે છે કે શું મોકલનાર ઈમેઈલ માટે સરનામાપુસ્તિકામાં જોવું કે નહિં"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
-msgstr "નક્કી કરે છે કે શું સરનામાપુસ્તિકામાં મોકલનારનું સરનામું જોવું. જો મળે, તો તે સ્પામ નહિં હોવું જોઈએ. તે આપોઆપસમાપ્તિ માટે ચિહ્નિત થયેલ પુસ્તિકાઓમાં જુએ છે. તે ધીમું હોઈ શકે, જો દૂરસ્થ સરનામાપુસ્તિકાઓ (જેમ કે ldap) આપોઆપસમાપ્તિ માટે ચિહ્નિત થયેલ હોય."
+msgstr ""
+"નક્કી કરે છે કે શું સરનામાપુસ્તિકામાં મોકલનારનું સરનામું જોવું. જો મળે, તો તે સ્પામ નહિં હોવું "
+"જોઈએ. તે આપોઆપસમાપ્તિ માટે ચિહ્નિત થયેલ પુસ્તિકાઓમાં જુએ છે. તે ધીમું હોઈ શકે, જો દૂરસ્થ "
+"સરનામાપુસ્તિકાઓ (જેમ કે ldap) આપોઆપસમાપ્તિ માટે ચિહ્નિત થયેલ હોય."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "નક્કી કરે છે કે શું બગડેલ માટે વૈવિધ્યપૂર્ણ હેડરો વાપરવી"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
-msgstr "નક્કી કરે છે કે શું બગડેલ માટે ચકાસણી કરવા વૈવિધ્યપૂર્ણ હેડરો વાપરવી. જો આ વિકલ્પ સક્રિય કરેલ હોય અને હેડરો સૂચવેલ હોય, તો તે બગડેલ ચકાસણીની ઝડપ સુધારશે."
+msgstr ""
+"નક્કી કરે છે કે શું બગડેલ માટે ચકાસણી કરવા વૈવિધ્યપૂર્ણ હેડરો વાપરવી. જો આ વિકલ્પ સક્રિય "
+"કરેલ હોય અને હેડરો સૂચવેલ હોય, તો તે બગડેલ ચકાસણીની ઝડપ સુધારશે."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
-msgstr "\"સંદેશાઓ\" સ્તંભમાં ઊભા દેખાવમાં \"તરફથી\" અને \"વિષય\" બંને વાક્યો માટે શું એક જ ફોન્ટ વાપરવા કે નહિં તે નક્કી કરે છે."
+msgstr ""
+"\"સંદેશાઓ\" સ્તંભમાં ઊભા દેખાવમાં \"તરફથી\" અને \"વિષય\" બંને વાક્યો માટે શું એક જ ફોન્ટ "
+"વાપરવા કે નહિં તે નક્કી કરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "કમ્પોઝરમાં ફાઈલો લાવવા/જોડવા માટેની ડિરેક્ટરી."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "મેઈલ કમ્પોનન્ટ ફાઈલો સાચવવા માટેની ડિરેક્ટરી."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "તમે ટાઈપ કરો તે શબ્દ પર જોડણઈ ભૂલ સૂચવનારાઓ દોરો."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "બહાર નીકળવા પર બગડેલ ફોલ્ડરો ખાલી કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "ખાલી કચરાપેટી ફોલ્ડરો અસ્તિત્વમાં નથી"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "જ્યારે ઈવોલ્યુશન બંધ કરી રહ્યા હોય ત્યારે બધા બગડેલ ફોલ્ડરો ખાલી કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ઈવોલ્યુશનમાંથી બહાર નીકળો ત્યારે બધા કચરાપેટી ફોલ્ડરો ખાલી કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "કેરેટ સ્થિતિ સક્રિય કરો, કે જેથી તમે મેઈલ વાંચતી વખતે કર્સર જોઈ શકો."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "જાદુઈ જગ્યા પટ્ટી સક્રિય કે નિષ્ક્રિય કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "શોધ લક્ષણ આગળ સક્રિય કરો અથવા નિષ્ક્રિય કરો પ્રકાર"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "શોધ ફોલ્ડરો સક્રિય કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "શરૂઆતમાં શોધ ફોલ્ડરો સક્રિય કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12473,33 +13142,35 @@ msgstr ""
 "વપરાશ એ છે કે તમે સરળતાથી ફોલ્ડર શોધી શકો છો તે બાજુ પટ્ટીમાં ખાલી ફોલ્ડરનું નામ લખીને "
 "અને પસંદગી આપોઆપ તે ફોલ્ડરમાં કૂદી પડે."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
-msgstr "સંદેશા પૂર્વદર્શન, સંદેશા યાદી અને ફોલ્ડરોમાં સરકાવવા માટે જગ્યા પટ્ટી કી વાપરવા માટે આને સક્રિય કરો."
+msgstr ""
+"સંદેશા પૂર્વદર્શન, સંદેશા યાદી અને ફોલ્ડરોમાં સરકાવવા માટે જગ્યા પટ્ટી કી વાપરવા માટે આને "
+"સક્રિય કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "મર્યાદિત માપનો સંદેશા લખાણ ભાગ રેન્ડર કરવાનું સક્રિય કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "કેરેટ સ્થિતિ સક્રિય/નિષ્ક્રિય કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "સંદેશા યાદી તકતીની ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "સંદેશા-યાદી તકતીની ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ફોલ્ડર-પ્રતિ પૂર્વદર્શન છુપાવે છે અને પસંદગી દૂર કરે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12507,13 +13178,13 @@ msgstr ""
 "જો વપરાશકર્તા ૧૦ અથવા વધુ સંદેશાઓ એક જ સમયે ખોલવાનો પ્રયત્ન કરે, તો જો વપરાશકર્તા "
 "ખરેખર ઈચ્છા ધરાવતો હોય તો તેને પૂછો."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "જો \"પૂર્વદર્શન\" તકતી ચાલુ હોય, તો પછી તેને ઊભું દર્શાવવાની જગ્યાએ બાજુ-પછી-બાજુ દર્શાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
 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 "
@@ -12522,48 +13193,74 @@ msgstr ""
 "જો ત્યાં કોઈ આંતરિક દર્શક કોઈ ચોક્કસ પ્રકારના mime કે જે ઈવોલ્યુશનની અંદર હોય, અને કોઈ "
 "પ્રકારના mime."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "તે ઘણા સંદેશાઓને ચિહ્નિત કરતી વખતે પ્રોમ્પ્ટ સક્રિય/નિષ્ક્રિય કરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
-msgstr "તે પુનરાવર્તિ પ્રોમ્પ્ટને પૂછવાનું નિષ્ક્રિય/સક્રિય કરે છે જો ઓફલાઈન સુમેળ જરૂરી હોય ઓફલાઈન સ્થિતિમાં જવા પહેલાં."
+msgstr ""
+"તે પુનરાવર્તિ પ્રોમ્પ્ટને પૂછવાનું નિષ્ક્રિય/સક્રિય કરે છે જો ઓફલાઈન સુમેળ જરૂરી હોય ઓફલાઈન "
+"સ્થિતિમાં જવા પહેલાં."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
-msgstr "સંદેશાઓને શોધ ફોલ્ડરમાંથી કાઢી નાંખવાનું સંદેશાને કાયમી રીતે કાઢી નાંખે છે એ ચેતવણી આપવા માટે તે પુનરાવર્તિ પ્રોમ્પ્ટને પૂછવાનું નિષ્ક્રિય/સક્રિય કરે છે, તેને શોધ પરિણામોમાંથી ખાલી દૂર કરીને નહિં."
+msgstr ""
+"સંદેશાઓને શોધ ફોલ્ડરમાંથી કાઢી નાંખવાનું સંદેશાને કાયમી રીતે કાઢી નાંખે છે એ ચેતવણી આપવા માટે "
+"તે પુનરાવર્તિ પ્રોમ્પ્ટને પૂછવાનું નિષ્ક્રિય/સક્રિય કરે છે, તેને શોધ પરિણામોમાંથી ખાલી દૂર કરીને "
+"નહિં."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "છેલ્લા સમયે બગડેલ ખાલી કરો ચાલ્યું હતું"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "છેલ્લી વખતે ખાલી કચરાપેટી ચાલી હતી"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "સંદેશાઓ લોગ થવા જોઈએ તેની બહારનું સ્તર."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "લેબલો અને તેની સાથે સંકળાયેલ રંગોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "સ્વીકાર્ય લાઈસન્સોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "ખાતાઓની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12571,11 +13268,15 @@ msgstr ""
 "ઈવોલ્યુશનના મેઈલ કમ્પોનન્ટ માટે જાણીતા ખાતાઓની યાદી. યાદી શબ્દમાળા ધરાવે છે જે /apps/"
 "evolution/mail/accounts ની ઉપડિરેક્ટરીને અનુલક્ષે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "કસ્ટમ હેડરોની યાદી અને શું તેઓ સક્રિય છે."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:77
 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."
@@ -12583,122 +13284,126 @@ msgstr ""
 "ઈવોલ્યુશનના મેઈલ ભાગને જાણતા લેબલોની યાદી. યાદી શબ્દમાળાઓ ધરાવે છે જે નામ:રંગ ધરાવે છે કે "
 "જ્યાં રંગો HTML હેક્ઝ સંગ્રહપદ્ધતિ વાપરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "બોનોબો કમ્પોનન્ટ દર્શકોની ચકાસણી માટે mime પ્રકારોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "પ્રોટોકોલ નામોની યાદી કે જેઓનું લાઈસન્સ સ્વીકારાયેલ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "HTML સંદેશાઓ માટે http ની ઉપર ચિત્રો લાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
-msgstr "http(s) ઉપર HTML સંદેશાઓ માટે ચિત્રો લાવો. આ શક્ય કિંમતો છે: ૦ - નેટની બહાર ક્યારેય ચિત્રો લાવો નહિં. ૧ - સંપર્કોમાંથી સંદેશાઓમાં ચિત્રો લાવો. ૩ - હંમેશા નેટની બહાર ચિત્રો લાવો."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
+msgstr ""
+"http(s) ઉપર HTML સંદેશાઓ માટે ચિત્રો લાવો. આ શક્ય કિંમતો છે: ૦ - નેટની બહાર ક્યારેય "
+"ચિત્રો લાવો નહિં. ૧ - સંપર્કોમાંથી સંદેશાઓમાં ચિત્રો લાવો. ૩ - હંમેશા નેટની બહાર ચિત્રો "
+"લાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "ગાળકની ક્રિયાઓનો લોગ"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "ગાળકની ક્રિયાઓનો લોગ કોઈ સ્પષ્ટ કરેલ લોગ ફાઈલમાં કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "ગાળકની ક્રિયાઓનો લોગ માટેની લોગ ફાઈલ"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "ગાળકની ક્રિયાઓનો લોગ માટેની લોગ ફાઈલ."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "સ્પષ્ટ કરેલ સમય સમાપ્ત થાય પછી જોયું છે એમ ચિહ્નિત કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "સ્પષ્ટ કરેલ સમય પછી જોયું હોય એમ ચિહ્નિત કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "સંદેશા \"પૂર્વદર્શન\" માં સાઈટ બનાવવાનું ચિહ્નિત કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "સંદેશા \"પૂર્વદર્શન\" માં સાઈટ બનાવવાનું ચિહ્નિત કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "સંદેશા વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "સંદેશા વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "સંદેશા-પ્રદર્શન શૈલી (\"સામાન્ય\", \"આખી હેડરો\", \"સ્રોત\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "બહાર નીકળવા પર બગડેલને ખાલી કરરવાના ન્યૂનતમ દિવસો"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "બહાર નીકળવા પર કચરાપેટીને ખાલી કરતી વખતે લાગતા ન્યુનતમ દિવસો"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "બહાર નીકળવા પર બગડેલને ખાલી કરરવાના ન્યૂનતમ દિવસો, દિવસોમાં."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "બહાર નીકળવા પર કચરાપેટીને ખાલી કરતી વખતે લાગતા ન્યુનતમ દિવસો, દિવસોમાં."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC માં દર્શાવવા માટેના સરનામાઓની સંખ્યા"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "ખાલી વિષય પર પ્રોમ્પ્ટ"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "જ્યારે તે અથવા તેણી ફોલ્ડરને સંપૂર્ણ રીતે દૂર કરવા માંગો ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "જ્યારે તે અથવા તેણી વિષય વગર સંદેશો મોકલવાનો પ્રયત્ન કરે છે ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "શું વપરાશકર્રતા તુરંત જ ઓફલાઈન જવા માંગે છે તે ચકાસવા માટે પૂછો"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "જ્યારે શોધ ફોલ્ડરમાંથી સંદેશાઓ કાઢી રહ્યા હોય ત્યારે પૂછો"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "જ્યારે વપરાશકર્તા સંપૂર્ણપણે દૂર કરે છે ત્યારે પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "જ્યારે વપરાશકર્તા માત્ર આને પણ ખબર વિના મોકલો ભરે છે ત્યારે પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "જ્યારે વપરાશકર્તા એક જ સમયે ૧૦ અથવા વધુ સંદેશાઓ ખોલવાનો પ્રયત્ન કરે ત્યારે પૂછો"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12706,139 +13411,142 @@ msgstr ""
 "જ્યારે વપરાશકર્તા HTML મેઈલ મેળવનારાઓને મોકલે છે કે જેઓ HTML મેઈલ મેળવવા માંગતા ના હોય "
 "ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "જ્યારે વપરાશકર્તા સંદેશો પ્રતિ અને આને પણ ભર્યા વગર મોકલવાનો પ્રયત્ન કરે છે ત્યારે "
 "વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "જ્યારે વપરાશકર્તા બિનજરુરી HTML મોકલવાનો પ્રયત્ન કરે છે ત્યારે તે વપરાશકર્તાને પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "વિવિધ સંદેશાઓને ચિહ્નતિ કરતી વખતે પ્રોમ્પ્ટ કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "લખાણમાં ચિહ્નો ઓળખો અને તેમને ચિત્રો સાથે બદલો."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "લખાણમાં કડીઓ ઓળખે છે અને તેઓને બદલે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "આવતા મેઈલ પર બગડેલ ચકાસણી ચલાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "ડિરેક્ટરી સંગ્રહો"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "સ્થાનિક સરનામાપુસ્તિકાઓમાં મોકલનાર ફોટો માટે શોધો"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "મૂળભુત રીતે HTML મેઈલ મોકલો"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "મૂળભુત રીતે HTML મેઈલ મોકલો."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "સંદેશા યાદીમાં મોકલનાર ઈમેઈલ-સરનામા સ્તંભ"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "સર્વર સુમેળ અંતરાલ"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "એનિમેશન બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "હાલતાં ચાલતાં ચિત્રો એનિમેશન તરીકે બતાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "કાઢી નંખાયેલ સંદેશાઓ સંદેશા યાદીમાં બતાવો (ચેકી નંખાયેલ રીતે)."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "કાઢી નંખાયેલ સંદેશાઓ સંદેશા યાદીમાં બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "મોકલનારનો ફોટો બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "મોકલનારનું ઈમેઈલ-સરનામું સંદેશા યાદીમાં અલગ સ્તંભમાં બતાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "સંદેશા વાચન તકતીમાં મોકલનારનો ફોટો બતાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "બગડેલ માટે ચકાસવા માટેની હેડર સ્પષ્ટ કરે છે."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr "બગડેલ માટે ચકાસવા માટેની હેડર સ્પષ્ટ કરે છે. gconf માં headername=value બંધારણ છે."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "લીટીમાં જોડણી ચકાસો"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "રંગ જોડણી ચકાસી રહ્યા છીએ"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "ભાષામાં જોડણી ચકાસો"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "સંવાદની મૂળભુત ઊંચાઈ નોંધાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "સંવાદની મૂળભુત પહોળાઈ નોંધાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "ટર્મિનલ ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "લખાણ સંદેશો ભાગ મર્યાદા"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "બગડેલ હુક માટે મૂળભૂત પ્લગઈન"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "છેલ્લા સમયે બગડેલ ખાલી કરો ચાલ્યું હતું, ઈપોકથી દિવસોમાં."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "છેલ્લે વખતે ખાલી કચરાપેટી ચાલી હતી, દિવસોમાં ઈપોકથી."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "મેઈલ દર્શાવવા માટેના ટર્મિનલ ફોન્ટ."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "મેઈલ દર્શાવવા માટે ચલ પહોળાઈ ફોન્ટ."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr "આની ત્રણ શક્ય કિંમતો હોઈ શકે. ભૂલો માટે ૦. ચેતવણીઓ માટે ૧. ડિબગ સંદેશાઓ માટે ૨."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12846,7 +13554,7 @@ msgstr ""
 "આ લખાણ ભાગનું મહત્તમ માપ નક્કી કરે છે કે જે ઈવોલ્યુશન હેઠળ ફોર્મેટ કરી શકાય છે. 4MB / 4096 "
 "KB મૂળભૂત છે અને KB અનુસાર સ્પષ્ટ થાય છે."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12855,15 +13563,16 @@ msgstr ""
 "આ મૂળભૂગ બગડેલ પ્લગઈન છે, ત્યાં ઘણાબધા પ્લગઈનો સક્રિય કરેલ હોવા છતાંય. જો મૂળભૂત યાદી થયેલ "
 "પ્લગઈન નિષ્ક્રિય કરવામાં આવેલ હોય, તો પછી તે અન્ય ઉપલબ્ધ પ્લગઈનો પર ફોલબેક થશે નહિં."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 "આ કી માત્ર એક જ વાર વંચાવી જોઈએ અને વંચાયા પછી ખોટામાં પુનઃસુયોજીત થવી જોઈએ. આ "
 "યાદીમાંથી મેઈલની પસંદગી દૂર કરે છે અને તે ફોલ્ડર માટેનું પૂર્વદર્શન દૂર કરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 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;"
@@ -12874,11 +13583,18 @@ msgstr ""
 "થશે. XML સંરચનાનું બંધારણ &lt;હેડર સક્રિય&gt; હોય છે - સક્રિય સુયોજિત કરો જો હેડર એ મેઈલ "
 "દેખાવમાં પ્રદર્શિત થાય."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "આ વિકલ્પ મેળવવાની ઝડપ સુધારવામાં મદદ કરશે."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12886,120 +13602,132 @@ msgstr ""
 "આ મૂળભૂત સંદેશા યાદી દૃશ્યમાં બતાવવા માટેના સરનામાઓની સંખ્યાને સુયોજિત કરે છે, કે જેના પછી "
 "'...' બતાવાયેલ હોય."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
-msgstr "આ સુયોજન સ્પષ્ટ કરે છે કે શું થ્રેડો મૂળભૂત રીતે વિસ્તૃત કે સંકુચિત સ્થિતિમાં હોવા જોઈએ. ઈવોલ્યુશનને પુનઃશરૂ કરવાની જરૂર છે."
+msgstr ""
+"આ સુયોજન સ્પષ્ટ કરે છે કે શું થ્રેડો મૂળભૂત રીતે વિસ્તૃત કે સંકુચિત સ્થિતિમાં હોવા જોઈએ. "
+"ઈવોલ્યુશનને પુનઃશરૂ કરવાની જરૂર છે."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
-msgstr "આ સુયોજન સ્પષ્ટ કરે છે શું થ્રેડો દરેક થ્રેડમાં તાજેતરના સંદેશા પર આધાર રાખીને ક્રમમાં ગોઠવવા જોઈએ, સંદેશાઓની તારીખની જગ્યાએ. ઈવોલ્યુશનને પુનઃશરૂ કરવાની જરૂર છે."
+msgstr ""
+"આ સુયોજન સ્પષ્ટ કરે છે શું થ્રેડો દરેક થ્રેડમાં તાજેતરના સંદેશા પર આધાર રાખીને ક્રમમાં ગોઠવવા "
+"જોઈએ, સંદેશાઓની તારીખની જગ્યાએ. ઈવોલ્યુશનને પુનઃશરૂ કરવાની જરૂર છે."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "સંદેશાની યાદીને થ્રેડ કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "સંદેશા-યાદીને થ્રેડ કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "વિષયને આધારિત સંદેશા-યાદીને થ્રેડ કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "સંદેશાને જોયેલ તરીકે ચિહ્નિત કરવામાં સમયસમાપ્ત"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "સંદેશાને જોયેલ તરીકે ચિહ્નિત કરવામાં સમયસમાપ્ત."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "મૂળભૂત ખાતા માટે UID શબ્દમાળા."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin ડિમન અને ક્લાઈન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin ડિમન અને ક્લાઈન્ટ વાપરો (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "કસ્ટમ ફોન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "મેઈલ પ્રદર્શિત કરવા માટે વૈવિધ્યપૂર્ણ ફોન્ટ વાપરો."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "માત્ર સ્થાનિક ચકાસણીઓ વાપરો."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "માત્ર સ્થાનિક ચકાસણીઓ વાપરો (DNS નહિં)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "બાજુ-પછી-બાજુ અથવા પહોળો દેખાવ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "ચલિત પહોળાઈના ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "દેખાવ/આને પણ ખબર વિના મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "દેખાવ/આને પણ ખબર વિના મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "દેખાવ/આને પણ મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "દેખાવ/આને પણ મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "દેખાવ/તરફથી મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "દેખાવ/તરફથી મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "દેખાવ/ને મોકલો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "દેખાવ/ને મોકલો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "દેખાવ/ને જવાબ આપો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "દેખાવ/ને જવાબ આપો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "શું વાંચન રસીદ અરજી દરેક સંદેશામાં મૂળભૂત રીતે ઉમેરાઈ જાય છે."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13007,43 +13735,43 @@ msgstr ""
 "શું થ્રેડિંગને વિષયો દ્વારા પાછા જોવું કે નહિં જ્યારે સંદેશાઓ ના વળતા જવાબમાં અથવા સંદર્ભો "
 "નામની હેડરો સમાવે નહિં ત્યારે."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "શું તાજેતરના સંદેશા પર આધાર રાખીને થ્રેડોને તે થ્રેડમાં ક્રમમાં ગોઠવવા"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "સંદેશા-યાદી તકતીની પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "સંદેશા-યાદી તકતીની પહોળાઈ."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm માહિતી આયાત કરી રહ્યા છીએ"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "ઈવોલ્યુશન Elm આયાત કરનાર"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Elm માંથી મેઈલ આયાત કરો."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "અંતિમ મુકામનું ફોલ્ડર:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "માં આયાત કરવા માટેનું ફોલ્ડર પસંદ કરો"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "બર્કલી મેઈલબોક્સ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "બર્કલી મેઈલબોક્સ બંધારણના ફોલ્ડરો આયાત કરનાર"
 
@@ -13051,7 +13779,7 @@ msgstr "બર્કલી મેઈલબોક્સ બંધારણના
 msgid "Importing mailbox"
 msgstr "મેઈલબોક્સ આયાત કરી રહ્યા છીએ"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' આયાત કરી રહ્યા છીએ"
@@ -13061,15 +13789,15 @@ msgstr "`%s' આયાત કરી રહ્યા છીએ"
 msgid "Scanning %s"
 msgstr "%s સ્કેન કરી રહ્યા છીએ"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "ખોવાયેલ માહિતી આયાત કરી રહ્યું છે"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "ઈવોલ્યુશન પાઈન આયાત કરનાર"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Pine માંથી મેઈલ આયાત કરો."
 
@@ -13097,139 +13825,154 @@ msgstr "%s મેઈલીંગ યાદી"
 msgid "Add Filter Rule"
 msgstr "ગાળક નિયમ ઉમેરો"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "ટેમ્પલેટો"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d પસંદ થયેલ, "
 msgstr[1] "%d પસંદ થયેલ, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d કાઢી નંખાયેલ છે"
 msgstr[1] "%d કાઢી નંખાયેલ છે"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d બગડેલ છે"
 msgstr[1] "%d બગડેલા છે"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ડ્રાફ્ટ"
 msgstr[1] "%d ડ્રાફ્ટો"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d મોકલાયેલ છે"
 msgstr[1] "%d મોકલાયેલા છે"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d અસુયોજિત છે"
 msgstr[1] "%d અસુયોજિત છે"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d નહિં વંચાયેલ, "
 msgstr[1] "%d નહિં વંચાયેલ, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d કુલ"
 msgstr[1] "%d કુલ"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "નવો મેઈલ સંદેશો"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:917
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "મેઈલ સંદેશો (_M)"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "નવો મેઈલ સંદેશો કમ્પોઝ કરો"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "નવું મેઈલ ફોલ્ડર"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:925
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "મેઈલ ફોલ્ડર (_F)"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "નવું મેઈલ ફોલ્ડર બનાવો"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "મેઈલ સુયોજનો અથવા ફોલ્ડરો સુધારવામાં નિષ્ફળ."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "ભૂલ"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "ભૂલો"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "ચેતવણીઓ અને ભૂલો"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "ડિબગ"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "ભૂલ, ચેતવણીઓ અને ડિબગ સંદેશાઓ"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "ડિબગ લોગ"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "આના માટે પરિસ્થિતિદર્શક પટ્ટીમાં ભૂલો બતાવો (_e)"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1745
+msgid "second(s)."
 msgstr "સેકન્ડો."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "લોગ સંદેશાઓ:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "લોગ સ્તર"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "સમય"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "સંદેશાઓ"
 
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "આ વિન્ડો બંધ કરો"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " આધારભૂત સેવાઓ માટે ચકાસો (_e) "
@@ -13243,7 +13986,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL એ ઈવોલ્યુશનની આ આવૃત્તિમાં આધારભૂત નથી</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>મોકલનાર ફોટોગ્રાફ</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13324,73 +14067,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">છપાયેલ ફોન્ટ</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">પ્રોક્સી સુયોજનાઓ</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">જરુરી જાણકારી</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">સુરક્ષિત MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">સુરક્ષા</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">મોકલાયેલ અને ડ્રાફ્ટ સંદેશાઓ</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">સર્વર રુપરેખાંકન</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">સત્તાધિકરણ પ્રકાર (_A)</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "ખાતા વ્યવસ્થા"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "નવી સહી ઉમેરો (_w)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "લિપી ઉમેરો (_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "જ્યારે આ ખાતુ વાપરી રહ્યા હોય ત્યારે હંમેશા જતા સંદેશાઓને સહી કરો (_w)"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "જ્યારે એનક્રિપ્ટ થયેલ સંદેશાઓ મોકલી રહ્યા હોય ત્યારે તેને પણ એનક્રિપ્ટ કરો (_f)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "હંમેશા કાર્બન કોપી (આને પણ) (_s):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "હંમેશા અંધ કાર્બન કોપી મોકલો (bcc) (_b):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "જ્યારે એનક્રિપ્ટ કરી રહ્યા હોય ત્યારે હંમેશા મારી કીરીંગમાં કી પર વિશ્વાસ કરો (_t)"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "જ્યારે એનક્રિપ્ટ થયેલ સંદેશાઓ મોકલી રહ્યા હોય ત્યારે હંમેશા પોતાને એનક્રિપ્ટ કરો (_m)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "વાંચન રસીદની હંમેશા અરજી કરો (_d)"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "મૂળ સંદેશો જોડો"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "ચિહ્ન ચિત્રો આપોઆપ દાખલ કરો (_e)"
@@ -13408,13 +14151,14 @@ msgid "C_haracter set:"
 msgstr "અક્ષરોનો સમૂહ (_h):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "બગાડ માટે વૈવિધ્યપૂર્ણ હેડરો ચકાસો (_h)"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "આધારભૂત પ્રકારો માટે ચકાસો (_e)"
 
+#: ../mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Check cu_stom headers for junk"
+msgstr "બગાડ માટે વૈવિધ્યપૂર્ણ હેડરો ચકાસો (_h)"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "બગાડ માટે આવતા સંદેશાઓ ચકાસો (_m)"
@@ -13476,16 +14220,17 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "બહાર જતા સંદેશાઓને ડિજીટલ રીતે સહી કરો (મૂળભૂત રીતે) (_u)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "સંદેશાઓને બગડેલ તરીકે ચિહ્નિત કરો નહિં જો મોકલનાર મારી સરનામાપુસ્તિકામાં હોય (_n)"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "સંદેશાઓમાંનના લખાણ સમાવિષ્ટો ફોર્મેટ કરશો નહિં જો લખાણ માપ આના કરતાં વધી જાય (_z)"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "સંદેશાઓમાંનના લખાણ સમાવિષ્ટો ફોર્મેટ કરશો નહિં જો લખાણ માપ આના કરતાં વધી જાય (_z)"
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr "સંદેશાઓને બગડેલ તરીકે ચિહ્નિત કરો નહિં જો મોકલનાર મારી સરનામાપુસ્તિકામાં હોય (_k)"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "મૂળ સંદેશાને અવતરિત કરો નહિં"
+msgid "Do not quote"
+msgstr "ક્વોટા કરો નહિં"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13548,68 +14293,85 @@ msgid "HTML Messages"
 msgstr "HTML સંદેશાઓ"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "HTTP પ્રોક્સી (_T):"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "હેડરો"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "અવતરણોને આની સાથે પ્રકાશિત કરો (_q)"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "લીટીની અંદર"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "લીટીમાં મૂળ સંદેશો (આઉટલુક શૈલી)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "ઇનલાઇન (આઉટલુક શૈલી)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "લેબલો"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "ભાષાઓનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "મેઈલ રુપરેખાંકન"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "મેઈલ હેડરોનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "મેઈલબોક્સ જગ્યા"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "સંદેશા કમ્પોઝર"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "નોંધ: લેબલ નામમાં નીચે લીટી એ મેનુમાં સાંકેતિક ચિહ્ન ઓળખનાર તરીકે વપરાય છે."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "નોંધ: જ્યાં સુધી તમે પહેલી વખત જોડાવો નહિં ત્યાં સુધી તે તમને પાસવર્ડ માટે પૂછશે નહિં"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "આ વિકલ્પ પર ફરીથી લખવામાં આવશે જો વૈવિધ્યપૂર્ણ બગડેલ હેડરો માટે જોડણી મળી આવે."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "સંસ્થા (_g):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "પાસવર્ડ (_w):"
+
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13617,7 +14379,7 @@ msgstr ""
 "મહેરબાની કરીને આ ખાતા માટે નીચેની જગ્યામાં વર્ણનાત્મક નામ દાખલ કરો.\n"
 "આ નામ માત્ર પ્રદર્શનના હેતુ માટે જ વપરાશે."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13625,7 +14387,7 @@ msgstr ""
 "મહેરબાની કરીને તમે કઈ રીતે મેઈલ મોકલો તે વિશે જાણકારી દાખલ કરો. જો તમે ચોક્કસ નહિં "
 "હોય, તો તમારા સિસ્ટમ સંચાલક અથવા ઈન્ટરનેટ સેવા પૂરી પાડનારને પૂછો."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 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 "
@@ -13634,107 +14396,115 @@ msgstr ""
 "મહેરબાની કરીને નીચે તમારું નામ અને ઈ-મેઈલ સરનામું દાખલ કરો. નીચેના \"વૈકલ્પિક\" ક્ષેત્રો "
 "ભરવાની જરુર નથી, જ્યાં સુધી તમે આ જાણકારી તમે મોકલેલા ઈ-મેઈલમાં સમાવવા માંગો નહિં."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "મહેરબાની કરીને નીચેના વિકલ્પોમાંથી પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "પોર્ટ:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "જ્યારે સંદેશાઓ આને પણ ખબર વિના દ્વારા મોકલો ત્યારે પૂછો"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "મૂળ સંદેશાને અવતરિત કરો"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "અવતરિત"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "પાસવર્ડ યાદ રાખો (_m)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "ને જવાબ આપો (_p):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "પાસવર્ડ યાદ રાખો (_p)"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "SOCKS યજમાન (_O)"
+
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "સ્થાનિક સરનામાપુસ્તિકાઓમાં માત્ર મોકલનાર ફોટોગ્રાફ માટે જ શોધો (_e)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "પસંદ કરો (_e)..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "સંદેશા રસીદો મોકલો (_e):"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "પ્રમાણભૂત ફોન્ટ (_t):"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "HTML ચોક્કસ પહોળાઈ ફોન્ટ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "છાપવા માટે HTML ચોક્કસ પહોળાઈ ફોન્ટ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML ચલિત પહોળાઈ ફોન્ટ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "છાપન માટે HTML ચલિત પહોળાઈ ફોન્ટ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "મેઈલ મોકલી રહ્યા છીએ"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "મોકલાયેલ સંદેશાઓનું ફોલ્ડર (_M):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "સર્વરને સત્તાધિકરણ જરુરી છે (_v)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "સર્વરનો પ્રકાર (_T): "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "સહી કરવાનું પ્રમાણપત્ર (_n):"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "સહી (_u):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "સહીઓ"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "સહીઓનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "જોડણી ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "પ્રકાર (_y): "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13742,7 +14512,7 @@ msgstr ""
 "અંહિય યાદી થયેલ ભાષાઓમાંની માત્ર તે જ ભાષાઓ પરાવર્તિત થાય છે જેમના માટે તમે શબ્દકોષ "
 "સ્થાપિત કર્યો છે."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13752,11 +14522,7 @@ msgstr ""
 "તમે સ્પષ્ટ કરેલ નામ માત્ર ડિસ્પ્લેના હેતુ માટે\n"
 "વપરાશે. "
 
-#: ../mail/mail-config.glade.h:146
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr "આ વિકલ્પ પર ફરીથી લખવામાં આવશે જો વૈવિધ્યપૂર્ણ બગડેલ હેડરો માટે જોડણી મળી આવે."
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13764,16 +14530,25 @@ msgstr ""
 "નામ છાપો કે જેના દ્વારા તમે આ ખાતાને વાપરવા માંગો છો.\n"
 "ઉદાહરણ તરીકે: \"કામ\" અથવા \"ખાનગી\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "વપરાશકર્તા નામ (__e):"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "સત્તાધિકરણ વાપરો (_n)"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "વપરાશકર્તા નામ (_n):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "ચલિત-પહોળાઈ (_a):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13783,100 +14558,126 @@ msgstr ""
 "\n"
 "શરુઆત કરવા માટે \"આગળ ધપાવો\" પર ક્લિક કરો. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "સહી ઉમેરો (_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "હંમેશા ઈન્ટરનેટમાંથી ચિત્રો લાવો (_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "આપોઆપ પ્રોક્સી રૂપરેખાંકન URL (_A):"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "મૂળભૂત બગડેલ પ્લગઈન (_D):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "ઇન્ટરનેટ માટે સીધુ જ જોડાણ (_D)"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "મંત્રણાની માંગણીઓની સહી કરો નહિં (આઉટલુકની સાથે સુસંગતતા માટે) (_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "આગળ ધપાવવાની શૈલી (_F):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "પ્રત્યુત્તર આપવા પર મૂળ સંદેશા ઉપર સહી રાખો (_K)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "સંપર્કોમાંથી સંદેશાઓમાં ચિત્રો લાવો (_L)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local addressbook only"
+msgstr "સ્થાનિક સરનામાપોથી ફોલ્ડરોની યાદી આપો"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "આને મારુ મૂળભુત ખાતું બનાવો (_M)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "મેન્યુઅલ પ્રોક્સી રૂપરેખાંકન (_M):"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "પછી વંચાયેલ સંદેશાઓને ચિહ્નિત કરો (_M)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ઈન્ટરનેટમાંથી ક્યારેય ચિત્રો લાવો નહિં (_N)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "પથ (_P):"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "સંપર્કો કે જેઓને જરુર ના હોય તોપણ HTML સંદેશાઓ મોકલી રહ્યા હોય ત્યારે તેમને પૂછો (_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "જ્યારે સંદેશો ખાલી વાક્ય સાથે મોકલી રહ્યા હોય ત્યારે પૂછો (_P)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "જવાબની શૈલી (_R):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "લિપી (_S):"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "સુરક્ષિત HTTP પ્રોક્સી (_S):"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "પસંદ કરો (_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "ચિત્ર એનીમેશનો બતાવો (_S)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "સંદેશા પૂર્વદર્શનમાં મોકલનારનો ફોટોગ્રાફ બતાવો (_S)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "પ્રતિ / આને પણ / આને પણ ખબર વિના હેડરો આમાં સંકોચો (_S) "
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "સુરક્ષિત જોડાણ વાપરો (_U):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "મૂળભુત સિસ્ટમ વાપરો (_U)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "બીજા કાર્યક્રમોનની જેમ સરખા ફોન્ટ વાપરો (_U)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "સરનામાઓ"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "રંગ"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "વર્ણન"
 
@@ -13916,43 +14717,43 @@ msgstr "કેસ પ્રત્યે સંવેદનશીલ (_s)"
 msgid "Co_mpleted"
 msgstr "સમાપ્ત (_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "શોધો (_n):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "સંદેશામાં શોધો"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "અનુસરવા માટેની નિશાની"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "ફોલ્ડરની ઉમેદવારી"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "લાઈસન્સ મંજૂરીપત્ર"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "કંઈ પસંદ થયેલ નથી"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "સર્વર (_e):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "સુરક્ષા જાણકારી"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "ચોક્કસ ફોલ્ડરો"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13960,23 +14761,23 @@ msgstr ""
 "તમે અનુસરવા માટે પસંદ કરેલ દરેક સંદેશાઓ નીચે યાદીત કરેલ છે.\n"
 "મહેરબાની કરીને નીચેની ક્રિયા માટે \"નિશાની\" મેનુ પસંદ કરો."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "લાઈસન્સ સ્વીકારો (_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "દ્વારા છેલ્લે (_D):"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "ઝંડો (_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "લાઈસન્સની મંજૂરી સ્વીકારવા માટે આને ચિહ્નિત કરો (_T)"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "%s ને ચકાસી રહ્યા છીએ"
@@ -14023,11 +14824,11 @@ msgstr "%d માંના %d સંદેશાને મોકલી રહ્
 msgid "Failed to send %d of %d messages"
 msgstr "%d માંના %d સંદેશાઓને મોકલવામાં નિષ્ફળ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "રદ થઈ ગયેલ."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "પૂર્ણ."
 
@@ -14055,67 +14856,72 @@ msgid "Opening folder %s"
 msgstr "ફોલ્ડર %s ખોલી રહ્યા છીએ"
 
 #: ../mail/mail-ops.c:1270
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "%s માટે સંપર્ક જાણકારી"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "સ્ટોર %s ખોલી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "ફોલ્ડર %s દૂર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ફોલ્ડર '%s' સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ખાતું '%s' સંપૂર્ણપણે દૂર કરી રહ્યા છીએ અને સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ખાતુ '%s' સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "ફોલ્ડર ફરીથી તાજું કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "ફોલ્ડર સંપૂર્ણપણે દૂર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "કચરાપેટીને '%s' માં ખાલી કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "સ્થાનિક ફોલ્ડરો"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "સંદેશો %s મેળવી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d સંદેશો મેળવી રહ્યા છીએ"
 msgstr[1] "%d સંદેશાઓ મેળવી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "%d સંદેશાનો સંગ્રહ કરી રહ્યા છીએ"
 msgstr[1] "%d સંદેશાઓ સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14124,11 +14930,11 @@ msgstr ""
 "માં સંદેશાઓ સંગ્રહતી વખતે ભૂલ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "જોડાણ સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14137,51 +14943,51 @@ msgstr ""
 "આઉટપુટ ફાઈલ બનાવી શકતા નથી: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "માહિતી લખી શક્યા નહિં: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%sમાંથી સંપર્ક તોડી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s સાથે ફરીથી જોડાઈ રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ઓફલાઈન માટે ખાતું '%s' તૈયાર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "સેવા ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "રદ કરી રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "મેઈલ મોકલો અને મેળવો"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "બધું નકારો (_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "સુધારી રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "રાહ જોઈ રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "નવા મેઈલ માટે ચકાસી રહ્યા છીએ"
@@ -14209,17 +15015,17 @@ msgstr "પાસવર્ડ દાખલ કરો"
 msgid "User canceled operation."
 msgstr "વપરાશકર્તાએ પ્રક્રિયા નકારી કાઢી."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "સહીમાં ફેરફાર કરો"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "સંગ્રહો અને બંધ કરો (_S)"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "આ સહી માટે નામ દાખલ કરો."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "સહીમાં ફેરફાર કરો"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "નામ:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "સહીનું નામ (_S):"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14260,45 +15066,45 @@ msgstr "'%s:%s' માટે શોધ ફોલ્ડરો સુધારી
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' માટે શોધ ફોલ્ડરો સુધારી રહ્યા છીએ"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "શોધ ફોલ્ડરમાં ફેરફાર"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "નવું શોધ ફોલ્ડર"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "&quot;{0}&quot; નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ વાપરો."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "\"{0}\" નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ વાપરો."
 
 #: ../mail/mail.error.xml.h:2
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "&quot;{1}&quot; નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ વાપરો."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "\"{1}\" નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ વાપરો."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"&quot;{1}&quot; જગ્યાએ ખાલી નહિં હોય એવું ફોલ્ડર હાજર છે.\n"
+"\"{1}\" જગ્યાએ ખાલી નહિં હોય એવું ફોલ્ડર હાજર છે.\n"
 "\n"
 "તમે આ ફોલ્ડરને અવગણવા માટે પસંદ કરી શકો છો, તેના સમાવષ્ટો પર ફરીથી લખી શકો છો અથવા "
 "તેમાં ઉમેરી શકો છો, અથવા બહાર નીકળી શકો છો."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
-msgstr "વાંચન રસીદ સૂચને &quot;{1}&quot; માટે અરજી કરી છે.  શું {0} ને રસીદ સૂચન મોકલવું છે?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr "વાંચન રસીદ સૂચને \"{1}\" માટે અરજી કરી છે.  શું {0} ને રસીદ સૂચન મોકલવું છે?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "&quot;{0}&quot; નામવાળી સહી પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ સ્પષ્ટ કરો."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "\"{0}\" નામવાળી સહી પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ સ્પષ્ટ કરો."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14333,10 +15139,8 @@ msgstr "શું તમે બધા કાઢી નંખાયેલા સ�
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr ""
-"શું તમે ચોક્કસ છો તમે કાયમ માટે તમારા &quot;{0}&quot; ફોલ્ડરમાંના સંદેશાને દૂર કરવા માંગો "
-"છો?"
+"folder \"{0}\"?"
+msgstr "શું તમે બધા કાઢી નંખાયેલા સંદેશાઓને બધા ફોલ્ડર \"{0}\" માંથી કાયમી રીતે દૂર કરવા માંગો છો?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14351,99 +15155,102 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "શું તમે ચોક્કસ છો કે તમે સંદેશાને વિષય વિના મોકલવા માંગો છો?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; ના કારણે."
+msgid "Because \"{0}\"."
+msgstr "\"{0}\" ના કારણે."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; ના કારણે."
+msgid "Because \"{2}\"."
+msgstr " \"{2}\" ના કારણે."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "કોરી સહી"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "શોધ ફોલ્ડર &quot;{0}&quot; ઉમેરી શકતા નથી."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "શોધ ફોલ્ડર \"{0}\" ઉમેરી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ફોલ્ડર &quot;{0}&quot; ને &quot;{1}&quot; માં નકલ કરી શકતા નથી."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "ફોલ્ડર \"{0}\" ને \"{1}\" માં નકલ કરી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "ફોલ્ડર &quot;{0}&quot; બનાવી શકતા નથી."
+msgid "Cannot create folder \"{0}\"."
+msgstr "ફોલ્ડર \"{0}\" બનાવી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "કામચલાઉ સંગ્રહ ડિરેક્ટરી બનાવી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "સંગ્રહ ડિરેક્ટરી બનાવી શકતા નથી, &quot;{1}&quot; ના કારણે"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "સંગ્રહ ડિરેક્ટરી બનાવી શકતા નથી, \"{1}\" ના કારણે"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "ફોલ્ડર &quot;{0}&quot; કાઢી શકતા નથી."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "ફોલ્ડર \"{0}\" કાઢી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "સિસ્ટમ ફોલ્ડર &quot;{0}&quot; કાઢી શકતા નથી."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "સિસ્ટમ ફોલ્ડર \"{0}\" કાઢી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "શોધ ફોલ્ડર &quot;{0}&quot; માં ફેરફાર કરી શકતા નથી કારણ કે તે અસ્તિત્વમાં નથી."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "શોધ ફોલ્ડર \"{0}\" માં ફેરફાર કરી શકતા નથી કારણ કે તે અસ્તિત્વમાં નથી."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ફોલ્ડર &quot;{0}&quot; ને &quot;{1}&quot; માં ખસેડી શકતા નથી."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "ફોલ્ડર \"{0}\" ને \"{1}\" માં ખસેડી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "&quot;{1}&quot; ને ઓપન સોર્સ કરી શકતા નથી"
+msgid "Cannot open source \"{1}\""
+msgstr "\"{1}\" ને ઓપન સોર્સ કરી શકતા નથી"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; ને ઓપન સોર્સ કરી શકતા નથી."
+msgid "Cannot open source \"{2}\"."
+msgstr "\"{2}\" ને ઓપન સોર્સ કરી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "લક્ષ્ય &quot;{2}&quot; ખોલી શકતા નથી."
+msgid "Cannot open target \"{2}\"."
+msgstr "લક્ષ્ય \"{2}\" ખોલી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
-"લાઈસન્સ ફાઈલ &quot;{0}&quot; વાંચી શકતા નથી, સ્થાપન સમસ્યાને કારણે.  જ્યાં સુધી તમે આ "
+"લાઈસન્સ ફાઈલ \"{0}\" વાંચી શકતા નથી, સ્થાપન સમસ્યાને કારણે.  જ્યાં સુધી તમે આ "
 "વિક્રેતાનું લાઈસન્સ સ્વીકારો નહિં ત્યાં સુધી તમે એને વાપરવા સમર્થ નથી."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; નું નામ &quot;{1}&quot; બદલી શકતા નથી."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" નું નામ \"{1}\" બદલી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "સિસ્ટમ ફોલ્ડર &quot;{0}&quot; નું નામ બદલી શકાતું નથી અથવા કાઢી શકાતું નથી."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "સિસ્ટમ ફોલ્ડર \"{0}\" નું નામ બદલી શકાતું નથી અથવા કાઢી શકાતું નથી."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "ખાતામાં બદલાવો સંગ્રહી શકાતા નથી."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "ડિરેક્ટરી &quot;{0}&quot; માં સંગ્રહી શકાતું નથી."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "ડિરેક્ટરી \"{0}\" માં સંગ્રહી શકાતું નથી."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "ફાઈલ &quot;{0}&quot; માં સંગ્રહી શકાતું નથી."
+msgid "Cannot save to file \"{0}\"."
+msgstr "ફાઈલ \"{0}\" માં સંગ્રહી શકાતું નથી."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "સહી સ્ક્રિપ્ટ &quot;{0}&quot; સુયોજિત કરી શકતા નથી."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "સહી સ્ક્રિપ્ટ \"{0}\" સુયોજિત કરી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "જંક નિષ્ફળતા માટે ચકાસો"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14451,46 +15258,42 @@ msgstr ""
 "તમારો પાસવર્ડ યોગ્ય રીતે લખાયેલો છે કે તે ચકાસવા માટે ખાતરી કરો. યાદ રાખો કે ઘણા "
 "પાસવર્ડો કેસ પ્રત્યે સંવેદનશીલ હોય છે; તમારી કેપ્સ લોક કી કદાચ ચાલુ હશે."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "સહીની ફાઈલ સંગ્રહી શક્યા નહિં."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "શું &quot;{0}&quot; કાઢી નાંખવું છે?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "ખાતું કાઢી નાંખવું છે?"
+msgid "Delete \"{0}\"?"
+msgstr "શું \"{0}\" કાઢી નંખાયેલ છે?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "શું શોધ ફોલ્ડર &quot;{0}&quot; માં સંદેશાઓ કાઢી નાંખવા છે?"
+msgid "Delete account?"
+msgstr "ખાતું કાઢી નાંખવું છે?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "શું શોધ ફોલ્ડર \"{0}\" માંના સંદેશાઓ કાઢી નાંખવા છે?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "શું શોધ ફોલ્ડરમાંના સંદેશાઓ કાઢી નાંખવા છે?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "શું ફેરફારો અવગણવા માંગો છો?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "કાઢશો નહિં (_e)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "કાઢો નંહિ"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "નિષ્ક્રિય કરશો નંહિ"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "શું તમે ઉપફોલ્ડરોમાં પણ પ્રક્રિયા કરવા માંગો છો?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14591,34 +15394,26 @@ msgid "Mark all messages as read"
 msgstr "બધા સંદેશાઓને વંચાયેલ એમ ચિહ્નિત કરો"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "શું આ ફોલ્ડર અને ઉપફોલ્ડરોમાંના બંધા સંદેશાઓને વંચાયેલ ચિહ્નિત કરવા માંગો છો?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "ખોવાયેલ ફોલ્ડર."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "કોઈ સ્રોતો પસંદ થયેલ નથી."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "માત્ર વર્તમાન ફોલ્ડર પર (_C)"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "એક જ સમયે ઘણા સંદેશાઓ ખોલવાનું ખૂબ લાંબો સમય લે છે."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "મહેરબાની કરીને તમારા ખાતા સુયોજનો ચકાસો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "મહેરબાની કરીને ખાતું સક્રિય કરો અથવા અન્ય ખાતા મારફતે મોકલો."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 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."
@@ -14626,7 +15421,7 @@ msgstr ""
 "મહેરબાની કરીને માન્ય ઈ-મેઈલ સરનામું પ્રતિ ક્ષેત્રમાં દાખલ કરો. તમે પ્રતિ પર ક્લિક કરીને ઈ-"
 "મેઈલ સરનામું શોધી શકો છો કે જે પ્રવેશ બોક્સ પછી તરતનું બટન છે."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14635,33 +15430,41 @@ msgstr ""
 "મહેરબાની કરીને ખાતરી કરો કે નીચેના મેળવનારાઓ HTML ઈ-મેઈલ મેળવવા માંગે છે અને સમર્થ છે ને:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "આ સહી ઓળખવા માટે મહેરબાની કરીને અનન્ય નામ પૂરું પાડો."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "મહેરબાની કરીને રાહ જુઓ."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "જૂના મેઈલ ફોલ્ડર &quot;{0}&quot; ને ખસેડવામાં સમસ્યા છે."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "જૂના મેઈલ ફોલ્ડર \"{0}\" ને ખેસેડવામાં સમસ્યા છે."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "સર્વરને પૂછી રહ્યા છીએ"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "આધારભૂત સત્તાધિકરણ પદ્ધતિઓની યાદી માટે સર્વરને પૂછી રહ્યા છીએ."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "વાંચન રસીદની અરજી થઈ."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "શું ખરેખર ફોલ્ડર \"{0}\" અને તેની બધી ઉપડિરેક્ટરીઓ કાઢી નાંખવી છે?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "જંક નિષ્ફળતાનો રિપોર્ટ કરો"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "શું ખરેખર ફોલ્ડર &quot;{0}&quot; અને તેની બધી ઉપડિરેક્ટરીઓ કાઢી નાંખવી છે?"
+msgid "Report Not Junk Failed"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14711,13 +15514,13 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"નીચેના શોધ ફોલ્ડર(ો):\n"
+"નીચેના શોધ ફોલ્ડરો:\n"
 "{0}\n"
 "હવે દૂર કરાયેલ ફોલ્ડરો વપરાય છે:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "અને હવે સુધારાઈ ગયેલ છે."
 
 #: ../mail/mail.error.xml.h:106
@@ -14725,13 +15528,13 @@ msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "નીચેના ગાળકના નિયમો:\n"
 "{0}\n"
 "હમણાં દૂર થયેલ ફોલ્ડર વપરાયેલ છે:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "અને હવે સુધારાઈ ગયેલ છે."
 
 #: ../mail/mail.error.xml.h:111
@@ -14804,7 +15607,8 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"ચેતવણી: શોધ ફોલ્ડરમાંથી સંદેશાઓ કાઢી નાંખવાનું તમારા સ્થાનિક અથવા દૂરસ્થ ફોલ્ડરોમાંના એકમાંથી વાસ્તવિક સંદેશાને કાઢી નાંખશે.\n"
+"ચેતવણી: શોધ ફોલ્ડરમાંથી સંદેશાઓ કાઢી નાંખવાનું તમારા સ્થાનિક અથવા દૂરસ્થ ફોલ્ડરોમાંના "
+"એકમાંથી વાસ્તવિક સંદેશાને કાઢી નાંખશે.\n"
 "શું તમે ખરેખર આવું કરવા માંગો છો?"
 
 #: ../mail/mail.error.xml.h:127
@@ -14838,8 +15642,8 @@ msgstr ""
 "ફોલ્ડરો, અથવા બંને પસંદ કરીને."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "તમારા સર્વર પરનો તમારો પ્રવેશ &quot;{0}&quot; નો &quot;{0}&quot; તરીકે નિષ્ફળ."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "તમારા સર્વર પરનો તમારો પ્રવેશ \"{0}\" નો \"{0}\" તરીકે નિષ્ફળ."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14861,77 +15665,88 @@ msgstr "સંપૂર્ણપણે કાઢી નાંખો (_E)"
 msgid "_Open Messages"
 msgstr "સંદેશાઓ ખોલો (_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "વર્તમાન ફોલ્ડર અને ઉપફોલ્ડર પર (_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "જોયેલ નથી"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "જોયેલ છે"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "જવાબ અપાયેલ છે"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "આગળ ધપાવેલ છે"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "ઘણા બધા નહિં જોયેલા સંદેશાઓ"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "ઘણા બધા સંદેશાઓ"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "નીચામાં નીચું"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "થી નીચું"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "થી ઊંચું"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "ઊંચામાં ઊંચુ"
 
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "આજે %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "ગઈકાલે %l:%M %p"
 
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3849
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "સંદેશા યાદી બનાવી રહ્યા છીએ"
 
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4178
+msgid "There are no messages in this folder."
+msgstr "આ ફોલ્ડરમાં સંદેશાઓ નથી."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "તારીખ પૂરી થઈ ગઈ"
@@ -14961,39 +15776,39 @@ msgstr "મોકલાયેલ સંદેશાઓ"
 msgid "Size"
 msgstr "માપ"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "બોલાવો"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "આગળ ધપાવો નહિં"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "ને અનુસરો"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "તમારી જાણકારી માટે"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "આગળ ધપાવો"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "કોઈ જવાબ જરુરી નથી"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "વળતો જવાબ"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "બધાને વળતો જવાબ આપો"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "ઉપરછલ્લી સમજ"
 
@@ -15030,33 +15845,22 @@ msgid "Provides core functionality for local address books."
 msgstr "સ્થાનિક સરનામા પોથીઓ માટે મૂળ વિધેયો પૂરા પાડે છે."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "જોડાણ યાદ અપાવનાર પ્લગઈન સક્રિય કરો"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "જોડાણ યાદ અપાવનાર પ્લગઈન સક્રિય કરો."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr "જોડાણ યાદ અપાવનાર પ્લગઈનને સંદેશા ભાગમાં જોવા માટેના ઈશારાઓની યાદી"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr "જોડાણ યાદ અપાવનારર પ્લગઈન માટે સંદેશા ભાગમાં કડીઓની યાદી."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "મુખ્ય શબ્દો"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "ગુમ થયેલ જોડાણો યાદ અપાવો (_m)"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
@@ -15080,9 +15884,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "સંદેશાને કોઈ જોડાણો નથી"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "ફેરફાર ચાલુ રાખો (_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "સંદેશામાં ફેરફાર કરો (_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15096,27 +15900,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "ઓડિયો ઈનલાઈન પ્લગઈન"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "ઈવોલ્યુશન બેકઅપ ફાઈલનું નામ પસંદ કરો"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "બેકઅપ પછી ઈવોલ્યુશન ફરી શરૂ કરો (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "પુનઃસંગ્રહ કરવા માટે ઈવોલ્યુશન બેકઅપ ફાઈલનું નામ પસંદ કરો"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "પુનઃ પ્રાપ્તિ પછી ઈવોલ્યુશન ફરીથી શરૂ કરો (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "બેકઅપમાંથી પુનઃસંગ્રહો"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15126,95 +15930,119 @@ msgstr ""
 "પુનઃસંગ્રહી શકે છે. \n"
 "તે તમારા બધા વ્યક્તિગત સુયોજનો, મેઈલ ગાળકો વગેરે પણ પુનઃસંગ્રહી શકશે."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "બેકઅપ ફાઈલમાંથી ઈવોલ્યુશન પુનઃસંગ્રહો (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "પુનઃસંગ્રહ કરવા માટે મહેરબાની કરીને ઈવોલ્યુશન પેટી પસંદ કરો:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "પુનઃસંગ્રહવા માટે ફાઈલ પસંદ કરો"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "બેકઅપ ઈવોલ્યુશન ડિરેક્ટરી"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "ઈવોલ્યુશન ડિરેક્ટરી પાછી સંગ્રહિત કરો"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "ઈવોલ્યુશન બેકઅપ ચકાસો"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "ઈવોલ્યુશન ફરી શરૂ કરો"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "ગ્રાફિકવાળા વપરાશકર્તા ઈન્ટરફેસ સાથે"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "ઈવોલ્યુશન બંધ કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "ઈવોલ્યુશન ખાતાઓ અને સુયોજનો બેક કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ઈવોલ્યુશન માહિતી બેક કરી રહ્યા છીએ (મેઈલો, સંપર્કો, કેલેન્ડર, બાબતો, મેમો)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "બેકઅપ સમાપ્ત"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "ઈવોલ્યુશન પુનઃશરૂ કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "વર્તમાન ઈવોલ્યુશન માહિતી બેકઅપ કરો"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "બેકઅપમાંથી ફાઈલોનો અર્ક કાઢી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "ઈવોલ્યુશન સુયોજનો લાવી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "કામચલાઉ બેકઅપ ફાઈલો દૂર કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "સ્થાનીય સ્ત્રોતોની ખાતરી કરી રહ્યા છીએ"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s ફોલ્ડર સુધી બેકઅપ કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s ફોલ્ડરમાંથી પુનઃસંગ્રહી રહ્યા છીએ"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "ઈવોલ્યુશન બેકઅપ"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "ઈવોલ્યુશન પુનઃસંગ્રહ"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "ઈવોલ્યુશન માહિતી બેકઅપ કરો"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "ઈવોલ્યુશન માહિતી પુનઃસંગ્રહ કરી રહ્યા છીએ"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "મહેરબાની કરીને રાહ જુઓ જ્યાં સુધી તમારી માહિતી પુન:સંગ્રહ કરી રહ્યા છે."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "ઈવોલ્યુશન માહિતી અને સુયોજનોની બેકઅપ લેવા માટે અને પાછા સંગ્રહવા પ્લગઈન."
@@ -15245,14 +16073,22 @@ msgstr ""
 "સક્રિય કરો."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "અપૂરતી પરવાનગીઓ"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "અયોગ્ય ઈવોલ્યુશન બેકઅપ ફાઈલ"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "પુનઃસંગ્રહ કરવા માટે મહેરબાની કરીને માન્ય બેકઅપ ફાઈલ પસંદ કરો."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr "પસંદિત ફોલ્ડર લખાતુ નથી."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15285,7 +16121,7 @@ msgstr "આપોઆપ સંપર્કો"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "જ્યારે સંદેશાઓનો વળતો જવાબ આપી રહ્યા હોય ત્યારે આપોઆપ પ્રવેશો બનાવો (_A)"
 
 #: ../plugins/bbdb/bbdb.c:571
@@ -15298,9 +16134,7 @@ msgstr "તુરંત સંદેશા સંપર્કો"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Pidgin વ્યક્તિ યાદીમાંથી સામયિકપણે સંપર્ક જાણકારી અને ચિત્રોને સુમેળ કરે છે"
 
 #: ../plugins/bbdb/bbdb.c:607
@@ -15325,7 +16159,28 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "છાપતી વખતે ભૂલ ઉદ્ભવી"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "સંદેશા લખાણને યુનિકોડમાં રૂપાંતરિત કરો (_U)"
 
@@ -15346,6 +16201,10 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter વિકલ્પો"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter નકામા પ્લગઇન"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "બગડેલ સંદેશાઓને Bogofilter ની મદદથી ગાળે છે."
 
@@ -15354,12 +16213,12 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "_SSL વાપરો"
 
@@ -15379,17 +16238,17 @@ msgstr "સ્થાનિક કેલેન્ડરો"
 msgid "Provides core functionality for local calendars."
 msgstr "સ્થાનિક કેલેન્ડરો માટે મૂળ વિધેયો પૂરા પાડે છે."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "ફરીથી તાજુ કરો (_R):"
+#: ../plugins/google-account-setup/google-source.c:381
+msgid "Re_fresh:"
+msgstr "પુનઃતાજું કરો (_f):"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "સુરક્ષિત જોડાણ (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "વપરાશકર્તાનામ (_m):"
 
@@ -15487,14 +16346,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "શું તમે ઈવોલ્યુશનને તમારું મૂળભુત ઈ-મેઈલ ક્લાઈન્ટ બનાવવા માંગો છો?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "ઈવોલ્યુશન"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "મૂળભૂત ફોલ્ડર તરીકે ચિહ્નિત કરો (_d)"
+msgid "Mark as _default address book"
+msgstr "મૂળભૂત સરનામાં પોથી તરીકે ચિહ્નિત કરો (_d)"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "મૂળભૂત કેલેન્ડર તરીકે ચિહ્નિત કરો (_d)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "મૂળભૂત કામ યાદી તરીકે ચિહ્નિત કરો (_d)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "મૂળભૂત મેમો યાદી તરીકે ચિહ્નિત કરો (_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15506,6 +16376,50 @@ msgid ""
 "default one."
 msgstr "કેલેન્ડર અથવા સરનામાપુસ્તિકાને મૂળભૂત બનાવવા માટે ચિહ્નિત કરવા માટેનું વિધેય પૂરું પાડે છે."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "વૈવિધ્યપૂર્ણ હેડર (_C)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "કી"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "કિંમતો"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "ઇમેઇલ વૈવિધ્યપૂર્ણ હેડર"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "વૈવિધ્યપૂર્ણ હેડર"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "વૈવિધ્યપૂર્ણ હેડરોની યાદી"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "અન્ય વપરાશકર્તાનું ફોલ્ડર ખોલો"
@@ -15523,32 +16437,32 @@ msgid "_User:"
 msgstr "વપરાશકર્તા (_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "સુરક્ષિત પાસવર્ડ"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr "આ વિકલ્પ સુરક્ષિત પાસવર્ડ (NTLM) સત્તાધિકરણની મદદથી એક્સચેન્જ સર્વર સાથે જોડાશે."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "સાદા લખાણનો પાસવર્ડ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "આ વિકલ્પ પ્રમાણભૂત સાદા લખાણના પાસવર્ડ સત્તાધિકરણની મદદથી એક્સચેન્જ સર્વર સાથે જોડાશે."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "ઓફિસની બહાર"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -15556,77 +16470,81 @@ msgstr ""
 "નીચે સ્પષ્ટ થયેલ સંદેશો આપોઆપ દરેક વ્યક્તિને મોકલાઈ જશે જેણે \n"
 "તમને તમે જ્યારે ઓફિસની બહાર હતા ત્યારે મેઈલ મોકલ્યા હતા."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "હું ઓફિસની બહાર છું"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "હું ઓફિસમાં છું"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "એક્સચેન્જ ખાતા માટે પાસવર્ડ બદલો"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "પાસવર્ડ બદલો"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "એક્સચેન્જ ખાતા માટે પ્રતિનિધી સુયોજનોની વ્યવસ્થા કરો"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "પ્રતિનિધી સહાય"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "મિશ્રિત"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "બધા એક્સચેન્જ ફોલ્ડરોનું માપ જુઓ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "ફોલ્ડરોનું માપ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "એક્સચેન્જ સુયોજનો"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "સત્તાધિકરણ કરો (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "મેઈલબોક્સ (_M):"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "સત્તાધિકરણ પ્રકાર (_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "આધારભૂત પ્રકારો માટે ચકાસો (_e)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -15644,7 +16562,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -15652,7 +16570,7 @@ msgstr ""
 "વર્તમાન પાસવર્ડ તમારા ખાતાના હાલના પાસવર્ડ સાથે બંધબેસતો નથી. મહેરબાની કરીને યોગ્ય "
 "પાસવર્ડ દાખલ કરો"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "બે પાસવર્ડો બંધબેસતા નથી. મહેરબાની કરીને પાસવર્ડો પાછા-દાખલ કરો."
 
@@ -15679,33 +16597,33 @@ msgstr ""
 msgid "Your password will expire in the next %d days"
 msgstr "આગળના %d દિવસોમાં તમારા પાસવર્ડની સમયમર્યાદા સમાપ્ત થઈ જશે"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "વૈવિધ્યપૂર્ણ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "સંપાદક (વાંચો, બનાવો, ફેરફાર કરો)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "લેખક (વાંચો, બનાવો)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "રીવ્યુ કરનાર (માત્ર-વાંચી શકાય તેવું)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "પ્રતિનિધી પરવાનગીઓ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s માટે પરવાનગીઓ"
@@ -15713,7 +16631,7 @@ msgstr "%s માટે પરવાનગીઓ"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -15723,66 +16641,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "તમને મારા ફોલ્ડરો પર નીચેની પરવાનગીઓ આપવામાં આવેલ છે:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "તમને મારી ખાનગી વસ્તુઓ જોવાની પણ પરવાનગી આપવામાં આવેલ છે."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "છતાંય તમને મારી ખાનગી વસ્તુઓ જોવા માટે પરવાનગી નથી."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "તમને %s માટે પ્રતિનીધીનો હોદ્દો આપવામાં આવેલ છે"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "પ્રતિનિધી પ્રતિ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "શું પ્રતિનિધી %s દૂર કરવો છે?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "ક્રિયાશીલ ડિરેક્ટરી વાપરી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "ક્રિયાશીલ ડિરેક્ટરીમાં પોતાને શોધી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "પ્રતિનિધી %s ને ક્રિયાશીલ ડિરેક્ટરીમાં શોધી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "પ્રતિનિધી %s દૂર કરી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "પ્રિતિનિધીઓની યાદી સુધારી શક્યા નહિં."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "પ્રતિનિધી %s ઉમેરી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "પ્રતિનિધી યાદી વાંચવામાં ભૂલ."
 
@@ -15830,20 +16748,25 @@ msgstr "પરવાનગીઓનો સાર આપો (_S)"
 msgid "_Tasks:"
 msgstr "બાબતો (_T):"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "પરવાનગીઓ..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "ફોલ્ડર નામ"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "ફોલ્ડર માપ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "અન્ય વપરાશકર્તાઓના ફોલ્ડરમાં ઉમેદવારી નોંધાવો"
@@ -15852,20 +16775,20 @@ msgstr "અન્ય વપરાશકર્તાઓના ફોલ્ડર�
 msgid "Exchange Folder Tree"
 msgstr "એક્સચેન્જ ફોલ્ડર વૃક્ષ"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "ફોલ્ડરોની ઉમેદવારી દૂર કરો..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "શું ખરેખર ફોલ્ડર \"%s\" માંથી ઉમેદવારી દૂર કરવી છે?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" માંથી ઉમેદવારી દૂર કરો"
@@ -15929,15 +16852,18 @@ msgstr "૭ દિવસોમાં તમારા પાસવર્ડની
 msgid "_Change Password"
 msgstr "પાસવર્ડ બદલો (_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(પરવાનગી નથી.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "વપરાશકર્તા ઉમેરો:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "વપરાશકર્તા ઉમેરો"
 
@@ -16059,11 +16985,11 @@ msgstr "વપરાશકર્તા (_U)"
 msgid "button-user"
 msgstr "બટન-વપરાશકર્તા"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "વપરાશકર્તા પસંદ કરો"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "સરનામા પુસ્તિકા..."
 
@@ -16077,7 +17003,7 @@ msgstr "અન્ય વપરાશકર્તાના કેલેન્ડ�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr "પ્લગઈન કે જે એક્સચેન્જ ખાતાને લગતી ચોક્કસ પ્રક્રિયાઓ અને લક્ષણોનો સમૂહ નિયંત્રિત કરે છે."
 
@@ -16168,10 +17094,14 @@ msgid "Could not update out-of-office state"
 msgstr "ઓફિસ-ની-બહાર સ્થિતિ સુધારી શક્યા નહિં"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "એક્સચેન્જ ખાતું ઓફલાઈન છે"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16199,32 +17129,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "પ્રતિનિધીઓ સુધારવામાં નિષ્ફળ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "ફોલ્ડર પહેલાથી જ હાજર છે"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "ફોલ્ડર અસ્તિત્વમાં નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "ફોલ્ડર ઓફલાઈન"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "સામાન્ય ભૂલ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "વૈશ્વિક કેટલોગ સર્વર પહોંચી શકાય એવું નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16232,73 +17162,73 @@ msgstr ""
 "જો OWA એ અલગ પાથ પર ચાલી રહેલ હોય, તો તમારે તેને ખાતા રૂપરેખાંકન સંવાદમાં સ્પષ્ટ કરવું જ "
 "પડશે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0} માટેનું મેઈલબોક્સ એ આ સર્વર પર નથી."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "URL યોગ્ય છે એની ખાતરી કરો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "સર્વર નામની જોડણી યોગ્ય રીતે લખાયેલી છે તેની ખાતરી કરો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "વપરાશકર્તા નામ અને પાસવર્ડ યોગ્ય છે તેની ખાતરી કરો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "કોઈ વૈશ્વિક કેટેલોગ સર્વર આ ખાતા માટે રૂપરેખાંકિત થયેલ નથી."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "વપરાશકર્તા {0} માટે {1} પર કોઈ મેઈલબોક્સ નથી."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "આવો કોઈ વપરાશકર્તા {0} નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "મહેરબાની કરીને પ્રતિનીધીનું ID દાખલ કરરો અથવા પ્રતિનીધી તરીકે મોકલો વિકલ્પની પસંદગી "
 "દૂર કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "મહેરબાની કરીને ખાતરી કરો કે વૈશ્વિક કેટલોગ સર્વર નામ યોગ્ય છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "ફેરફારોની અસર જોવા માટે મહેરબાની કરીને ઈવોલ્યુશન પુનઃશરૂ કરો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "મહેરબાની કરીને વપરાશકર્તા પસંદ કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "સર્વરે પાસવર્ડ નકાર્યો કારણ કે તે ખૂબ નબળો છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "એક્સચેન્જ ખાતું નિષ્ક્રિય કરવામાં આવશે જ્યારે તમે ઈવોલ્યુશનમાંથી બહાર નીકળો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "એક્સચેન્જ ખાતું દૂર કરવામાં આવશે જ્યારે તમે ઈવોલ્યુશનમાંથી બહાર નીકળો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "એક્સચેન્જ સર્વર એક્સચેન્જ કનેક્ટર સાથે સુસંગત નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16306,7 +17236,7 @@ msgstr ""
 "સર્વર Exchange 5.5 ચલાવી રહેલ છે. એક્સચેન્જ કનેક્ટર \n"
 "એ Microsoft Exchange 2000 અને 2003 ને જ માત્ર આધાર આપે છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16320,57 +17250,57 @@ msgstr ""
 "\n"
 "અથવા કદાચ તમે તમારો પાસવર્ડ ખોટો લખ્યો હશે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "અલગ પાસવર્ડ સાથે ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "વપરાશકર્તાને વપરાશ નિયંત્રણ યાદીમાં ઉમેરવામાં અસમર્થ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "પ્રતિનિધીઓમાં ફેરફાર કરવામાં અસમર્થ."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "{0} જોવામાં અજ્ઞાત ભૂલ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "અજ્ઞાત ભૂલ."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "અજ્ઞાત પ્રકાર"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "બિનઆધારભૂત પ્રક્રિયા"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "તમે આ સર્વર પર મેઈલ સંગ્રહવા માટે ઉપલબ્ધ ક્વોટા નજીક કરી રહ્યા છો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "તમને એક સમયે માત્ર એક પ્રતિનીધીના વતી જ સંદેશો મોકલવાની પરવાનગી છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "તમે તમારી પોતાની જાતે પ્રતિનિધી બની શકો નહિં"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "તમે આ સર્વર પર મેઈલ સંગ્રહવા માટે ક્વોટાની મર્યાદા ઓળંગી દીધી છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "તમે માત્ર એક એક્સચેન્જ ખાતું રૂપરેખાંકિત કરી શકો છો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16378,7 +17308,7 @@ msgstr ""
 "તમારો વર્તમાન વપરાશ: {0} KB છે. અમુક મેઈલ કાઢી નાંખીને થોડી જગ્યા સાફ કરવાનો પ્રયત્ન "
 "કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16386,7 +17316,7 @@ msgstr ""
 "તમારો વર્તમાન વપરાશ: {0} KB છે. તમે ક્યાં તો મેઈલો મોકલવા માટે કે મેળવવા માટે સમર્થ હશો "
 "નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16394,19 +17324,19 @@ msgstr ""
 "તમારો વર્તમાન વપરાશ: {0} KB છે. તમે જ્યાં સુધી અમુક મેઈલો કાઢી નાંખીને અમુક જગ્યા ખાલી "
 "કરો નહિં ત્યાં સુધી મેઈલો મોકલવા માટે સમર્થ હશો નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "તમારા પાસવર્ડની મર્યાદા સમાપ્ત થઈ ગઈ છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} એ વપરાશ નિયંત્રણ યાદીમાં ઉમેરી શકાતું નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} એ પહેલાથી જ પ્રતિનિધી છે"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} એ પહેલાથી જ યાદીમાં છે"
 
@@ -16418,34 +17348,74 @@ msgstr "અન્ય વપરાશકર્તાની બાબતોમા�
 msgid "Check folder permissions"
 msgstr "ફોલ્ડર પરવાનગીઓ ચકાસો"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "મૂળભૂત બાહ્ય સંપાદક"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "મૂળભૂત આદેશ કે જે સંપાદક તરીકે જ વપરાયેલ હોવો જોઇએ."
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
 "plain-text messages."
-msgstr "કમ્પોઝર તરીકે બાહ્ય સંપાદક વાપરવા માટેનું પ્લગઈન. તમે માત્ર સાદા-લખાણ સંદેશાઓ જ મોકલી શકો છો."
+msgstr ""
+"કમ્પોઝર તરીકે બાહ્ય સંપાદક વાપરવા માટેનું પ્લગઈન. તમે માત્ર સાદા-લખાણ સંદેશાઓ જ મોકલી "
+"શકો છો."
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "બાહ્ય સંપાદક"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "કામચલાઉ ફાઇલ બનાવી શકતા નથી."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "બાહ્ય સંપાદકમાં કમ્પોઝ કરો"
+msgid "Compose in _External Editor"
+msgstr "બાહ્ય સંપાદકમાં કમ્પોઝ કરો (_E)"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "બાહ્ય સંપાદકની મદદથી સંદેશાઓ કમ્પોઝ કરો"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "< 700bytes માપની (48*48) png પસંદ કરો"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG ફાઈલો"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "ફેસ (_F)"
 
@@ -16454,7 +17424,10 @@ msgid ""
 "Attach Face header to outgoing messages. First time the user needs to "
 "configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
 "faces This will be used in messages that are sent further."
-msgstr "જતા સંદેશાઓ સાથે ફેસ હેડર જોડો. પ્રથમ સમયે વપરાશકર્તાને 48*48 png ચિત્ર રૂપરેખાંકિત કરવાની જરૂર છે. તે base64 એનકોડ થયેલ છે અને ~/.evolution/faces માં સંગ્રહિત થયેલ હોય છે. આ સંદેશાઓમાં વાપરવામાં આવશે કે જેઓ ભવિષ્યમાં મોકલાશે."
+msgstr ""
+"જતા સંદેશાઓ સાથે ફેસ હેડર જોડો. પ્રથમ સમયે વપરાશકર્તાને 48*48 png ચિત્ર રૂપરેખાંકિત "
+"કરવાની જરૂર છે. તે base64 એનકોડ થયેલ છે અને ~/.evolution/faces માં સંગ્રહિત થયેલ હોય "
+"છે. આ સંદેશાઓમાં વાપરવામાં આવશે કે જેઓ ભવિષ્યમાં મોકલાશે."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
@@ -16477,20 +17450,38 @@ msgstr "ફોલ્ડરોમાંથી ઉમેદવારી દૂર
 msgid "_Unsubscribe"
 msgstr "ઉમેદવારી દૂર કરો (_U)"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>સર્વર</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "વપરાશકર્તા નામ:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+msgid "Update every"
+msgstr "બધા સુધારો"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "google કેલેન્ડર સુયોજીત કરવા માટેનું પ્લગઈન."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "google કેલેન્ડર અને સંપર્કો સુયોજીત કરવા માટેનું પ્લગઈન."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google સ્રોતો"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "ચકાસણી યાદી"
 
@@ -16570,10 +17561,20 @@ msgid "_Junk List"
 msgstr "જંક યાદી (_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "સંદેશા પાછા ખેંચવા"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "સંદેશો સફળતાપૂર્વક મેળવાયો"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "મેઈલ રીટ્રેક્ટ કરો"
 
@@ -16581,12 +17582,6 @@ msgstr "મેઈલ રીટ્રેક્ટ કરો"
 msgid "Add Send Options to groupwise messages"
 msgstr "જૂથપ્રમાણે સંદેશાઓને મોકલવા માટેના વિકલ્પો ઉમેરો"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "મોકલોના વિકલ્પો"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Groupwise ખાતાઓમાં લક્ષણો માટેનું પ્લગઈન."
@@ -16595,6 +17590,71 @@ msgstr "Groupwise ખાતાઓમાં લક્ષણો માટેનુ
 msgid "Groupwise Features"
 msgstr "Groupwise લક્ષણો"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "સંદેશો પાછા ખેંચવામાં નિષ્ફળતા"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "પસંદ કરેલ સંદેશો પાછા ખેંચાયેલ છે તેને સર્વર પરવાનગી આપતુ નથી."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "અયોગ્ય વપરાશકર્તા"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "વપરાશકર્તા &quot;{0}&quot; માં પ્રોક્સી પ્રવેશ આપી શકાતો નથી"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "વપરાશકર્તાને સ્પષ્ટ કરો"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "તમને આ વપરાશકર્તામાં પ્રોક્સીની પરવાનગી પહેલેથી આપેલ છે."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "&quot;{0}&quot; ખાતુ પહેલેથી જ હાજર છે. મહેરબાની કરીને ફોલ્ડર ટ્રી ચકાસો."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "ખાતુ પહેલાથી જ હાજર છે"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "આ રીકરીંગ બેઠક છે"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "શું તમે તેને સ્વીકારવાનું ગમે છે?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "શું તમે તેનું પતન થાય તેવું ગમે છે?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "સ્પષ્ટ થયેલ વપરાશકર્તા &quot;{0}&quot; સાથે તમે ફોલ્ડરને વહેંચી શકતા નથી"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr ""
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "કસોટી માટે સ્વીકારો"
@@ -16693,9 +17753,9 @@ msgstr "<b>ખાતા નામ</b>"
 msgid "Proxy Login"
 msgstr "પ્રોક્સી પ્રવેશ"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16704,20 +17764,20 @@ msgstr "%s%s માટે પાસવર્ડ દાખલ કરો (વપ�
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "પ્રોક્સી પ્રવેશ (_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "પ્રોક્સી ટેબ માત્ર ત્યારે જ ઉપલબ્ધ હશે જ્યારે ખાતું ઓનલાઈન હોય."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "પ્રોક્સી ટેબ માત્ર ત્યારે ઉપલબ્ધ હશે જ્યારે ખાતું સક્રિય કરેલ હોય."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "વપરાશકર્તાઓ"
 
@@ -16733,11 +17793,15 @@ msgstr "નવું વહેંચાયેલ ફોલ્ડર (_S)..."
 msgid "Sharing"
 msgstr "વહેંચી રહ્યા છીએ"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "વૈવિધ્યપૂર્ણ સૂચન"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "ઉમેરો   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "સુધારો"
 
@@ -16802,11 +17866,11 @@ msgstr "hula કેલેન્ડર સ્રોતો સુયોજિત �
 msgid "Hula Account Setup"
 msgstr "Hula ખાતા સુયોજન"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "વૈવિધ્યપૂર્ણ હેડરો"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP હેડરો"
 
@@ -16859,28 +17923,28 @@ msgstr "IMAP ખાતાઓમાં લક્ષણો માટેનું �
 msgid "IMAP Features"
 msgstr "IMAP લક્ષણો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "કેલેન્ડરમાં આયાત કરો (_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "બાબતોમાં આયાત કરો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS આયાત કરો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "બાબત યાદી પસંદ કરો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "કેલેન્ડર પસંદ કરો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "આયાત (_I)"
 
@@ -16917,8 +17981,8 @@ msgstr ""
 "ઈવોલ્યુશન તેની સાથે સુમેળ કરવા માટે iPod શોધી શક્યું નહિં. ક્યાં તો iPod સિસ્ટમ સાથે જોડાયેલ "
 "નહિં હોય અથવા તેનો પાવર ચાલુ થયેલ નહિં હશે."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar બંધારણ (.ics)"
 
@@ -16934,142 +17998,142 @@ msgstr "iPod સાથે સુમેળ કરો"
 msgid "iPod Synchronization"
 msgstr "iPod સુમેળ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:439
-#: ../plugins/itip-formatter/itip-formatter.c:564
+#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:569
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "કેલેન્ડર '%s' લાવવામાં નિષ્ફળ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:584
+#: ../plugins/itip-formatter/itip-formatter.c:589
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "કેલેન્ડર '%s' માંની મુલાકાત આ મંત્રણા સાથે તકરાર થાય છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:610
+#: ../plugins/itip-formatter/itip-formatter.c:615
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "કેલેન્ડર '%s' માં મુલાકાત મળી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:691
 msgid "Unable to find any calendars"
 msgstr "કોઈપણ કેલેન્ડર શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:698
 msgid "Unable to find this meeting in any calendar"
 msgstr "કોઈપણ કેલેન્ડરમાં આ મંત્રણા શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:702
 msgid "Unable to find this task in any task list"
 msgstr "કોઈપણ બાબત યાદીમાં આ બાબત શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:706
 msgid "Unable to find this memo in any memo list"
 msgstr "કોઈપણ મેમો યાદીમાંથી આ મેમો શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Searching for an existing version of this appointment"
 msgstr "આ મુલાકાતની તાજેતરની આવૃત્તિ માટે શોધ કરી રહ્યા છીએ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:946
 msgid "Unable to parse item"
 msgstr "વસ્તુનું પદચ્છેદ કરવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1004
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "કેલેન્ડર '%s' ને વસ્તુ મોકલવામાં અસમર્થ.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1016
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "કેલેન્ડર '%s' ને સ્વીકારાયેલ તરીકે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "કેલેન્ડર '%s' ને ચોક્કસ નથી એમ મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "કેલેન્ડર '%s' ને નકારાઈ ગયેલ છે એ રીતે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1030
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "કેલેન્ડર '%s' ને રદ કરાયેલ તરીકે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "આયોજકે પ્રતિનિધી %s ને દૂર કરી નાંખ્યો "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 msgid "Sent a cancelation notice to the delegate"
 msgstr "પ્રતિનિધીને રદ કરવાનું સૂચન મોકલ્યું છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "પ્રતિનિધીને રદ કરવાનું સૂચન મોકલી શક્યા નહિં"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1207
+#: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "સભાજન સ્થિતિ સુધારી શકાઈ નહિં કારણ કે સ્થિતિ અયોગ્ય છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "સભાજન સુધારવામાં અસમર્થ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 msgid "Attendee status updated"
 msgstr "સભાજન સ્થિતિ સુધારાઈ ગઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Meeting information sent"
 msgstr "મંત્રણા જાણકારી મોકલાઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
 msgstr "બાબત જાણકારી મોકલાઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 msgid "Memo information sent"
 msgstr "મેમો જાણકારી મોકલાઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "મંત્રણા જાણકારી મોકલવામાં અસમર્થ, મંત્રણા અસ્તિત્વમાં નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid "Unable to send task information, the task does not exist"
 msgstr "બાબત જાણકારી મોકલવામાં અસમર્થ, બાબત અસ્તિત્વમાં નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1284
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "મેમો જાણકારી મોકલવામાં અસમર્થ, મેમો અસ્તિત્વમાં નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1359
-#: ../plugins/itip-formatter/itip-formatter.c:1374
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The calendar attached is not valid"
 msgstr "જોડાયેલ કેલેન્ડર માન્ય નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1360
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "સંદેશો કેલેન્ડર સમાવવા માટે દાવો મૂકે છે, પરંતુ કેલેન્ડર એ માન્ય iCalendar નથી."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
-#: ../plugins/itip-formatter/itip-formatter.c:1428
-#: ../plugins/itip-formatter/itip-formatter.c:1510
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "કેલેન્ડરની વસ્તુ માન્ય નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1411
-#: ../plugins/itip-formatter/itip-formatter.c:1429
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17077,324 +18141,324 @@ msgstr ""
 "સંદેશો કેલેન્ડર સમાવતો નથી, પરંતુ કેલેન્ડર કોઈ ઘટનાઓ સમાવતું નથી, બાબતો અથવા મુક્ત/વ્યસ્ત "
 "જાણકારી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "જોડાયેલ કેલેન્ડર ઘણી વસ્તુઓ સમાવે છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "આ બધી વસ્તુઓ પર પ્રક્રિયા કરવા માટે, ફાઈલ સંગ્રહાવી જોઈએ અને કેલેન્ડર આયાત થવું જોઈએ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "આ મંત્રણા ફરી થશે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2141
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "આ બાબત ફરી થશે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2144
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "આ મેમો ફરી થશે"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "ક્રિયા કર્યા પછી સંદેશો કાઢી નાંખો (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2369
-#: ../plugins/itip-formatter/itip-formatter.c:2401
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "તકરાર શોધ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "મંત્રણા મતભેદો શોધવા માટે કેલેન્ડર પસંદ કરો"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "આજે"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "આજે %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "આજે %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "આજે %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "આવતી કાલે"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "આવતી કાલે %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "આવતી કાલે %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "આવતી કાલે %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "આવતી કાલે %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "મહેરબાની કરીને <b>%s</b> ના વતી પ્રત્યુત્તર આપો"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ના વતી મેળવવામાં આવ્યો"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની મંત્રણા જાણકારી પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણા જાણકારી પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણાનું તમારા માટે આયોજન કર્યું છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> મારફતે %s એ તમારી નીચેની મંત્રણામાં હાજરીની માંગણી કરી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> એ તમારી નીચેની મંત્રણામાં હાજરીની માંગણી કરી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> મારફતે %s હાલની મંત્રણા ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> હાલની મંત્રણા ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> એ %s મારફતે નીચેની મંત્રણા માટેની તાજેતરની જાણકારી પ્રાપ્ત કરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> નીચેની મંત્રણા માટે તાજેતરની જાણકારી મેળવવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> એ %s મારફતે નીચેનો મંત્રણા પ્રત્યુત્તર મોકલ્યો છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણા પ્રત્યુત્તર પાછો મોકલ્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની મંત્રણા રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> એ નીચેની મંત્રણા રદ કરી."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> એ %s મારફતે નીચેના મંત્રણા ફેરફારો મૂક્યા છે."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> એ નીચેના મંત્રણા ફેરફારોનો પ્રસ્તાવ મૂક્યો છે."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેના મંત્રણા ફેરફારો નકાર્યા છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> એ નીચેના મંત્રણા ફેરફારો નકાર્યા છે."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> મારફતે %s એ નીતેની બાબત પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> એ નીચેની બાબત પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> એ %s પાસેથી નીચેની બાબતોની સોંપણીની માંગણી કરે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> મારફતે %s એ તમને બાબત સોંપી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> એ તમને બાબત સોંપી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> મારફતે %s હાલની બાબત ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> હાલની બાબત ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17403,134 +18467,134 @@ msgstr ""
 "<b>%s</b> એ %s મારફતે નીચેની સોંપાયેલ બાબત વિશે તાજેતરની જાણકારી મેળવવાની ઈચ્છા રાખે "
 "છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> નીચેની સોંપાયેલ બાબતો માટે તાજેતરની જાણકારી મેળવવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "%2$s મારફતે <b>%1$s</b> એ નીચેની સોંપાયેલ ક્રિયા પ્રત્યુત્તર મોકલ્યો હતો:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> એ નીચેની સોંપાયેલી બાબતોનો પ્રત્યુત્તર પાછો મોકલ્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની સોંપાયેલ બાબતો રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> એ નીચેની સોંપાયેલ બાબતો રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> એ %s મારફતે નીચેની બાબત સોંપણી ફેરફારોની અરજી મૂકી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> એ નીચેની બાબત સોંપમી ફેરફારોનો પ્રસ્તાવ મૂક્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની સોંપાયેલ બાબતો નકારી:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> નીચેની સોંપણી બાબતને નકારી:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેનો મેમો પ્રકાશિત કર્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> એ નીચેનો મેમો પ્રકાશિત કર્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> મારફતે %s હાલનો મેમો ઉમેરવાની ઈચ્છા રાખે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> વર્તમાન મેમો ઉમેરવાની ઈચ્છા રાખે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેનો વહેંચાયેલ મેમો રદ કર્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> એ નીચેનો વહેંચાયેલ મેમો રદ કર્યો:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "કેલેન્ડર ખોલો (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "નકારો (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "સ્વીકારો (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "બધું નામંજૂર કરો (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "બધું અજમાયશ માટે કરો (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "અજમાયશ (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "બધું સ્વીકારો (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "જાણકારી મોકલો (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "સભાજન પરિસ્થિતિ સુધારો (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "સુધારો (_U)"
 
@@ -17631,8 +18695,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "જ્યારે નવા સંદેશાઓ આવે ત્યારે D-Bus સંદેશો પેદા કરે છે."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If true, then beep, otherwise will play sound file when new messages arrive."
-msgstr "જો સાચું હોય, તો પછી બીપ વગાડો, નહિંતર જ્યારે નવા સંદેશાઓ આવે ત્યારે ધ્વનિ ફાઈલ વગાડો."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "જો \"સાચું\" હોય, તો પછી બીપ વગાડો, નહિંતર જ્યારે નવા સંદેશાઓ આવે ત્યારે ધ્વનિ ફાઈલ વગાડો."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17674,12 +18740,20 @@ msgstr "શું ચિહ્ન ઝબૂકવું જોઈએ કે ન�
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "શું માત્ર ઈનબોક્સ ફોલ્ડરમાં જ નવા સંદેશાઓ માટે સૂચન કરવું."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "_D-Bus સંદેશો બનાવો"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "ઇવોલ્યુશનની મેઈલ સૂચના"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "મેઈલ સૂચન ગુણધર્મો"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17694,55 +18768,55 @@ msgstr[1] ""
 "તમે %d નવા સંદેશાઓ\n"
 "%s માં મેળવ્યો છે."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "તમે %d નવો સંદેશો મેળવ્યો છે."
 msgstr[1] "તમે %d નવા સંદેશાઓ મેળવ્યો છે."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "નવો મેઈલ"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "સૂચન વિસ્તારમાં ચિહ્ન બતાવો (_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "સૂચન વિસ્તારમાં ચિહ્ન ઝબૂકાવો (_i)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "ચિહ્ન સાથે પોપઅપ સંદેશો આપો (_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "જ્યારે નવા સંદેશાઓ આવે ત્યારે ધ્વનિ વગાડો (_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "બીપ (_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "ધ્વનિ ફાઈલ વગાડો (_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "ફાઈલ નામ સ્પષ્ટ કરો (_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "ધ્વનિ ફાઈલ પસંદ કરો"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "વગાડો (_a)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "માત્ર ઈનબોક્સ માટે જ નવા સંદેશાઓનું સૂચન કરો (_I)"
 
@@ -17750,7 +18824,9 @@ msgstr "માત્ર ઈનબોક્સ માટે જ નવા સં�
 msgid ""
 "Generates a D-Bus message or notifies the user with an icon in notification "
 "area and a notification message whenever a new message has arrived."
-msgstr "D-Bus સંદેશો પેદા કરે છે અથવા વપરાશકર્તાને સૂચન વિસ્તારમાં ચિહ્ન સાથે વપરાશકર્તાને સૂચન કરે છે અને સંદેશાને સૂચન કરે છે જ્યારેપણ નવો સંદેશો આવે."
+msgstr ""
+"D-Bus સંદેશો પેદા કરે છે અથવા વપરાશકર્તાને સૂચન વિસ્તારમાં ચિહ્ન સાથે વપરાશકર્તાને સૂચન કરે "
+"છે અને સંદેશાને સૂચન કરે છે જ્યારેપણ નવો સંદેશો આવે."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
@@ -17779,7 +18855,9 @@ msgstr "કેલેન્ડર ખોલી શકતા નથી. %s"
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
-msgstr "પસંદિત સ્રોત માત્ર વાંચી શકાય તેવો છે, આથી ત્યાં ક્રિયા બનાવી શકતા નથી. અન્ય સ્રોત પસંદ કરો, મહેરબાની કરીને."
+msgstr ""
+"પસંદિત સ્રોત માત્ર વાંચી શકાય તેવો છે, આથી ત્યાં ક્રિયા બનાવી શકતા નથી. અન્ય સ્રોત પસંદ "
+"કરો, મહેરબાની કરીને."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
@@ -17883,7 +18961,7 @@ msgstr "મેઈલિંગ યાદીને ઈ-મેઈલ સંદે�
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17964,6 +19042,26 @@ msgstr "યાદીમાં ઉમેદવારી નોંધાવો (_S
 msgid "_Unsubscribe from List"
 msgstr "યાદીમાંથી ઉમેદવારી દૂર કરો (_U)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "શું આ ફોલ્ડર અને ઉપફોલ્ડરોમાંના બંધા સંદેશાઓને વંચાયેલ ચિહ્નિત કરવા માંગો છો?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "શું તમે ઉપફોલ્ડરોમાં પણ પ્રક્રિયા કરવા માંગો છો?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "બધા સંદેશાઓને વાંચ્યા એમ ચિહ્નિત કરો"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "વર્તમાન ફોલ્ડર અને ઉપફોલ્ડર (_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "વર્તમાન ફોલ્ડર ફક્ત (_F)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "બધાને વાંચ્યા એમ નિશાનિત કરો"
@@ -18006,7 +19104,7 @@ msgstr "કયા પ્લગઈનો સક્રિય કરેલ છે �
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "પ્લગઈન વ્યવસ્થાપક"
 
@@ -18018,33 +19116,24 @@ msgstr "પ્લગઈનો સક્રિય અને નિષ્ક્ર
 msgid "_Plugins"
 msgstr "પ્લગઈનો (_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "લેખકો"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "વર્ણન"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "રુપરેખાંકન"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "નોંધ: જ્યાં સુધી ફરી શરૂ થાય નહિં ત્યાં સુધી અમુક ફેરફારોઅસર લાવશે નહિં"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "ઝાંખી"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "રુપરેખાંકન"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "આ પ્લગઈન માટે કોઈ રૂપરેખાંકન વિકલ્પ નથી."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "પ્લગઈન"
 
@@ -18069,41 +19158,22 @@ msgstr "સાદી લખાણ સ્થિતિ"
 msgid "Prefer plain-text"
 msgstr "સાદું-લખાણને પ્રાધાન્ય આપો"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "HTML બતાવો જો હાજર હોય તો"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "સાદાને પ્રાધાન્ય આપો"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "હંમેશા સાદુ જ બતાવો"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML સ્થિતિ (_M)"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "કમ્પોઝરમાંથી છાપવા માટે વિકલ્પ આપે છે."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "સંદેશો છાપો"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "છાપનનું પૂર્વદર્શન (_v)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "સંદેશો છાપો"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "ઈવોલ્યુશન રૂપરેખાકાર"
@@ -18128,13 +19198,7 @@ msgstr "સ્થાનો"
 msgid "_Publish Calendar Information"
 msgstr "કેલેન્ડર જાણકારી પ્રકાશિત કરો (_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s' માટે પાસવર્ડ દાખલ કરો"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "શું તમે ખરેખર આ URL ને દૂર કરવા માંગો છો?"
 
@@ -18222,15 +19286,75 @@ msgstr ""
 "iCal\n"
 "મુક્ત/વ્યસ્ત"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "કેમ છો પાયથોન"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "પાયથોન પ્લગઇન લોડર ચકાસણીઓ"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "પાયથોન ચકાસણી પ્લગઇન"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "પાયથોન EPlugin લોડર માટે ચકાસણી પ્લગઇન."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "પાયથોન લોડર"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (built-in)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
-msgstr "આ Spamassasin ને વધુ રાહતમય બનાવે છે, પરંતુ થોડું ધીમું"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin શોધાયુ નહિં, કોડ: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "પાઇપ બનાવવા માટે નિષ્ફળતા: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "ફોર્ક પછી ભૂલ: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin ઉપલ્બદ નથી."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "આ Spamassasin ને વધુ વિશ્ર્વાસપાત્ર બનાવે છે, પરંતુ થોડું ધીમું"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "દૂરસ્થ ચકાસણીઓ સમાવો (_n)"
 
@@ -18256,7 +19380,7 @@ msgstr "સંદેશાના ભાગો અથવા બધા જોડ�
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "જોડાણો સંગ્રહો"
 
@@ -18268,16 +19392,15 @@ msgstr "જોડાણો સંગ્રહો..."
 msgid "Save all attachments"
 msgstr "બધા જોડાણ સંગ્રહો"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "આધાર નામ સંગ્રહો પસંદ કરો"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME પ્રકાર"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "સંગ્રહો"
 
@@ -18285,79 +19408,79 @@ msgstr "સંગ્રહો"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "વર્ણન યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "વર્ગોની યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "ટિપ્પણી યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "બનાવાયેલ"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "સંપર્ક યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "શરુ કરો"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "અંત કરો"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "ટકા પૂર્ણ"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "સભાજનોની યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "સુધારેલ"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV બંધારણ માટેના અદ્યતન વિકલ્પો"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "હેડર મૂકો"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "કિંમત પૂર્ણ કરનાર:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "રેકોર્ડ પૂર્ણ કરનાર:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "ની સાથે કિંમતો સમાવો:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "અલ્પવિરામથી અલગ પડેલ હોય તેવું બંધારણ (Comma separated value - .csv)"
 
@@ -18378,15 +19501,15 @@ msgstr "ડિસ્કમાં સંગ્રહો (_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF બંધારણ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "અંતિમ મુકામ ફાઈલ પસંદ કરો"
 
@@ -18411,12 +19534,12 @@ msgid "Show _only this Task List"
 msgstr "માત્ર આ બાબત યાદી જ બતાવો (_o)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "પ્લગઈન કે જે શરૂઆતી વિઝાર્ડ નિયંત્રિત કરે છે."
+msgid "Guides you through your initial account setup."
+msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "શરૂઆત વિઝાર્ડ"
+msgid "Setup Assistant"
+msgstr "મદદનીશ સુયોજિત કરો"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -18443,24 +19566,24 @@ msgid "Importing files"
 msgstr "ફાઈલો આયાત કરી રહ્યા છીએ"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "મહેરબાની કરીને તમે જેની આયાત કરવા માંગો તે જાણકારી પસંદ કરો:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "%s માંથી:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "માહિતી આયાત કરી રહ્યા છીએ."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "મહેરબાની કરીને રાહ જુઓ"
 
@@ -18481,6 +19604,29 @@ msgstr "વિષય અનુસાર સંદેશાઓ થ્રેડ �
 msgid "F_all back to threading messages by subject"
 msgstr "વિષય પ્રમાણે સંદેશાઓમાં થ્રેડીંગ કરીને જાવ (_a)"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "જોડાણ યાદ અપાવનારર પ્લગઈન માટે સંદેશા ભાગમાં કડીઓની યાદી."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "શીર્ષક નથી"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "ટેમ્પ્લેટ તરીકે સંગ્રહ કરો (_T)"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "ટેમ્પ્લેટ તરીકે સંગ્રહ કરો"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "ડ્રાફ્ટો આધારિત ટેમ્પ્લેટ પ્લગઇન"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "સાદું પ્લગઈન કે જે tnef જોડાણોને ડિકોડ કરવા માટે ytnef વાપરે છે."
@@ -18489,6 +19635,28 @@ msgstr "સાદું પ્લગઈન કે જે tnef જોડાણો
 msgid "TNEF Attachment decoder"
 msgstr "TNEF જોડાણ ડિકોડર"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "WebDAV સંપર્કો સુયોજીત કરવા માટેનું પ્લગઈન."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV સંપર્કો"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "ઈવોલ્યુશન શેલ"
@@ -18506,84 +19674,152 @@ msgid "Evolution Test component"
 msgstr "ઈવોલ્યુશન ચકાસણી ભાગ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "વર્તમાન પ્રિન્ટર સુયોજનોનું શબ્દમાળા વર્ણન."
+msgid "Authenticate proxy server connections"
+msgstr "સત્તાઘિકરણ પ્રોક્સી સર્વર જોડાણો"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "આપોઆપ પ્રોક્સી રૂપરેખાંકન URL"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "રૂપરેખાંકન આવૃત્તિ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "નક્કી કરે છે કે શું ભંગાણ શોધ ચાલવી જોઈએ કે નહિં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "આડીપટ્ટીની મૂળભુત પહોળાઈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "મૂળભુત વિન્ડો ઊંચાઈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "મૂળભૂત વિન્ડો સ્થિતિ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "મૂળભુત વિન્ડો પહોળાઈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr "HTTP પ્રોક્સી યજમાન નામ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr "HTTP પ્રોક્સી પાસવર્ડ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr "HTTP પ્રોક્સી પોર્ટ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr "HTTP પ્રોક્સી વપરાશકર્તા નામ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "શરુઆતમાં ભાગનું ID અથવા ઉપનામ મૂળભુત રીતે દેખાય છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "છેલ્લે સુધારાયેલ રૂપરેખાંકન આવૃત્તિ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ફોલ્ડરો માટે યાદીના પથો કે જે ઓફલાઈન વપરાશ માટે ડિસ્ક સાથે સુમેળ કરવાના છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr "પ્રોક્સી યજમાનો નથી"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr "પ્રોક્સી રૂપરેખાંકન સ્થિતિ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr "SOCKS પ્રોક્સી યજમાન નામ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr "SOCKS પ્રોક્સી પોર્ટ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr "સુરક્ષિત HTTP પ્રોક્સી યજમાન નામ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr "સુરક્ષિત HTTP પ્રોક્સી પોર્ટ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "બાજુપટ્ટી દૃશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "વિકાસ ચેતવણી સંવાદ અવગણો"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "પુનઃપ્રાપ્તિ ચેતવણી સંવાદ અવગણો"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "ઓફલાઈન સ્થિતિમાં શરુ કરો"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "પરિસ્થિતિદર્શક પટ્ટી દૃશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "ઈવોલ્યુશનની રૂપરેખાંકિત આવૃત્તિ, મુખ્ય/ગૌણ/રૂપરેખાંકન સ્તર સાથે (ઉદાહરણ તરીકે \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "મુખ્ય વિન્ડો માટે મૂળભુત ઊંચાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "મુખ્ય વિન્ડો માટે મૂળભુત પહોળાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "બાજુની પટ્ટી માટે મૂળભુત પહોળાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18591,7 +19827,37 @@ msgstr ""
 "ઈવોલ્યુશનની છેલ્લી સુધારાયેલ રૂપરેખાંકિત આવૃત્તિ, મુખ્ય/ગૌણ/ રૂપરેખાંકન સ્તરો સાથે (ઉદાહરણ "
 "તરીકે \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18601,51 +19867,71 @@ msgstr ""
 "\"સાધનપટ્ટી\" સુયોજિત હોય, તો જીનોમ સાધનપટ્ટી સુયોજનો દ્વારા બટનોની શૈલી નક્કી થાય "
 "છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "સાધનપટ્ટી દૃશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr "URL કે જે પ્રોક્સી રૂપરેખાંકન કિંમતો પૂરી પાડે છે."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "HTTP પ્રોક્સી વાપરો"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "શું ઈવોલ્યશન ઓનલાઈન સ્થિતિની જગ્યાઓ ઓફલાઈન સ્થિતિમાં શરૂ થશે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "શું ભંગાણ શોધ થવી જોઈએ કે નહિં"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "વિન્ડો મોટી થવી જોઈએ કે નહિં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "શું બાજુપટ્ટી દૃશ્યમાન હોવી જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "શું પરિસ્થિતિદર્શક પટ્ટી દૃશ્યમાન હોવી જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "શું સાધનપટ્ટી દૃશ્યમાન થશે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "શું ઈવોલ્યુશનની વિકાસ આવૃત્તિઓમાંનો ચેતવણી સંવાદ અવગણાયેલ છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "શું ઈવોલ્યુશનની પુનઃપ્રાપ્તિમાં ચેતવણી સંવાદ અવગણવામાં આવવો જોઈએ કે નહિં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "શું વિન્ડો બટનો દેખાવા જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "વિન્ડો બટન શૈલી"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "વિન્ડો બટનો દૃશ્યમાન છે"
 
@@ -18661,11 +19947,11 @@ msgstr "સક્રિય જોડાણો"
 msgid "Click OK to close these connections and go offline"
 msgstr "આ જોડાણો બંધ કરવા માટે બરાબર પર ક્લિક કરો અને ઓફલાઈન થાઓ"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "ચલાવવા માટે આયાત કરનારનો પ્રકાર પસંદ કરો:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18679,11 +19965,11 @@ msgstr ""
 "જો તમે જાણતા ના હોય તો તમે \"આપોઆપ\" પસંદ કરી શકો છો, અને ઈવોલ્યુશન તેને કામ કરવા "
 "માટે લઈ લેશે."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "આ આયાત માટે અંતિમ મુકામ પસંદ કરો"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18695,146 +19981,134 @@ msgstr ""
 "સુયોજનો મળ્યા નથી. જો તમે ફરીથી પ્રયત્ન કરવા\n"
 "માંગતા હોય, તો મહેરબાની કરીને \"પાછળ\" બટન ક્લિક કરો.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "ફાઈલનું નામ (_i):"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "ફાઈલ પસંદ કરો"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "ફાઈલનો પ્રકાર (_t):"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "જૂના કાર્યક્રમોમાંથી માહિતી અને સુયોજનો આયાત કરો (_o)"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "એક ફાઈલ જ આયાત કરો (_s)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "ઈવોલ્યુશન પસંદગીઓ"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "કોઈ ફોલ્ડર નામ સ્પષ્ટ કરેલ નથી."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "ફોલ્ડર નામ રીટર્ન અક્ષર ધરાવતું નથી."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "ફોલ્ડર નામ \"/\" અક્ષર ધરાવતું નથી."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "ફોલ્ડર નામ \"#\" અક્ષર ધરાવતું નથી."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' અને '..' એ ફોલ્ડર નામો માટે આરક્ષિત છે."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ઈવોલ્યુશન"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "જીનોમ પાયલોટ સાધનો આ સિસ્ટમ પર સ્થાપિત થયા હોય એમ લાગતું નથી."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "%s ચલાવવામાં ભૂલ."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "બગ બડી સ્થાપિત નથી."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "બગ બડ્ડી ચલાવી શકાયું નહિં."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "અંકિત પટેલ <ankit644@yahoo.com>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "ઈવોલ્યુશન વેબસાઈટ"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "FAQ વેબપાનું ખોલવામાં ભૂલ."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "ઓનલાઈન કામ કરો (_W)"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ઓફલાઈન કામ કરો (_W)"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "ઓફલાઈન કામ કરો"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓનલાઈન છે. ઓફલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"ઈવોલ્યુશન વર્તમાનમાં ઓનલાઈન છે.\n"
+"ઓફલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "ઈવોલ્યુશન પ્રક્રિયાને ઓફલાઈન કામ કરવાની પ્રક્રિયામાં છે."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓફલાઈન છે. ઓનલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"ઈવોલ્યુશન વર્તમાનમાં ઓફલાઈન છે.\n"
+"ઓનલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "%s માં બદલો"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "અજ્ઞાત સિસ્ટમ ભૂલ."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "બરાબર"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "અયોગ્ય દલીલો"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "OAF પર નોંધ કરાવી શકતા નથી"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "રુપરેખાંકન ડેટાબેઝ મળ્યો નથી"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "નવું"
 
@@ -18843,6 +20117,7 @@ msgid "New Test"
 msgstr "નવી ચકાસણી"
 
 #: ../shell/test/evolution-test-component.c:108
+msgctxt "New"
 msgid "_Test"
 msgstr "ચકાસણી (_T)"
 
@@ -18889,7 +20164,7 @@ msgstr ""
 "કેવી રીતે આયાત કરવી તે પ્રક્રિયાનું માર્ગદર્શન આપવામાં આવેલ છે."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18924,7 +20199,7 @@ msgstr ""
 "અમે એવી આશા રાખીએ છીએ કે તમે અમારી સખ્ત મહેનતના પરિણામને માણી રહ્યા હશો,\n"
 "અને અમે તમારા ફાળાની આતુરતાથી રાહ જોઈ રહ્યા છીએ!\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18932,19 +20207,19 @@ msgstr ""
 "આભાર\n"
 "ઈવોલ્યુશન ટુકડી\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "મને ફરી વાર કહો નહિં"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "ઈવોલ્યુશન ભંગાણ શોધ"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "અવગણો (_n)"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -18955,43 +20230,43 @@ msgstr ""
 "ત્યારે.  પૂર્વસાવધાની માપન તરીકે, બધી પૂર્વદર્શન તકતીઓ છુપાયેલ હશે.\n"
 "તમે દેખાવ મેનુમાંથી પૂર્વદર્શન તકતીઓ પુનઃસંગ્રહી શકો છો.\n"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "આ સંદેશો ફરીથી બતાવશો નહિં (_D)"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "સ્પષ્ટ કરેલ કમ્પોનન્ટ ક્રિયાશીલ કરવા માટે ઈવોલ્યુશન શરુ કરો"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "ઓનલાઈન સ્થિતિમાં શરુ કરો"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "ઈવોલ્યુશનના બધા કમ્પોનન્ટો દબાણપૂર્વક બંધ કરી દો"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ઈવોલ્યુશન ૧.૪ માંથી દબાણપૂર્વક ફેરવો"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "ફાઈલના બધા કમ્પોનન્ટો માટે ભૂલ શોધવા માટેનું આઉટપુટ મોકલો."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "કોઈપણ પ્લગઈનો લાવવાનું નિષ્ક્રિય કરો."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "મેઈલ, સંપર્કો અને ક્રિયાઓની પૂર્વદર્શન તકતી નિષ્ક્રિય કરો."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ઈવોલ્યુશન PIM અને ઈમેઈલ ક્લાઈન્ટ"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19132,7 +20407,7 @@ msgstr ""
 "જો તમે ચાલુ રાખવાનું પસંદ કરો, તો તમને તમારી જૂની માહિતીના અમુક ભાગોને ચલાવવાની "
 "પરવાનગી નથી.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19143,7 +20418,7 @@ msgstr ""
 "\n"
 "વિશ્વાસુ સુયોજનોમાં ફેરફાર કરો:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19152,7 +20427,7 @@ msgstr ""
 "તમે પ્રમાણપત્રના સ્તાધિકાર કે જે તમને પ્રમાણપત્ર અદા કરે તેનો વિશ્વાસ કરો એટેલે, ત્યાર પછી "
 "તમે આ પ્રમાણપત્રની સત્તાધિકર પર વિશ્વાસ કરો જ્યાં સુધી તે સૂચવાયેલ નહિં હોય"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19209,11 +20484,16 @@ msgstr "ઈ-મેઈલ સરનામુ"
 msgid "All CA certificate files"
 msgstr "બધી CA પ્રમાણપત્ર ફાઈલો"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "પ્રમાણપત્ર દર્શક: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "`%s' માટે પાસવર્ડ દાખલ કરો"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19224,7 +20504,7 @@ msgid "Enter new password"
 msgstr "નવો પાસવર્ડ દાખલ કરો"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19233,7 +20513,7 @@ msgstr ""
 "ને અદા થયેલ છે:\n"
 "  વિષય: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19242,7 +20522,7 @@ msgstr ""
 "દ્વારા અદા થયેલ:\n"
 "  વિષય: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "પ્રમાણપત્ર પસંદ કરો"
 
@@ -19427,7 +20707,7 @@ msgid "_Edit CA Trust"
 msgstr "CA વિશ્વાસમાં ફેરફાર કરો (_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "પ્રમાણપત્ર પહેલાથી જ હાજર છે"
 
@@ -19635,8 +20915,7 @@ msgstr "બધા સંપર્કોની નકલ અંહિ કરો (
 msgid "Contact _Preview"
 msgstr "સંપર્ક પૂર્વદર્શન (_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "નકલ કરો"
@@ -19661,8 +20940,7 @@ msgstr "આ ફોલ્ડરમાં નકલ કરો..."
 msgid "Create a new addressbook folder"
 msgstr "નવું સરનામા પુસ્તિકા ફોલ્ડર બનાવો"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "કાપો"
@@ -19703,8 +20981,7 @@ msgstr "પસંદિત ફોલ્ડરના સંપર્કોને
 msgid "Move to Folder..."
 msgstr "ફોલ્ડરમાં ખસેડો..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "ચોંટાડો"
@@ -19741,13 +21018,11 @@ msgstr "પસંદ કરેલ સંપર્કોને VCard તરીક
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "પસંદ કરેલ ફોલ્ડરના સંપર્કોને VCard તરીકે સંગ્રહો"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "બધું પસંદ કરો"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "બધું પસંદ કરો (_A)"
 
@@ -19816,7 +21091,7 @@ msgstr "સંપર્કોને આમાં ખસેડો (_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "ફોલ્ડર સંપર્કોને આમાં ખસેડો (_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "નવું (_N)"
 
@@ -19877,7 +21152,7 @@ msgid "Month"
 msgstr "મહિનો"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "આગળ વધો"
 
@@ -19886,7 +21161,7 @@ msgid "Previews the calendar to be printed"
 msgstr "કેલેન્ડરનું છાપન માટે પૂર્વદર્શન આપે છે"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "પહેલાનું"
 
@@ -19954,232 +21229,6 @@ msgstr "કામ કરવાનું અઠવાડિયુ"
 msgid "_Open Appointment"
 msgstr "મુલાકાત ખોલો (_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "પસંદ કરેલ લખાણને ક્લિપબોર્ડમાં નકલ કરો"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "પસંદગીને ક્લિપબોર્ડમાં નકલ કરો"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "પસંદ કરેલ લખાણને ક્લિપબોર્ડમાં કાપો"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "પસંદગીને ક્લિપબોર્ડમાં કાપો"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "ક્લિપબોર્ડમાંથી ચોંટાડો"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "ક્લિપબોર્ડમાંથી લખાણ ચોંટાડો"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "બધું લખાણ પસંદ કરો"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "જોડો"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "ફાઈલો જોડવા માટે અંહિ ક્લિક કરો"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "વર્તમાન વિન્ડો ખોલવા માટે અંહિ ક્લિક કરો"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "વર્તમાન વિન્ડો સંગ્રહવા માટે અંહિ ક્લિક કરો"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "ઉપલબ્ધ મદદ જોવા માટે અંહિ ક્લિક કરો"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "બંધ કરો"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "દાખલ કરો (_n)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "જોડાણ (_A)..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "બંધ કરો (_C)"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "ફાઈલ (_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "મદદ (_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "વિકલ્પો (_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "બધા દિવસની ઘટના"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "બધા દિવસની ઘટના (_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "વિશ્વાસજનક તરીકે વર્ગીકૃત કરો"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "ખાનગી તરીકે વર્ગીકૃત કરો"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "જાહેર તરીકે વર્ગીકૃત કરો"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "આ ઘટના માટે એલાર્મો સુયોજિત અથવા અસુયોજિત કરવા માટે અંહિ ક્લિક કરો"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "અદ્યતન મોકલો વિકલ્પો દાખલ કરો"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "આને રીકરીંગ ઘટના બનાવો"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "જાહેર (_b)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "સભાજનો માટે મુક્ત / વ્યસ્ત જાણકારીનો પ્રશ્ન પૂછો"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "ભૂમિકા ક્ષેત્ર (_o)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "મોકલો વિકલ્પો (_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "સમયને વ્યસ્ત બતાવો (_b)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "ટાઈમ ઝોન (_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "શું સભાજન પ્રકાર ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "શું RSVP ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "શું ભૂમિકા ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "શું પરિસ્થિતિ ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "શું ટાઈમ ઝોન દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "શું વર્ગો દર્શાવવા તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "શું બધા દિવસની ઘટના હોવી જોઈએ તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "શું સમયને વ્યસ્ત તરીકે બતાવો તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "એલાર્મ (_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "વર્ગો (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "વર્ગીકરણ (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "વિશ્વાસજનક (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "મુક્ત/વ્યસ્ત (_F)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "ખાનગી (_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "વળતર (_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "પરિસ્થિતિ ક્ષેત્ર (_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "પ્રકાર ક્ષેત્ર (_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "વર્તમાન મેઈલ પ્રક્રિયા રદ કરો"
@@ -20209,7 +21258,6 @@ msgid "Empty _Trash"
 msgstr "કચરાપેટી ખાલી કરો (_T)"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "ફોલ્ડર (_o)"
 
@@ -20881,9 +21929,9 @@ msgstr "નાનું મોટું (_Z)"
 msgid "_Zoom In"
 msgstr "મોટું કરો (_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "આ વિન્ડો બંધ કરો"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "બંધ કરો"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -20921,290 +21969,6 @@ msgstr "પસંદ કરેલ મેમો જુઓ"
 msgid "_Open Memo"
 msgstr "મેમો ખોલો (_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "ફાઈલ જોડો"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "વર્તમાન ફાઈલ બંધ કરો"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "બધી સહીઓ કાઢી નાંખો"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "આ સંદેશાને PGP સાથે એનક્રિપ્ટ કરો"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "તમારા S/MIME એનક્રિપ્શન પ્રમાણપત્ર સાથે આ સંદેશો એનક્રિપ્ટ કરો"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "બંધારણ ઘડો (_m)"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "જ્યારે તમારો સંદેશો વંચાય ત્યારે પહોંચ સૂચન મેળવો"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "મોકલો વિકલ્પો દાખલ કરો"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "ફાઈલ ખોલો"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP એનક્રિપ્ટ"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP સહી"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP એનક્રિપ્ટ (_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP સહી (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "વાંચન રસીદની અરજી કરો (_e)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME એનક્રિપ્ટ (_c)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME એનક્રિપ્ટ"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME સહી (_n)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME સહી"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "મોકલો (_e)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "આ રીતે સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "ડ્રાફ્ટ સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "આ રીતે સંગ્રહો (_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "ડ્રાફ્ટ સંગ્રહો (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "ડ્રાફ્ટ તરીકે સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "ફોલ્ડરમાં સંગ્રહો..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "વર્તમાન ફાઈલ સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "વર્તમાન ફાઈલ અલગ નામથી સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "સ્પષ્ટ કરેલ ફોલ્ડરમાં સંદેશાને સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "મોકલો"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "મેઈલને HTML બંધારણમાં મોકલો"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "આ સંંદેશાને મોકલો"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "સંદેશા પ્રાધાન્યને ઊંચી સુયોજિત કરો"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "આ સંદેશાને તમારી PGP કી સાથે સહી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "આ સંદેશાને તમારી S/MIME સહી પ્રમાણપત્ર સાથે સહી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "આને પણ ખબર વિના ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "આને પણ ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "શું તરફથી પસંદ કરનાર પ્રદર્શિત છે તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "શું ને પોસ્ટ કરો ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "શું ને વળતો જવાબ આપો ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "શું પ્રતિ ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "આને પણ ખબર વિના ક્ષેત્ર (_B)"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "આને પણ ક્ષેત્ર (_C)"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "બધું કાઢી નાંખો (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "તરફથી ક્ષેત્ર (_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "ખોલો (_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "ને પોસ્ટ કરો ક્ષેત્ર (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "સંદેશાનું પ્રાધાન્યકરણ કરો (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "ને વળતો જવાબ આપો ક્ષેત્ર (_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "સુરક્ષા (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "મોકલોના વિકલ્પો (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "પ્રતિ ક્ષેત્ર (_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "બંધ કરો (_l)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "સંગ્રહો અને બંધ કરો"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "સંગ્રહો અને બંધ કરો (_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "વર્તમાન ફાઈલ સંગ્રહો અને વિન્ડો બંધ કરો"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "તમારા ઉમેદવારી ફોલ્ડોરોની યાદીમાં ફોલ્ડર ઉમેરો"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "યાદી ફરીથી તાજી કરો"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "ફોલ્ડરોની યાદી ફરીથી તાજી કરો"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "તમારા ઉમેદવારી ફોલ્ડરોની યાદીમાંથી ફોલ્ડર દૂર કરો"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "ઉમેદવારી કરો"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "ઉમેદવારી દૂર કરો"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "પસંદગી ઊંધી કરો (_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "ક્રિયાની પરિસ્થિતિ વિગતો માટે બદલો / જુઓ ક્લિક કરો"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "પરિસ્થિતિ વિગતો"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "ટાઈમ ઝોન"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "પરિસ્થિતિ વિગતો (_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "પસંદિત બાબતોની નકલ કરો"
@@ -21398,50 +22162,54 @@ msgid "View/Hide the Status Bar"
 msgstr "પરિસ્થિતિદર્શક પટ્ટી જુઓ/છુપાવો"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "ઓફલાઈન કામ કરો (_O)"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "વિશે (_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "વિન્ડો બંધ કરો (_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "પાસવર્ડો ભૂલી ગયા (_F)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "વારંવાર પૂછવામાં આવતા પ્રશ્નો (_F)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "બટનો છુપાવો (_H)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "માત્ર ચિહ્નો (_I)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "ઝડપી સંદર્ભ (_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "બહાર નીકળો (_Q)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "સ્વીચરનો દેખાવ (_S)"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "સુમેળ વિકલ્પો (_S)..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "માત્ર લખાણ (_T)"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "વિન્ડો (_W)"
 
@@ -21518,11 +22286,11 @@ msgid "With _Status"
 msgstr "સ્થિતિ સહિત (_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -21539,8 +22307,8 @@ msgid "Select a Time Zone"
 msgstr "ટાઈમ ઝોન પસંદ કરો"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "ટાઈમઝોન કમ્બોબોક્સ"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21552,19 +22320,19 @@ msgstr ""
 "કરો.\n"
 "તેને નાનું કરવા માટે જમણું માઉસ બટન વાપરો."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "સંગ્રહ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s માટે દેખાવો વ્યાખ્યાયિત કરો"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "દેખાવો વ્યાખ્યાયિત કરો"
 
@@ -21574,17 +22342,17 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\" માટે દેખાવો વ્યાખ્યાયિત કરો"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "કોષ્ટક"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "પળ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "વર્તમાન દેખાવ સંગ્રહો"
 
@@ -21636,11 +22404,11 @@ msgstr "વર્તમાન વૈવિધ્યપૂર્ણ દેખા�
 msgid "Create or edit views"
 msgstr "દેખાવો બનાવો અથવા ફેરફાર કરો"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "કારખાનું"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "નવો દેખાવ વ્યાખ્યાયિત કરો"
 
@@ -21656,17 +22424,17 @@ msgstr "દેખાવનો પ્રકાર"
 msgid "Type of view:"
 msgstr "દેખાવનો પ્રકાર:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "જોડાણ પટ્ટી"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ફાઈલ %s જોડી શકતા નથી: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ફાઈલ %s જોડી શકતા નથી: નિયમિત ફાઈલ નથી"
@@ -21688,33 +22456,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "જોડાણનું આપોઆપ પ્રદર્શન સૂચવો"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "મહિના કેલેન્ડર"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "રંગ ભરો"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK ભરવાનો રંગ"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "સ્ટીપલ ભરો"
 
@@ -21739,29 +22506,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "ન્યુનતમ પહોળાઈ"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "ન્યુનતમ પહોળાઈ"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "જગ્યા છોડી રહ્યા છીએ"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "હમણાં"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "સમય બંધારણમાં જ હોવો જોઈએ: %s"
@@ -21770,152 +22537,151 @@ msgstr "સમય બંધારણમાં જ હોવો જોઈએ: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ટકા ૦ અને ૧૦૦ ની વચ્ચે જ હોવા જોઈએ"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "અરેબી"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "બાલ્ટિક"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "કેન્દ્રીય યુરોપિયાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "ચીની"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "સિરિલ્લિક"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "ગ્રીક"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "હિબ્રુ"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "જાપાની"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "કોરિયાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "થાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "તુર્કી"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "યુનિકોડ"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "પશ્ચિમિ યુરોપિયાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "પશ્ચિમિ યુરોપિયાઈ, નવું"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "સાંસ્કૃતિક"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "સરળ"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "યુક્રેનિયાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "દેખીતું"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "અક્ષરનો અજ્ઞાત સમૂહ: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "અક્ષરોની સંગ્રહપદ્ધતિ"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "અક્ષરોનો સમૂહ વાપરવા માટે દાખલ કરો"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "અન્ય..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "અક્ષરોની સંગ્રહપદ્ધતિ (_a)"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "તારીખ અને સમય"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "તારીખ દાખલ કરવા માટે લખાણ પ્રવેશ"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "કેલેન્ડર બતાવવા માટે આ બટન પર ક્લિક કરો"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "સમય પસંદ કરવા માટે કમ્બો બોક્સ"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "હમણાં (_w)"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "આજે (_T)"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "અયોગ્ય તારીખ મૂલ્ય"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "અયોગ્ય સમય મૂલ્ય"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "વિસ્તૃત થયેલ"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "શું વિસ્તારનાર વિસ્તૃત થશે કે નહિં"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "વિસ્તારનારના લેબલનું લખાણ"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "નીચે લીટી વાપરો"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -21923,37 +22689,37 @@ msgstr ""
 "જો સુયોજિત હોય, તો લખાણમાં નીચે લીટી પછીનો અક્ષર મ્નેમોનિક એસીલરેટર કી માટે વપરાય છે "
 "એમ સૂચવે છે"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "લેબલ અને બાળક વચ્ચે મૂકવાની જગ્યા"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "લેબલ વિજેટ"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "રોજિંદા વિસ્તૃતકારક લેબલ ની જગ્યાએ વિજેટ બતાવો"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "વિસ્તારનારનું માપ"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "વિસ્તારનાર તીરનું માપ"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "સૂચકની વચ્ચેની જગ્યા"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "વિસ્તારનાર તીરની ફરતે જગ્યા છોડી રહ્યા છીએ"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "ઉન્નત શોધ"
 
@@ -21998,22 +22764,31 @@ msgstr "વર્તમાન ફોલ્ડર"
 msgid "Current Message"
 msgstr "વર્તમાન સંદેશો"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "ઈમેજ પસંદ કરો"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "દુનિયા નક્શો"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
+#, fuzzy
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "ટાઈમઝોન પસંદ કરવા માટે માઉસ-આધારિત પૂછપરછ નક્શા વિજેટ. કીબોર્ડ વપરાશકર્તાઓએ તેની "
 "જગ્યાએ નીચેના કમ્બોબોક્સમાંથી ટાઈમઝોન પસંદ કરવો જોઈએ."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "ઓનલાઇન"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "બટન સ્થિતિ ઓનલાઇન છે"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "ની સાથે સુમેળ કરો:"
@@ -22038,61 +22813,61 @@ msgstr "મોડેલ ફરી ભરો"
 msgid "Column width"
 msgstr "સ્તંભ પહોળાઈ"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "શોધ"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "શોધ પ્રકાર બદલવા માટે અંહિ ક્લિક કરો"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "શોધ (_S)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "હમણાં શોધો (_F)"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "સાફ કરો (_C)"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "વસ્તુ ID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "લખાણ"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "બતાવો (_w): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "શોધો (_c): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " અંદર (_n) "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "કર્સર હરોળ"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "કર્સર સ્તંભ"
@@ -22109,7 +22884,7 @@ msgstr "પસંદગી પદ્ધતિ"
 msgid "Cursor Mode"
 msgstr "કર્સરની સ્થિતિ"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "જ્યારે કાઢી નંખાય (_l):"
 
@@ -22133,10 +22908,6 @@ msgstr "<b>સ્થિતિ પકડવાનું</b>"
 msgid "A_uto-delete sent item"
 msgstr "મોકલાયેલ વસ્તુઓને આપોઆપ કાઢી નાંખો (_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "વર્ગીકરણ"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "જાણકારી મેળવવા માટે મોકલાયેલ વસ્તુ બનાવો (_e)"
@@ -22217,39 +22988,40 @@ msgstr "પછી (_A):"
 msgid "_All information"
 msgstr "બધી જાણકારી (_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "સંદેશો પહોંચવામાં વિલંબ (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "પહોંચી ગયો (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "સમયસમાપ્તિ તારીખ સુયોજિત કરો (_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "જ્યાં સુધી નહિં (_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "જ્યારે યોગ્ય લાગે (_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "જ્યારે ખૂલે (_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% પૂર્ણ થયું)"
@@ -22294,23 +23066,23 @@ msgstr "પ્રકાશિત કરેલ સ્તંભ"
 msgid "Unselected Column"
 msgstr "પસંદ નહિં કરેલ સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "સ્તંંભ ચેકી નાખો"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "નીચે લીટી કરેલ સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "ઘાટો સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "રંગીન સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "BG રંગવાળો સ્તંભ"
 
@@ -22348,7 +23120,7 @@ msgid "A_vailable Fields:"
 msgstr "ઉપલબ્ધ ક્ષેત્રો (_v):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "ચઢતો ક્રમ"
 
@@ -22361,7 +23133,7 @@ msgid "Clear _All"
 msgstr "બધું સાફ કરો (_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "ઊતરતો ક્રમ"
 
@@ -22424,14 +23196,14 @@ msgstr "ક્રમમાં ગોઠવો (_S)..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "DnD કોડ"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "સંપૂર્ણ હેડર"
 
@@ -22465,290 +23237,290 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d વસ્તુ)"
 msgstr[1] "%s (%d વસ્તુઓ)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "હરોળના રંગોની અદલાબદલી કરી રહ્યા છીએ"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "આડી દોરવાની જાળી"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "ઊભી દોરવાની જાળી"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "દોરવાનું ફોકસ"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "કર્સરની સ્થિતિ"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "પસંદગી મોડેલ"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "લંબાઈ થ્રેશોલ્ડ"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "હરોળની અનન્ય ઊંચાઈ"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "ઠંડુ થયેલ"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "વર્તમાન દેખાવ બદલો"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "ચઢતા ક્રમમાં ગોઠવો (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "ઊતરતા ક્રમમાં ગોઠવો (_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "ક્રમમાં ગોઠવો નહિં (_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "આ ક્ષેત્ર દ્વારા જૂથ પાડો (_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "બોક્સ દ્વારા જૂથ (_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "આ સ્તંભ કાઢી નાખો (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "સ્તંભ ઉમેરો (_o)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "ગોઠવણી (_l)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "શ્રેષ્ઠ રીતે બંધબેસતું (_e)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "સ્તંભોનું બંધારણ ઘડો (_s)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "વર્તમાન દેખાવ બદલો (_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "આના પ્રમાણે ક્રમમાં ગોઠવો (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "વૈવિધ્યપૂર્ણ (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "ફોન્ટ વર્ણન"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "ક્રમમાં ગોઠવવાની જાણકારી"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "ટ્રી"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "કોષ્ટક હેડર"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "કોષ્ટક મોડેલ"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "કર્સર હરોળ"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "હંમેશ શોધ"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "ઉમેરવા માટે ક્લિક વાપરો"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
 msgid "ETree table adapter"
 msgstr "ETree કોષ્ટક એડપ્ટર"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
 msgid "Retro Look"
 msgstr "રેટ્રો દેખાવ"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
 msgid "Draw lines and +/- expanders."
 msgstr "લીટીઓ દોરો અને +/- વિસ્તૃત કરો."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "ઈનપુટ પદ્ધતિઓ"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "ઘટના પ્રોસેસર"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "ઘાટુ"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "ચેકી નાખવાનું"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "એન્કર"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "ન્યાય"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "ક્લિપ પહોળાઈ"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "ક્લિપ ઊંચાઈ"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "ક્લિપ"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "ક્લિપ લંબચોરસ ભરો"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X ઓફસેટ"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y ઓફસેટ"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "લખાણની પહોળાઈ"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "લખાણની ઊંચાઈ"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "લંબગોળો વાપરો"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "લંબગોળો"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "લીટી લપેટો"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "અક્ષરો તોડો"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "મહત્તમ લીટીઓ"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "કિનારીઓ દોરો"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "નવી લીટીઓને પરવાનગી આપો"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "પાશ્વ ભાગ દોરો"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "બટન દોરો"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "કર્સરની સ્થિતિ"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM સંદર્ભ"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "દૃશ્યપોપ-અપ નિયંત્રિત કરો"
 
diff --git a/po/ko.po b/po/ko.po
index efb3451687..baf4c68730 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,12 +6,13 @@
 # Changwoo Ryu <cwryu@debian.org>, 2003-2006, 2007, 2008.
 #
 #
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-03 04:35+0900\n"
-"PO-Revision-Date: 2008-03-03 04:36+0900\n"
+"POT-Creation-Date: 2008-07-29 16:31+0900\n"
+"PO-Revision-Date: 2008-07-29 16:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
 "MIME-Version: 1.0\n"
@@ -21,28 +22,27 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "에볼루션 주소록"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "새 연락처"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "새 연락처 목록"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "현재 주소록 폴더 %s에 카드 %d개가 들어 있습니다"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "열기"
 
@@ -157,7 +157,7 @@ msgid "calendar view for one or more days"
 msgstr "달력 보기, 일 단위"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%Y년 %b %e일 %A"
 
@@ -168,20 +168,18 @@ msgstr "%Y년 %b %e일 %A"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%b %e일 (%a)"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%Y년 %b %e일 (%a)"
 
@@ -189,10 +187,10 @@ msgstr "%Y년 %b %e일 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%Y년 %b %e일"
 
@@ -202,17 +200,15 @@ msgstr "%Y년 %b %e일"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%b %d"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "그놈 달력"
 
@@ -325,34 +321,34 @@ msgstr "달력: %s에서 %s까지"
 msgid "evolution calendar item"
 msgstr "에볼루션 달력 항목"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "콤보 단추"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "기본값 활성화"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "팝업 메뉴"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "첨부 모음 토글"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "활성화"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}'은(는) 읽기 전용 주소록 소스입니다. 연락처 보기로 바꾸고 연락처를 저장"
-"할 수 있는 주소록을 선택하십시오."
+"'{0}'은(는) 읽기 전용 달력이므로 내용을 바꿀 수 없습니다. 가장자리 창의 연락"
+"처 보기에서 다른 주소록을 선택하십시오."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -400,7 +396,7 @@ msgstr "주소록을 지울 수 없습니다."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "현재 에볼루션에서는 그룹와이즈 시스템 주소록만 접근할 수 있습니다. 일단 다른 "
 "그룹와이즈 메일 클라이언트를 사용해서 그룹와이즈 자주 쓰는 연락처 및 그룹와이"
@@ -424,7 +420,7 @@ msgstr "LDAP 서버에서 인증이 실패했습니다."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "연락처를 지우는 데 실패했습니다"
 
@@ -437,27 +433,23 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "권한이 거부되었습니다."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "서버 버전"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "이 서버에서는 일부 기능이 제대로 동작하지 않을 수도 있습니다"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "에볼루션 주소록이 갑자기 끝났습니다."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "선택한 그림 크기가 큽니다. 크기를 조정해서 저장하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
 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 "
@@ -466,19 +458,19 @@ msgstr ""
 "LDAP 서버가 이 기능을 지원하지 않는 LDAP 과거 버전을 사용할 수도 있고, 설정"
 "이 틀렸을 수도 있습니다. 지원하는 찾기 기준에 대해 관리자에게 문의하십시오."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "주소록을 영원히 지웁니다."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "주소록을 열 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "제안하신 찾기 기준 중에서 주소록 서버에 아무 것도 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -486,27 +478,27 @@ msgstr ""
 "주소록 서버에 접근할 수 없거나 서버 이름을 잘못 입력했을 거나 네트워크 연결"
 "이 끊어졌을 것입니다."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "주소록을 열 수 없습니다"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "찾기를 수행할 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0}을(를) 저장할 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "바뀐 부분을 저장하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 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?"
@@ -514,7 +506,7 @@ msgstr ""
 "연락처를 한 주소록에서 다른 주소록으로 옮기려고 하지만 원래 주소록에서 연락처"
 "를 지울 수 없습니다. 옮기는 대신에 복사하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -524,6 +516,10 @@ msgstr ""
 "제가 발생할 수도 있습니다. 서버를 지원하는 버전으로 업그레이드하는 게 가장 좋"
 "습니다."
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "이 주소록의 연락처를 지울 권한이 없습니다."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -560,8 +556,8 @@ msgid "_Use as it is"
 msgstr "그대로 사용(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -570,17 +566,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "기본 동기화 주소:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "주소록을 읽어들일 수 없습니다"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "파일롯의 Address 프로그램 블록을 읽을 수 없습니다"
 
@@ -602,10 +598,10 @@ msgstr "여기서 자동 완성을 설정합니다"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "연락처"
 
@@ -614,7 +610,7 @@ msgid "Evolution Address Book"
 msgstr "에볼루션 주소록"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "에볼루션 주소록 주소 팝업"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -646,11 +642,12 @@ msgstr "여기서 S/MIME 인증서를 관리합니다"
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "이 컴퓨터"
 
@@ -663,15 +660,16 @@ msgstr "이 컴퓨터"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "개인"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP 서버"
@@ -693,7 +691,7 @@ msgid "Create a new contact list"
 msgstr "새 연락처 목록을 만듭니다"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "새 주소록"
 
@@ -709,72 +707,72 @@ msgstr "새 주소록을 만듭니다"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "주소록 설정 혹은 폴더를 업그레이드하는 데 실패했습니다."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "베이스"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "종류(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:618
 msgid "Copy _book content locally for offline operation"
 msgstr "오프라인 작업을 위해 주소록 내용 로컬에 복사(_B)"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:967
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "일반"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "주소록"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:972
 msgid "Server Information"
 msgstr "서버 정보"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:974
 msgid "Authentication"
 msgstr "인증"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:977
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "자세히"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "찾는 중"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:980
 msgid "Downloading"
 msgstr "다운로드하는 중"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "주소록 속성"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "옮기는 중..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' 옮기는 중:"
@@ -828,48 +826,48 @@ msgstr ""
 "\n"
 "폴더를 여기에 맞게 변환하는 동안 잠시 기다리십시오..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" 폴더 이름 바꾸기:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "폴더 이름 바꾸기"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "폴더 이름에 '/'가 들어갈 수 없습니다"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "새 주소록(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "vCard로 저장..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "지우기(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "속성(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "연락처 원본 선택"
 
@@ -878,19 +876,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "익명으로 LDAP 서버 사용"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "인증하는 데 실패했습니다.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s(사용자 %s)의 암호를 입력하십시오"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "암호를 입력하십시오"
@@ -965,104 +963,96 @@ msgid "<b>Authentication</b>"
 msgstr "<b>인증</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>표시</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>다운로드하는 중</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>찾는 중</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>서버 정보</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>종류:</b> "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "주소록을 더합니다"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "항상"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "익명으로"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "기본"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "고유 이름"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "전자메일 주소"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "에볼루션은 이 전자메일 주소를 서버에 인증할 때 사용합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "가능한 찾기 기준을 찾기"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "로그인(_G):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "사용 안 함"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "암호화 없음"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "한 단계"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL 암호화"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "찾기 필터"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "찾기 기준(_B):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "찾기 필터(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "찾기 필터"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1071,7 +1061,7 @@ msgstr ""
 "찾기 필터는 찾기를 수행할 때 찾으려는 오브젝트의 종류를 말합니다. 따로 바꾸"
 "지 않으면, 기본값은 \"person\"의 오브젝트에 대해 찾기를 수행합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1079,7 +1069,7 @@ msgstr ""
 "이 옵션을 켜면 LDAP 서버가 SSL을 지원하는 경우에만 에볼루션에서 그 LDAP 서버"
 "에 연결합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1087,7 +1077,7 @@ msgstr ""
 "이 옵션을 켜면 LDAP 서버가 SSL을 지원하는 경우에만 에볼루션에서 그 LDAP 서버"
 "에 연결합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../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 "
@@ -1096,23 +1086,23 @@ msgstr ""
 "이 옵션을 선택하면 서버에서 SSL을 지원하지 않는다는 의미입니다.  연결이 안전"
 "하지 않을 수도 있고, 보안상의 침투에 취약할 수 있습니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "아래 단계"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "지원하는 찾기 기준"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS 암호화"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 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 "
@@ -1121,7 +1111,7 @@ msgstr ""
 "찾기 기준은 찾기를 시작할 항목의 고유 이름(distinguished name, DN)입니다. 찾"
 "기 기준을 비워두면, 디렉토리 트리의 맨 위부터 찾기 시작합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 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 "
@@ -1132,13 +1122,13 @@ msgstr ""
 "찾기 범위는 찾기 기준 아래의 모든 엔트리에 대해서 찾게 됩니다. 찾기 범위가 "
 "\"한 단계\"이면 찾기 기준에서 한 단계 아래의 엔트리만 포함합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP 서버의 완전한 이름입니다. 예를 들어 \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1146,7 +1136,7 @@ msgstr ""
 "다운로드할 항목의 최대 개수입니다. 이 숫자를 너무 크게 하면 주소록 동작이 느"
 "려집니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1155,7 +1145,7 @@ msgstr ""
 "에볼루션에서 인증하는 방법입니다. \"전자메일 주소\"로 설정하면 반드시 LDAP 서"
 "버에 익명 접근이 가능해야 합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1163,7 +1153,7 @@ msgstr ""
 "에볼루션 폴더 목록에 나타날 이 서버의 이름입니다. 표시하는 목적으로만 쓰입니"
 "다. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 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 "
@@ -1172,75 +1162,75 @@ msgstr ""
 "에볼루션에서 연결할 LDAP 서버의 포트 번호입니다. 표준 포트 번호의 목록이 여"
 "기 있습니다. 어떤 포트를 지정해야 할 지는 시스템 관리자에게 물어보십시오."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "구별되는 이름 (Distinguished Name, DN) 사용해서"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "전자메일 주소 사용해서"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "가능하면 언제나"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "주소록 추가(_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "다운로드 제한(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "가능한 찾기 기준 찾기(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "로그인 방법(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "포트(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "찾기 범위(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "서버(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "제한시간(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "보안 연결 사용(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "카드"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "분"
 
@@ -1281,7 +1271,7 @@ msgid "<b>Work</b>"
 msgstr "<b>직장</b> "
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1293,16 +1283,16 @@ msgid "Ca_tegories..."
 msgstr "분류(_T)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "연락처"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "연락처 편집기"
 
@@ -1315,7 +1305,7 @@ msgid "Image"
 msgstr "그림"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN 메신저"
 
@@ -1328,7 +1318,7 @@ msgid "Nic_kname:"
 msgstr "별명(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "노벨 그룹와이즈"
 
@@ -1342,11 +1332,11 @@ msgstr "전화"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "업무"
 
@@ -1368,7 +1358,7 @@ msgid "_Birthday:"
 msgstr "생일(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
@@ -1459,1119 +1449,1121 @@ msgstr "위치(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "우편 번호(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "주소"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "편집 가능"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "미국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "아프가니스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "알바니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "알제리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "미국령 사모아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "안도라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "앙골라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "앙귈라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "남극"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "안티가 바부다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "아르헨티나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "아르메니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "아루바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "오스트레일리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "오스트리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "아제르바이잔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "바하마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "바레인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "방글라데시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "바르바도스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "벨라루스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "벨기에"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "벨리즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "베닌"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "버뮤다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "부탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "볼리비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "보스니아 헤르체코비나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "보츠와나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "보우벳 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "브라질"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "영국령 인도양 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "브루나이 다루살람"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "불가리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "부르키나 파소"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "부룬디"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "캄보디아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "카메룬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "캐나다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "케이프 베르드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "케이만 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "중앙 아프리카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "챠드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "칠레"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "중국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "크리스마스 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "코코스 (킬링) 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "콜롬비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "코모로스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "콩고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "콩고 민주 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "쿡 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "코스타리카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "코트 디브와르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "크로아티아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "쿠바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "사이프러스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "체코 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "덴마크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "지부티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "도미니카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "도미니카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "에쿠아도르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "이집트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "엘 살바도르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "적도기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "에리트리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "에스토니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "에티오피아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "포클랜드 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "패로 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "피지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "핀란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "프랑스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "프랑스령 기아나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "프랑스령 폴리네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "프랑스령 남 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "가봉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "감비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "그루지아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "독일"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "가나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "지브롤터"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "그리스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "그린란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "그레나다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "과달루프"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "괌"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "과테말라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "건지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "기니비사우"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "가이아나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "하이티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "허드 맥도널드 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "바티칸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "혼두라스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "홍콩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "헝가리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "아이슬란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "인도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "인도네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "이란"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "이라크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "아이랜드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "맨 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "이스라엘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "이탈리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "자메이카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "일본"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "저지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "요르단"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "카자흐스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "케냐"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "키리바티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "조선민주주의인민공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "대한민국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "쿠웨이트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "키르기즈스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "라오스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "라트비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "레바논"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "레소토"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "라이베리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "리비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "리히텐슈타인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "리투아니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "룩셈부르크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "마카오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "마케도니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "마다가스카르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "말라위"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "말레이시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "몰디브"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "말리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "몰타"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "마샬 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "마르띠니크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "모리타니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "모리셔스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "마요트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "멕시코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "미크로네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "몰도바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "모나코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "몽골"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "몽세라트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "모로코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "모잠비크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "미얀마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "나미비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "나우루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "네팔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "네덜란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "네덜란드령 앤틸레스 열도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "뉴 칼레도니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "뉴질랜드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "니카라과"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "니제르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "나이지리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "니우에"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "노퍽 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "북 마리아나 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "노르웨이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "오만"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "파키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "팔라우"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "팔레스타인 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "파나마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "파푸아 뉴기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "파라과이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "페루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "필리핀"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "피트케언"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "폴란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "포르투갈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "푸에르토리코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "카타르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "레위니옹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "루마니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "러시아 연방"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "르완다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "세인트 키츠 네비스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "세인트 루시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "세인트 빈센트 그레나다인즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "사모아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "산마리노"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "상투메 프린시페"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "사우디아라비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "세네갈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "세르비아 몬테네그로"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "세이셸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "시에라리온"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "싱가폴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "슬로바키아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "슬로베니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "솔로몬 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "소말리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "남 아프리카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "남 조지아 남 샌드위치 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "스페인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "스리랑카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "세인트 헬레나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "쌩 피에르 미켈론"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "수단"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "수리남"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "스발바르드 얀마이엔 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "스와질란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "스웨덴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "스위스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "시리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "타이완"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "타지키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "탄자니아 연방 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "태국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "동티모르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "토고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "토켈로"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "통가"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "트리니다드 토바고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "튀니지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "터키"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "투르크멘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "터크 스케이커스 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "투발루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "우간다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "우크라이나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "아랍에미리트연합"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "영국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "미국령 소군도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "우르과이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "우즈베키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "바누아투"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "베네수엘라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "베트남"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "버진 제도, 영국령"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "버진 제도, 미국령"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "왈리스 후투나 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "서부 사하라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "예멘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "잠비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "짐바브웨"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "이름"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL 인스턴스 메신저"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "재버"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "야후 메신저"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "가두가두 메신저"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "서비스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "위치"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "사용자이름"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "집"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "기타"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "야후"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "가두가두"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "그룹와이즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "원본 주소록"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "대상 주소록"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "새 연락처"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "쓰기 가능한 필드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "필수 필드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "바뀜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "연락처 편집 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "이 연락처에 사용할 그림을 선택하십시오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "그림 없음(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2579,47 +2571,47 @@ msgstr ""
 "연락처 데이터가 잘못되었습니다:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'이(가) 비어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "연락처가 잘못되었습니다."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "연락처 빠른 추가"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "정식 이름 편집(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "전체 이름(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "전자 메일(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "주소록 선택(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2628,7 +2620,7 @@ msgstr ""
 "정말로 연락처 목록을 (%s)\n"
 "지우시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2636,7 +2628,7 @@ msgstr ""
 "정말로 이 연락처 목록을\n"
 "지우시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2645,7 +2637,7 @@ msgstr ""
 "정말로 연락처를 (%s)\n"
 "지우시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2788,12 +2780,17 @@ msgstr "메일주소를 입력하거나 연락처를 아래의 목록으로 끌�
 msgid "Contact List Members"
 msgstr "연락처 목록 구성원"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "구성원(_M)"
+
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "북"
 
@@ -2801,10 +2798,6 @@ msgstr "북"
 msgid "Is New List"
 msgstr "새 목록"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "구성원(_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "바뀐 연락처:"
@@ -2824,7 +2817,7 @@ msgid ""
 "like to add it anyway?"
 msgstr ""
 "이 연락처의 이름이나 메일 주소가 이미 이 폴더에 들어 있습니다. 그래도 연락처"
-"를 더하시겠습니까?"
+"를 추가하시겠습니까?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2840,42 +2833,42 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 "이 폴더에 이 연락처와 같은 이름이나 같은 메일 주소가 이미 들어 있습니다.\n"
-"그래도 연락처를 더하시겠습니까?"
+"그래도 연락처를 추가하시겠습니까?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
 msgid "Merge Contact"
 msgstr "연락처 합치기"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "합치기(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "전자메일"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "필드에 포함"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "전자메일 시작"
 
+# FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "이름 시작"
+msgid "Name contains"
+msgstr "이름에 포함"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2889,9 +2882,9 @@ msgstr[0] "연락처 %d개"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "쿼리"
 
@@ -2902,9 +2895,9 @@ msgstr "주소록 보기를 가져오는 데 오류가 발생했습니다"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "모델"
 
@@ -2912,108 +2905,110 @@ msgstr "모델"
 msgid "Error modifying card"
 msgstr "카드를 바꾸는 데 오류가 발생했습니다"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "이름 시작"
+
 # FIXME - 무슨 뜻?
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "소스"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "형태"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "vCard로 저장..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "새 연락처(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "새 연락처 목록(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "vCard로 저장(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "연락처 전달(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "연락처 전달(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "연락처로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "리스트로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "연락처로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "인쇄(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "주소록으로 복사(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "주소록으로 이동(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "잘라내기(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "복사(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "붙여 넣기(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "모든 분류"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "기타 오류"
 
@@ -3048,7 +3043,7 @@ msgstr "카폰"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3150,9 +3145,9 @@ msgid "Radio"
 msgstr "무선"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "역할"
 
@@ -3189,38 +3184,38 @@ msgid "Web Site"
 msgstr "웹 사이트"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "너비"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "높이"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "촛점이 있는 지"
 
@@ -3240,11 +3235,21 @@ msgstr "텍스트 모델"
 msgid "Max field name length"
 msgstr "최대 필드 이름 길이"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "열 너비"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"연락처를 찾는 중입니다..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3258,7 +3263,7 @@ msgstr ""
 "\n"
 "새 연락처를 만드려면 마우스를 두번 누르십시오."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3272,7 +3277,7 @@ msgstr ""
 "\n"
 "새 연락처를 만드려면 마우스를 두번 누르십시오."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3282,7 +3287,7 @@ msgstr ""
 "\n"
 "연락처 찾기."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3293,40 +3298,41 @@ msgstr ""
 "여기에서 볼 수 있는 항목이 없습니다."
 
 # FIXME - 무슨 뜻?
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "어댑터"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "업무 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "집 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "기타 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "선택됨"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "커서가 있는 지"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "브라우저에서 링크 열기(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "링크 위치 복사(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "새 메세지 보내기(_S)..."
 
@@ -3349,7 +3355,7 @@ msgstr "지도"
 
 # List는 여기서 Mailing List를 말한다
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "리스트 구성원"
 
@@ -3370,15 +3376,15 @@ msgid "Video Chat"
 msgstr "화상 대화"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3388,8 +3394,7 @@ msgstr "달력"
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "약속 있음/없음"
 
@@ -3411,125 +3416,127 @@ msgid "Web Log"
 msgstr "웹로그"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "생일"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "기념일"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "직함"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "홈페이지"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "블로그"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "성공했습니다"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "백엔드를 사용중입니다"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "저장고가 연결되지 않았습니다"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "주소록이 없습니다"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 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:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "권한이 거부되었습니다"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "연락처를 찾을 수 없습니다"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "연락처 ID가 이미 있습니다"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "프로토콜이 지원되지 않습니다"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "취소함"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "취소할 수 없습니다"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "인증이 실패했습니다"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "인증이 필요합니다"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS를 사용할 수 없습니다"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "그런 소스가 없습니다"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "오프라인 모드에서는 사용할 수 없습니다"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "서버 버전이 잘못되었습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3539,7 +3546,7 @@ msgstr ""
 "않았거나 아직 오프라인에서 사용할 수 있게 다운로드하지 않은 상태입니다. 온라"
 "인 모드에서 주소록을 다시 읽어들여서 그 내용을 내려 받으십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3548,7 +3555,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  해당 경로가 (%s) 있고 그 경로에 접근할 권한이 있"
 "는 지 확인하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3556,7 +3563,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
 "할 수 없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 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 "
@@ -3565,7 +3572,7 @@ msgstr ""
 "이 에볼루션 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP를 사용하려"
 "면 LDAP를 지원하는 에볼루션을 설치해야 합니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3573,7 +3580,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
 "없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3585,7 +3592,7 @@ msgstr ""
 "좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서 \n"
 "결과의 한계치를 지정해 주십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 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"
@@ -3596,45 +3603,45 @@ msgstr ""
 "넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서\n"
 "결과의 한계치를 지정해 주십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "이 주소록의 벡엔드에서 이 질의를 파싱할 수 없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "이 주소록의 벡엔드에서 이 질의를 수행하길 거부했습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
 msgstr "이 질의가 성공적으로 끝나지 않았습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
-msgstr "목록을 더하는 중 오류가 발생했습니다"
+msgstr "목록을 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 #: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
-msgstr "연락처를 더하는 중 오류가 발생했습니다"
+msgstr "연락처를 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "목록을 고치는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "연락처를 고치는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "목록을 지우는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 #: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "연락처를 지우는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3646,16 +3653,16 @@ msgstr[0] ""
 "연락처 %d개를 열면 %d개의 새 창을 열게 됩니다.\n"
 "정말로 이 연락처를 전부 여시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "표시하지 않기(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "모든 연락처 표시(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3664,7 +3671,7 @@ msgstr ""
 "%s이(가) 이미 존재합니다\n"
 "이 파일을 덮어 쓰시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "덮어 쓰기"
 
@@ -3708,27 +3715,27 @@ msgstr "연락처 이동"
 msgid "Copy contacts to"
 msgstr "연락처 복사"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "여러 개 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "vCard for %s"
 msgstr "%s에 대한 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, c-format
 msgid "Contact information"
 msgstr "연락처 정보"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s에 대한 연락처 정보"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "주소록 질의중입니다..."
 
@@ -3755,45 +3762,45 @@ msgstr "주소록에 저장"
 msgid "Card View"
 msgstr "카드: "
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "가져오는 중..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV 및 TAB 가져오기 프로그램"
+msgstr "Outlook CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
-msgstr "Mozilla CSV 및 TAB 가져오기 프로그램"
+msgstr "Mozilla CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "에볼루션 CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
-msgstr "에볼루션 CSV 및 TAB 가져오기 프로그램"
+msgstr "에볼루션 CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 데이터 교환 형식 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
-msgstr "에볼루션 LDIF 가져오기 프로그램"
+msgstr "에볼루션 LDIF 가져오기"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "vCard (.vcf, .gcrd)"
@@ -3801,7 +3808,7 @@ msgstr "vCard (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution vCard Importer"
-msgstr "에볼루션 vCard 가져오기 프로그램"
+msgstr "에볼루션 vCard 가져오기"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3844,11 +3851,11 @@ msgid "Format"
 msgstr "형식"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "머리말:"
@@ -3951,7 +3958,7 @@ msgstr "명암"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1055
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3970,7 +3977,7 @@ msgid "Top:"
 msgstr "위:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "형태:"
 
@@ -4079,13 +4086,22 @@ msgstr "처리하지 못한 오류"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}'은(는) 읽기 전용 달력 소스입니다. 달력 보기로 바꾸고 약속을 저장할 수 있"
-"는 달력을 선택하십시오."
+"'{0}'은(는) 읽기 전용 달력이므로 내용을 바꿀 수 없습니다. 가장자리 창의 달력 "
+"보기에서 다른 달력을 선택하십시오."
 
-#: ../calendar/calendar.error.xml.h:3
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"'{0}'은(는) 읽기 전용 달력이므로 내용을 바꿀 수 없습니다. 약속을 저장할 수 있"
+"는 다른 달력을 선택하십시오."
+
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4093,7 +4109,7 @@ msgstr ""
 "약속에 의미있는 요약문을 써야 받는 사람이 약속이 무엇에 관한 약속인지 알 수 "
 "있습니다."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4101,133 +4117,137 @@ msgstr ""
 "작업에 의미있는 요약문을 써야 받는 사람이 작업이 무엇에 관한 작업인지 알 수 "
 "있습니다."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "이 메모에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "이 메모에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "이 약속에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "이 작업에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr "이 약속에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "이 모임에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "이 메모에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "이 작업에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "정말로 이 '{0}' 작업을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "정말로 '{0}' 약속을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "정말로 이 '{0}' 메모를 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "정말로 '{0}' 약속을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "정말로 '{0}' 메모를 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "정말로 '{0}' 작업을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "정말로 이 약속을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "정말로 이 모임을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "정말로 이 메모를 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "정말 이 작업을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "정말로 요약문 없는 메모를 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "정말로 요약문 없는 약속을 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "정말로 요약문 없는 작업을 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "새 행사를 만들 수 없습니다"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "행사를 저장할 수 없습니다"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "'{0}' 달력을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "'{0}' 메모 목록을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "'{0}' 작업 목록을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "보내지 않기(_N)"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "다운로드하는 중입니다. 이 약속을 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "다운로드하는 중입니다. 이 작업을 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "편집 창을 읽어들일 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4235,25 +4255,25 @@ msgstr ""
 "전자메일로 초대 메세지를 모든 참가자에게 보내고 참가자들이 이 작업을 수락하도"
 "록 합니다."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "전자메일로 초대 메세지를 모든 참가자에게 보내고 참가자들이 응답하도록 합니다."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "달력을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "메모 목록을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "작업 목록을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4261,7 +4281,7 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 모임을 취소했다는 사실을 알 지 "
 "못할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4269,7 +4289,7 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 메모를 지웠다는 사실을 알 지 못"
 "할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4277,7 +4297,7 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 작업을 지웠다는 사실을 알 지 못"
 "할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4285,7 +4305,7 @@ msgstr ""
 "업데이트한 정보를 보내면 그걸 이용해서 다른 참가자들이 달력을 업데이트할 수 "
 "있습니다."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4293,7 +4313,7 @@ msgstr ""
 "업데이트한 정보를 보내면 그걸 이용해서 다른 참가자들이 작업 목록을 업데이트"
 "할 수 있습니다."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4301,7 +4321,7 @@ msgstr ""
 "다운로드 중인 첨부가 있습니다. 약속을 지금 저장하면 다운로드 중인 첨부를 잃어"
 "버리게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4309,83 +4329,83 @@ msgstr ""
 "다운로드 중인 첨부가 있습니다. 작업을 지금 저장하면 다운로드 중인 첨부를 잃어"
 "버리게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "현재 서버에서는 일부 기능이 제대로 동작하지 않을 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "에볼루션 달력이 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "에볼루션 메모가 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "에볼루션 작업이 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "이 달력은 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "메모 목록이 오프라인에서 사용할 수 있게 표시하지 않았습니다"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "메모 목록이 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "작업 목록이 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "이 달력은 완전히 지워집니다."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "이 메모 목록은 완전히 지워집니다."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "이 작업 목록은 완전히 지워집니다."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "바뀐 부분을 이 약속에 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "바뀐 부분을 이 메모에 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "바뀐 부분을 이 작업에 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "이 메모에 대한 취소 공지를 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "모든 참가자에게 취소 공지를 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "모임 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "이 작업을 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "업데이트한 모임 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "업데이트한 작업 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4395,108 +4415,107 @@ msgstr ""
 "제가 발생할 수도 있습니다. 서버를 지원하는 버전으로 업그레이드하는 게 가장 좋"
 "습니다."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "약속에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "작업에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "메모에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 달력을 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 메모를 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 작업을 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "바뀐 내용 버리기(_D)"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "바뀐 내용 저장(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 #: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "보내기(_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "공지사항 보내기(_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "여러 날에 걸친 행사 분리:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server를 시작할 수 없습니다"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "파일롯의 Calendar 프로그램 블록을 읽을 수 없습니다"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "파일롯의 Memo 프로그램 블록을 읽을 수 없습니다"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "파일롯의 Memo 프로그램 블록에 쓸 수 없습니다"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "기본 우선순위:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "파일롯의 ToDo 프로그램 블록을 읽을 수 없습니다"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "파일롯의 ToDo 프로그램 블록에 쓸 수 없습니다"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "달력 및 작업"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "달력"
 
@@ -4537,25 +4556,25 @@ msgid "Memo_s"
 msgstr "메모(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "메모"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "작업"
@@ -4574,23 +4593,23 @@ msgstr "작업(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "에볼루션 달력 알림 서비스"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "분"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "시간"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "시작 시각"
 
@@ -4601,9 +4620,9 @@ msgstr "약속"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "위치:"
@@ -4613,17 +4632,15 @@ msgid "Snooze _time:"
 msgstr "연기할 시간(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "편집(_E)"
 
@@ -4635,33 +4652,33 @@ msgstr "연기 모드(_S)"
 msgid "location of appointment"
 msgstr "약속 장소"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "요약이 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
 msgid "No description available."
 msgstr "설명이 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No location information available."
 msgstr "위치 정보가 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d개 알림이 있습니다"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "경고"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4674,7 +4691,7 @@ msgstr ""
 "보내는 대신 일반적인 미리 알림 대화 상자를 표시합니다."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4691,20 +4708,20 @@ msgstr ""
 "\n"
 "정말로 이 프로그램을 실행하시겠습니까?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "이 메세지를 다시 보지 않습니다."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "보노보를 초기화 할 수 없습니다"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr ""
-"알림 기능 서비스 팩토리를 만들 수가 없습니다. 아마도 이미 동작하는 것 같습니"
+"알림 기능 서비스 팩토리를 만들 수 없습니다. 아마도 이미 동작하는 것 같습니"
 "다..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
@@ -4712,7 +4729,7 @@ msgid "invalid time"
 msgstr "잘못된 시간"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4720,7 +4737,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d시간"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4730,7 +4747,7 @@ msgstr[0] "%d분"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4975,12 +4992,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "행사/작업/모임 편집에서 상태 항목 표시"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show the \"Preview\" pane"
 msgstr "\"미리 보기\" 창 표시"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show the \"Preview\" pane."
 msgstr "\"미리 보기\" 창을 표시합니다."
 
@@ -5161,68 +5178,68 @@ msgstr "근무일에 시작하는 분"
 msgid "daylight savings time"
 msgstr "일광 절약 시간"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "요약에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "설명에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "분류가"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "주석에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "위치에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "맞지 않음"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "앞으로 7일 간의 작업"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "활성화한 작업"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "마감이 지난 작업"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "완료한 작업"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "첨부가 있는 작업"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "활성화한 약속"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "앞으로 7일 간의 약속"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "인쇄"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 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 "
@@ -5233,17 +5250,17 @@ msgstr ""
 
 # FIXME - hard to translate UI + string based on English grammar
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "다음보다 오래된 행사 지우기:"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:403
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "일"
 
@@ -5251,105 +5268,105 @@ msgstr "일"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "웹"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "생일 및 기념일"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "날씨"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "새 달력(_N)"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "복사(_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "속성(_P)"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "달력을 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 '%s' 달력을 열 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "달력 소스 선택"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "새 약속"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "약속(_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "새 약속을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "새 모임"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "모임(_E)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "새 모임 요청을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "새 하루 종일 약속"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "하루 종일 약속(_P)"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "새 달력"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "달력(_N)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "새 달력을 만듭니다"
 
@@ -5370,15 +5387,223 @@ msgid "Month View"
 msgstr "월별 보기"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "모든 항목"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "첨부"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "참석자"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "업무"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "분류"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "등급"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "경쟁"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "비밀"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "설명"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "설명에 포함"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "존재하지 않음"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "존재함"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "즐겨찾기"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "선물"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "목표"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "공휴일"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "명절 카드"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "최신 연락처"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "아이디어"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "국제 문제"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "주요 고객"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "기타"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "앞으로 7일"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "주최자"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "전화 걸기"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "개인"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "공개"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "반복"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "상태"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "전략"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "요약"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "요약에 포함"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "공급처"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "시간 및 비용"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "중요 인물"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "기다리기"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "포함"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "포함하지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "같음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "다름"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "달력을 여는 중에 오류가 발생했습니다"
@@ -5391,11 +5616,11 @@ msgstr "달력을 여는 메소드를 지원하지 않습니다"
 msgid "Permission denied to open the calendar"
 msgstr "달력을 열 허가가 거부되었습니다"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "알 수 없는 오류가 발생했습니다"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "알림 편집"
 
@@ -5428,17 +5653,17 @@ msgid "Mes_sage:"
 msgstr "메세지(_S):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "사운드 재생"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "알림 팝업 창 표시"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "프로그램 실행"
 
@@ -5451,7 +5676,7 @@ msgid "Send To:"
 msgstr "보낼 사람:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "전자메일 보내기"
 
@@ -5501,6 +5726,7 @@ msgid "hour(s)"
 msgstr "시간"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "분"
 
@@ -5509,7 +5735,7 @@ msgid "start of appointment"
 msgstr "약속 시작"
 
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "동작/시작 옵션"
 
@@ -5521,16 +5747,15 @@ msgstr "추가(_D)"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "알림"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시 우선(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "파일 첨부"
 
@@ -5598,8 +5823,8 @@ msgid "Display"
 msgstr "표시"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "금요일"
 
@@ -5614,8 +5839,8 @@ msgstr ""
 "일"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "월요일"
 
@@ -5638,7 +5863,7 @@ msgstr ""
 "일요일"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "색을 고르십시오"
 
@@ -5648,8 +5873,8 @@ msgid "S_un"
 msgstr "일(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "토요일"
 
@@ -5668,8 +5893,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "일요일"
 
@@ -5684,11 +5909,11 @@ msgstr "목(_H)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Template:"
-msgstr "템플리트:"
+msgstr "서식:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "목요일"
 
@@ -5702,14 +5927,14 @@ msgid "Time format:"
 msgstr "시간 형식:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "화요일"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "수요일"
 
@@ -5789,313 +6014,464 @@ msgstr "수(_W)"
 msgid "before every appointment"
 msgstr "전에 미리 알려주기"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "오프라인 작업을 위해 달력 내용을 로컬에 복사(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "오프라인 작업을 위해 작업 목록 내용을 로컬에 복사(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "오프라인 작업을 위해 메모 목록 내용을 로컬에 복사(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "색(_O):"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "색(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "작업 목록"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "메모 목록"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "달력 속성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "새 달력"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "작업 목록 속성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "새 작업 목록"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "메모 목록 속성"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "새 메모 목록"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "이 행사는 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "이 작업은 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "이 메모는 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 닫으시겠습니까?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  바뀐 사항이 있습니다. 편집기를 닫으시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "이 행사는 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "이 작업은 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "이 메모는 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 업데이트하시겠습니"
 "까?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습니까?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "유효성 검사 오류: %s"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr "부터 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (기한 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "기한 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "첨부한 메시지 - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "첨부한 메세지 %d개"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "이동(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "드래그 취소(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "오브젝트를 업데이트할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "약속 편집"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "모임 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "약속 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "할당한 작업 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "작업 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "메모 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "요약 없음"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "현재 창을 닫으려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "선택한 메세지를 클립보드로 복사합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "선택한 텍스트를 클립보드로 잘라냅니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "해당 도움말을 보려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "클립보드에서 텍스트를 붙여 넣습니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "현재 창을 저장하려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "모든 텍스트 선택"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "분류(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "파일(_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "도움말(_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "넣기(_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "옵션(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "보기(_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "첨부(_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "파일을 첨부하려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "분류(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "분류를 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "시간대(_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "시간대 항목을 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "공개(_B)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "공개로 분류"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "개인 정보(_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "개인 정보로 분류"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "비밀(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "비밀로 분류"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "역할 항목(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "역할 항목을 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "응답바람(_R)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "응답요청 항목을 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "상태 항목(_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "상태 항목을 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "종류 항목(_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "참석자 종류를 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "최근 문서(_M)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "첨부"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b>개 첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "첨부 모음 숨기기(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "첨부 모음 보기(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "지우기(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "첨부파일 추가(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "첨부 모음 보기"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "스페이스를 눌러 첨부 모음을 토글하십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "약속 편집"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "모임 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "약속 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "할당한 작업 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "작업 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "메모 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "요약 없음"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버립니다."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "현재 버전을 사용할 수 없습니다!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "소스를 열 수 없습니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "받을 곳을 열 수 없습니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "받을 곳이 읽기 전용입니다"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "이 항목을 다른 수신자의 메일함에서도 지움(_D)"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 항목을 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 항목을 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "오류때문에 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "오류때문에 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "오류때문에 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "오류때문에 이 항목을 지울 수 없습니다"
 
@@ -6104,7 +6480,7 @@ msgid "Contacts..."
 msgstr "연락처..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "대리인:"
 
@@ -6112,104 +6488,154 @@ msgstr "대리인:"
 msgid "Enter Delegate"
 msgstr "대리인을 입력하십오"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+# Alarm -> 알림, Microsoft Office XP 참고
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "알림(_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "이 행사에 알림을 설정하거나 해제하려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "반복(_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "반복 행사로 만듭니다"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "보내기 옵션"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "고급 보내기 옵션 넣기"
+
+# event -> 행사, Microsoft Office XP 참고
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "하루 종일 행사(_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "하루 종일 행사가 있는 지 토글합니다"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "시간을 약속 있음으로 표시(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "시간을 약속 있음으로 표시할 지 토글합니다"
+
+# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "약속 있음/없음(_F):"
+
+# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "참석자의 약속 있음/없음 정보를 알아봅니다"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "약속(_M)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "반복"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "행사에 알림이 있습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "주최자(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "대리인(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "참석자(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "행사에 시작 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "행사에 끝 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "시작 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "끝 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "시작 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "끝 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "선택하신 주최자가 이제 계정이 없습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "주최자가 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "최소한 참석자가 한 사람은 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "추가(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' 달력을 열 수 없습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "%s 자격으로 작업합니다"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "약속 %d일 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6217,31 +6643,31 @@ msgstr[0] "약속 %d시간 전에"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "약속 %d분 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "사용자 지정"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "없음"
 
@@ -6323,28 +6749,24 @@ msgstr "주최자 바꾸기(_H)"
 msgid "Co_ntacts..."
 msgstr "연락처(_N)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "주최자"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "주최자:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "메모"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'의 메모를 열 수 없습니다."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "받는 사람"
 
@@ -6362,60 +6784,60 @@ msgid "_Description:"
 msgstr "설명(_D):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "그룹(_G):"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "반복 행사를 고치려고 합니다. 무엇을 고치시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "반복 행사를 대리하려고 합니다. 무엇을 대리하시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "반복 작업을 고치려고 합니다. 무엇을 고치시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "반복 메모를 고치려고 합니다. 무엇을 고치시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "이 경우만"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "이 경우 및 지나간 경우"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "이 경우 및 앞으로의 경우"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "모든 경우"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "이 약속에는 에볼루션에서 편집할 수 있는 반복이 들어 있습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "반복하는 날짜가 잘못되었습니다"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "요일"
 
@@ -6423,7 +6845,7 @@ msgstr "요일"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "첫번째"
 
@@ -6432,7 +6854,7 @@ msgstr "첫번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "초"
 
@@ -6440,7 +6862,7 @@ msgstr "초"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "세번째"
 
@@ -6448,7 +6870,7 @@ msgstr "세번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "네번째"
 
@@ -6456,13 +6878,13 @@ msgstr "네번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "마지막"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "기타 날짜"
 
@@ -6470,7 +6892,7 @@ msgstr "기타 날짜"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1일부터 10일"
 
@@ -6478,7 +6900,7 @@ msgstr "1일부터 10일"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11일부터 20일"
 
@@ -6486,14 +6908,14 @@ msgstr "11일부터 20일"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21일부터 31일"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "일"
 
@@ -6502,33 +6924,33 @@ msgstr "일"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "기간:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "번"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "예외 추가"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "고칠 선택 사항을 얻어 올 수 없습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "예외 바꾸기"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "지울 선택 사항을 얻어 올 수 없습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "날짜/시각"
 
@@ -6591,12 +7013,12 @@ msgstr "주"
 msgid "year(s)"
 msgstr "년"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "완료 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "웹 페이지"
 
@@ -6611,51 +7033,55 @@ 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:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "완료됨"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "높음"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "진행중"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "낮음"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "보통"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "시작 안함"
 
@@ -6668,7 +7094,7 @@ msgid "Stat_us:"
 msgstr "상태(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "정의안됨"
 
@@ -6677,7 +7103,7 @@ msgid "_Date completed:"
 msgstr "완료한 날짜(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "우선순위(_P):"
 
@@ -6685,25 +7111,38 @@ msgstr "우선순위(_P):"
 msgid "_Web Page:"
 msgstr "웹 페이지(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "상태 자세히(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "누르면 작업의 자세한 상태 정보를 바꾸거나 봅니다"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "보내기 옵션(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "작업 자세히"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "주최자(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "마감 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'의 작업을 열 수 없습니다."
@@ -6729,68 +7168,68 @@ msgid "_Due date:"
 msgstr "마감 날짜(_D):"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d일"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d주"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "알 수 없는 동작 수행"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s 약속 시작 전"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s 약속 시작 후"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "약속 시작에 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s 약속 끝나기 전"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s 약속 끝난 후"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "약속 끝날때 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s (%s)"
@@ -6798,80 +7237,64 @@ msgstr "%s (%s)"
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "알 수 없는 시작 옵션에 대한 %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "%s URL을 열려면 누르십시오"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
 msgid "Untitled"
 msgstr "제목 없음"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "시작 날짜:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "설명:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "웹 페이지:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "요약:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "마감 날짜:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "상태:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "우선 순위:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "공개"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "개인"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "비밀"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "끝 날짜"
@@ -6881,21 +7304,14 @@ msgstr "끝 날짜"
 msgid "Start Date"
 msgstr "시작 날짜"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "요약"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "Free"
 msgstr "약속 없음"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "약속 있음"
 
@@ -6910,34 +7326,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "예"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "아니오"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "알 수 없음"
 
@@ -6949,159 +7365,185 @@ msgstr "반복됨"
 msgid "Assigned"
 msgstr "예약됨"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
 msgid "Select folder to save selected attachments..."
 msgstr "선택한 첨부를 저장할 폴더 선택..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
 msgstr "이름없는_그림.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "다른 이름으로 저장(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "배경 화면으로 설정(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "선택한 것 저장(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "%s에서 열기..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:330
+msgid "* No Summary *"
+msgstr "* 요약 없음 *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "주최자: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "주최자: %s"
+
+#: ../calendar/gui/e-calendar-table.c:400
+msgid "Start: "
+msgstr "시작: "
+
+#: ../calendar/gui/e-calendar-table.c:412
+msgid "Due: "
+msgstr "기한: "
+
+#: ../calendar/gui/e-calendar-table.c:581
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:583
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:584
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:585
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:586
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:587
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "선택한 오브젝트를 지우는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "오브젝트를 업데이트하는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1563
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "새 작업(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1569
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "인쇄(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "잘라내기(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "붙여 넣기(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar로 전달(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1581
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1582
 msgid "_Mark Selected Tasks as Complete"
 msgstr "선택한 작업을 마친 작업으로 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1583
 msgid "_Mark as Incomplete"
 msgstr "작업 미완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1584
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "선택한 작업을 마치지 못한 작업으로 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Delete Selected Tasks"
 msgstr "선택한 작업 지우기(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1826
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "작업을 추가하려면 누르십시오"
@@ -7124,7 +7566,8 @@ msgid "Due date"
 msgstr "마감 날짜"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "우선순위"
 
@@ -7132,113 +7575,94 @@ msgstr "우선순위"
 msgid "Start date"
 msgstr "시작 날짜"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "상태"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "항목을 옮기는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "항목을 복사하는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "새 하루 종일 행사(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "새 모임(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "현재 뷰(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "오늘 선택(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "날짜 선택(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "인쇄(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "달력으로 복사(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "달력으로 이동(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "모임 대리(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "모임 일정(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "회신(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "전체에 회신(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "이 경우 옮길 수 있게 만들기(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "이 경우 지우기(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "모든 경우 지우기(_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "주최자: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "주최자: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "위치: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "시간: %s %s"
@@ -7266,7 +7690,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i분 단위"
@@ -7277,45 +7701,33 @@ msgstr "%02i분 단위"
 #. 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:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%B %e일 %A"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:813
 msgid "am"
 msgstr "오전"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "오후"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "예. (복잡한 반복)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "%d일마다"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7323,9 +7735,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "%d주일마다"
 
 # FIXME - hard to translate UI + string based on English grammar
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7333,51 +7743,35 @@ msgstr[0] "%d주일마다 "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " 그리고 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s "
 
 # FIXME - hard to translate UI + string based on English grammar
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "%d달마다"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "%d년마다"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7385,48 +7779,48 @@ msgstr[0] " 전체 %d번"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", 끝: "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "시작"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "끝"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "기한"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar 정보"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar 오류"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "모르는 사람"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7434,295 +7828,296 @@ msgstr ""
 "<br> 다음 정보를 다시 확인하시고, 아래의 메뉴에서 어떤 동작을 할 지 선택하십"
 "시오."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "수락"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "거부"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "모임이 취소되었지만, 이 모임이 달력에 들어 있지 않습니다."
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "작업이 취소되었지만, 이 작업이 작업 목록에 들어 있지 않습니다."
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>님이 모임 정보를 게시했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "모임 정보"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, 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:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>님이 모임에 참석하시기를 요청했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "모임 제안"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b>님이 기존 모임에 들어가고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "모임 업데이트"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>님이 가장 최근의 모임 정보를 받고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "모임 업데이트 요청"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>님이 모임 요청에 회신했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "모임 회신"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b>님이 모임을 취소했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "모임 취소"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>님이 이해하기 어려운 메세지를 보냈습니다."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "잘못된 모임 메세지"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>님이 작업 정보를 게시했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "작업 정보"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>님이 %s님에게 작업을 수행하길 요청하셨습니다."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>님이 작업을 수행하길 요청하셨습니다."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "작업 제안"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b>님이 기존 작업에 들어가고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "작업 업데이트"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>님이 가장 최근의 작업 정보를 받고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "작업 업데이트 요청"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>님이 작업 할당에 회신했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "작업 회신"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>님이 작업을 취소했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "작업 취소"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "잘못된 작업 메세지"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, 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:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "약속 있음/없음 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, 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:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "약속 있음/없음 요청"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, 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:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "약속 있음/없음 회신"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "틀린 약속 있음/없음 메세지"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "메세지의 형식이 올바르지 않은 것으로 보입니다"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "이 메세지에는 지원하지 않는 요청만 들어 있습니다."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "첨부에 올바른 달력 메세지가 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "이 첨부를 볼 수 있는 달력 아이템이 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "업데이트 마침\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "오브젝트가 잘못되었고 업데이트할 수 없습니다\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 더하시겠습니까?"
+msgstr ""
+"현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 추가하시겠습니까?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "참석자의 상태 업데이트되었습니다\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "항목을 보냈습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "항목을 보낼 수 없습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "동작을 고르십시오:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "업데이트"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "수락"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "잠정적으로 수락"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "거부"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "약속 있음/없음 정보 보내기"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "업데이트 응답 상태"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "가장 최근 정보 보내기"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "취소"
@@ -7753,112 +8148,112 @@ msgstr "달력 불러오기..."
 msgid "Server Message:"
 msgstr "서버 메세지:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "의장"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "필수 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "선택 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "자원"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "개인"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
 #: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "그룹"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "자원"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
 #: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "방"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
 #: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "의장"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "필수 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "선택 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "불참자"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "동작 필요"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "잠정적"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "대리"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "참석자"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "응답바람"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%Y년 %B %e일 %A"
 
@@ -7866,87 +8261,83 @@ msgstr "%Y년 %B %e일 %A"
 #. 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.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 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:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "부재 중"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "정보 없음"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "참석자(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "옵션(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "근무 시간만 보기(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "축소해서 보기(_Z)"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "약속 있음/없음 업데이트(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
 # Autopick -> 빈 시간 찾기, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "빈 시간 찾기(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "모든 사람과 자원(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "모든 사람과 자원 한 개(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "필요한 사람(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "필요한 사람과 자원 한 개(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "시작 시각(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "마침 시각(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "참석자"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "참석자를 추가하려면 여기를 누르십시오"
@@ -7979,8 +8370,8 @@ msgstr "선택한 메모 지우기(_D)"
 msgid "Click to add a memo"
 msgstr "메모를 추가하려면 누르십시오"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7989,85 +8380,84 @@ msgstr ""
 "%s에서 오류 발생:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "메모를 읽어들이는 중입니다"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s에 있는 메모를 여는 중입니다"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "선택한 오브젝트를 지웁니다..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "작업을 읽어들이는 중입니다"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s에 있는 작업을 여는 중입니다"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "작업을 완료하는 중입니다..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "지운 메세지 비우는 중"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 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/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%B %e일"
 
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "질의를 업데이트하는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "사용자 설정 보기(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "사용자 설정 보기 저장(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "보기 지정(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s의 약속을 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s의 작업을 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s에서 메모를 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "비우는 중"
 
@@ -8127,139 +8517,143 @@ msgstr "9월"
 msgid "_Select Today"
 msgstr "오늘 선택(_S)"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "주최자를 결정해야 합니다."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "참석자가 최소한 한 사람은 필요합니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "행사 정보"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "작업 정보"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "메모 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "약속 있음/없음 정보"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "달력 정보"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "업데이트됨"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "새로 고침"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "반대-제안"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "약속 있음/없음 정보 (%s부터 %s까지)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar 정보"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "이 행사의 참석자여야 합니다."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "새 메모 목록(_N)"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d개 메모"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d개 선택"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "메모를 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 '%s' 메모 목록을 열 수 없습니다"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "메모를 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "메모 소스 선택"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "새 메모"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Mem_o"
 msgstr "메모(_O)"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "새 메모를 만듭니다"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "새 공유 메모"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "_Shared memo"
 msgstr "공유 메모(_S)"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "새 공유 메모를 만듭니다"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "새 메모 목록"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Memo li_st"
 msgstr "메모 목록(_S)"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "새 메모 목록을 만듭니다"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "메모 인쇄"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days'"
+msgstr "앞으로 7일"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8270,7 +8664,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8282,27 +8676,27 @@ msgstr ""
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb의 과거 설정을 옮겨 올 수 없습니다"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "`%s' 달력을 옮겨 올 수 없습니다"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "`%s' 작업을 옮겨 올 수 없습니다"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "쪽지"
 
@@ -8510,67 +8904,67 @@ msgstr "연락처:"
 msgid "Upcoming Appointments"
 msgstr "예정된 약속"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "새 작업 목록(_N)"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "연락처 %d개"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "작업을 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 '%s' 작업 목록을 열 수 없습니다"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "작업을 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "작업 소스 선택"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "새 작업"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "새로 할당한 작업"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Assigne_d Task"
 msgstr "할당한 작업(_D)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "새로 할당한 작업을 만듭니다"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "새 작업 목록"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Tas_k list"
 msgstr "작업 목록(_K)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "새 작업 목록을 만듭니다"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8582,53 +8976,76 @@ msgstr ""
 "\n"
 "정말로 이 작업들을 지우시겠습니까?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "다시 묻지 않습니다."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "작업 인쇄"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% 완료"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "취소함"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "진행 중"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "보다 큼"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "보다 적음"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "약속 및 모임"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "달력을 여는 중입니다"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 파일 (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
-msgstr "에볼루션 iCalendar 가져오기 프로그램"
+msgstr "에볼루션 iCalendar 가져오기"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "미리 알림!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 파일 (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
-msgstr "에볼루션 vCalendar 가져오기 프로그램"
+msgstr "에볼루션 vCalendar 가져오기"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "달력 행사"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
-msgstr "에볼루션 달력 똑똑한 가져오기 프로그램"
+msgstr "에볼루션 달력 똑똑한 가져오기"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -10162,58 +10579,214 @@ msgstr "태평양/월리스"
 msgid "Pacific/Yap"
 msgstr "태평양/얍"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "주소록을 보려면 누르십시오"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "자동 저장 파일을 열 수 없습니다"
 
-# post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "게시물 수신자"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "편집기에서 메세지를 가져올 수 없습니다"
 
-# post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "메세지를 올릴 폴더를 선택하십시오."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "첨부 넣기"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "첨부(_T)"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "서명(_G):"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "제목 없는 메세지"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "보낸 사람(_O):"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "파일을 첨부합니다"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "회신 주소(_R):"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "닫기(_C)"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "받는 사람(_T):"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "현재 파일을 닫습니다"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "인쇄(_P)..."
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "인쇄 미리 보기(_V)"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "현재 파일을 저장합니다"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "다른 이름으로 저장(_A)..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "현재 파일을 다른 이름으로 저장합니다"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "임시 보관함에 저장(_D)"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "임시 보관함에 저장"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "보내기(_E)"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "이 메세지를 지금 보냅니다"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "보내기 옵션 넣기"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "새 메세지(_M)"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "새 메세지 창을 엽니다"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "문자 인코딩(_E)"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "보안(_S)"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "PGP 암호화(_E)"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "이 메세지를 PGP로 암호화합니다"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "PGP 서명(_S)"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "이 메세지를 PGP키로 서명합니다"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "메세지 우선순위 높이기(_P)"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "메세지 우선순위를 높입니다"
+
+# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "내용 읽음 확인 요청(_Q)"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "메세지를 읽으면 배달 확인 받기"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "S/MIME 암호화(_C)"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "이 메세지를 S/MIME 암호화 인증서로 암호화합니다"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S/MIME 서명(_N)"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "이 메세지를 S/MIME 서명 증명으로 서명합니다"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "숨은 참조 항목(_B)"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "숨은 참조 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "참조 항목(_C)"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "참조 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "발신 항목(_F)"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "발신 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "올리는 곳 항목(_P)"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "올리는 곳 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "회신 주소 항목(_R)"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "회신 주소 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "제목 항목(_S)"
+
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr "제목 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "받는 사람 항목(_T)"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "받는 사람 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "메세지를 받을 사람을 입력하십시오"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "참조(_C):"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "메세지의 사본을 받을 사람의 주소를 입력하십시오"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "숨은 참조(_B):"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-composer-header-table.c:71
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10221,31 +10794,73 @@ msgstr ""
 "메세지의 받는 사람 목록에 나타나지 않고 참조 메세지를 받을 주소를 입력하십시"
 "오."
 
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "보낸 사람(_O):"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "회신 주소(_R):"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "받는 사람(_T):"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "참조(_C):"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "숨은 참조(_B):"
+
 # post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "게시 위치(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "제목(_U):"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "첨부(_T)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "서명(_G):"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "첨부 넣기"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "주소록을 보려면 누르십시오"
+
+# post -> 게시, Microsoft Office XP 참고
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "게시물 수신자"
+
+# post -> 게시, Microsoft Office XP 참고
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "메세지를 올릴 폴더를 선택하십시오."
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "최근 문서(_D)"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "첨부 모음 보기(_A)"
+
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "보내는 메세지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
 "았습니다"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10253,42 +10868,22 @@ msgstr ""
 "보내는 메세지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
 "습니다"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "첨부"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "첨부 모음 숨기기(_A)"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "첨부 모음 보기(_A)"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "알 수 없는 이유"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "파일을 열 수 없습니다"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "편집기에서 메세지를 가져올 수 없습니다"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "제목 없는 메세지"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "파일 열기"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "메세지를 작성합니다"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10318,8 +10913,7 @@ msgstr "정말로 제목이 '{0}'인, 작성중이었던 메세지를 버리시�
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "&quot;{0}&quot; 때문에, 다른 메일 옵션을 선택해야 할 수도 있습니다."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "&quot;{1}&quot; 때문입니다."
 
@@ -10437,7 +11031,7 @@ msgstr "메일을 작성하기 전에 계정을 설정해야 합니다."
 msgid "_Do not Recover"
 msgstr "복구하지 않음(_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
 msgid "_Recover"
 msgstr "복구(_R)"
 
@@ -10449,7 +11043,7 @@ msgstr "메세지 저장(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "에볼루션 메일 및 달력"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "그룹웨어 모음"
 
@@ -10465,56 +11059,79 @@ msgstr "주소 카드"
 msgid "calendar information"
 msgstr "달력 정보"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "에볼루션 오류"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "에볼루션 경고"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "에볼루션 정보"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "에볼루션 물음"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "내부 오류, 알 수 없는 '%s' 오류가 발생했습니다"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "컴포넌트"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "기록 중인 컴포넌트의 이름"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "사용"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "플러그인을 사용하는 지 여부"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "인쇄하는 도중 오류가 발생했습니다"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "인쇄 시스템에서 다음과 같은 오류가 보고되었습니다:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "인쇄 시스템에서 추가 오류 내용을 자세히 보고하지 않았습니다."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "\"{1}\" 때문입니다."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 파일을 열 수 없습니다."
+msgid "Cannot open file \"{0}\"."
+msgstr "\"{0}\" 파일을 열 수 없습니다."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 파일을 저장할 수 없습니다."
+msgid "Cannot save file \"{0}\"."
+msgstr "\"{0}\" 파일을 저장할 수 없습니다."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "덮어 쓰시겠습니까?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 파일이 있습니다."
+msgid "File exists \"{0}\"."
+msgstr "\"{0}\" 파일이 있습니다."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10524,49 +11141,60 @@ msgstr "파일을 덮어쓰시겠습니까?"
 msgid "_Overwrite"
 msgstr "덮어 쓰기(_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "중요(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "업무(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "개인(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "할 일(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "나중에(_L)"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "레이블 이름(_N):"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "레이블 편집"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "레이블 추가"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "레이블 이름이 빈 문자열이면 안 됩니다."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-msgstr "같은 태그의 레이블이 이미 있습니다. 레이블 이름을 바꾸십시오."
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr "같은 태그의 레이블이 이미 서버에 있습니다. 레이블 이름을 바꾸십시오."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 오류: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "나머지 오류 메세지는 터미널에서만 표시합니다."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10670,65 +11298,65 @@ msgstr "%Y-%m-%d"
 msgid "Select a time to compare against"
 msgstr "비교할 시각을 선택하십시오"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "파일을 선택하십시오"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "테스트"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:851
 msgid "R_ule name:"
 msgstr "규칙 이름(_U):"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:879
 msgid "Find items that meet the following criteria"
 msgstr "다음 조건이 만족한 항목을 찾습니다"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:913
 msgid "A_dd Filter Criteria"
 msgstr "필터 조건 추가(_D)"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If all criteria are met"
 msgstr "모든 조건이 다 충족될 때"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If any criteria are met"
 msgstr "어떤 조건이라도 충족될 때"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:921
 msgid "_Find items:"
 msgstr "항목 찾기(_F):"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "All related"
 msgstr "관계된 모두"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies"
 msgstr "답장"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies and parents"
 msgstr "답장 및 그 상위 메일"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "No reply or parent"
 msgstr "답장 없거나 상위 메일 없음"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:945
 msgid "I_nclude threads"
 msgstr "글타래 포함(_N)"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "받는 메일"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "보내는 메일"
 
@@ -10752,7 +11380,7 @@ msgstr "날짜가 빠졌습니다."
 msgid "Missing file name."
 msgstr "파일 이름이 빠졌습니다."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "이름이 빠졌습니다."
 
@@ -10828,7 +11456,7 @@ msgstr "앞으로"
 msgid "months"
 msgstr "달"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "초"
 
@@ -10840,9 +11468,9 @@ msgstr "현재 시각"
 msgid "the time you specify"
 msgstr "지정하는 시각"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "주"
 
@@ -10858,7 +11486,7 @@ msgstr "규칙 추가"
 msgid "Edit Rule"
 msgstr "규칙 편집"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "규칙 이름"
 
@@ -10877,60 +11505,72 @@ msgstr "여기서 맞춤법 검사, 서명, 그리고 메세지 작성 설정을
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
-msgstr "여기서 전자메일 게정을 설정합니다"
+msgstr "여기서 전자메일 계정을 설정합니다"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "여기서 네트워크 연결을 설정합니다"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "에볼루션 메일"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "에볼루션 메일 계정 설정 컨트롤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "에볼루션 메일 컴포넌트"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "에볼루션 메일 작성"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "에볼루션 메일 작성 설정 컨트롤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "에볼루션 메일 기본 설정 컨트롤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "에볼루션 네트워크 설정 컨트롤"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "메일"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "메일 계정"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "메일 기본 설정"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "네트워크 기본 설정"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "메일(_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 사용 약관"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10942,117 +11582,111 @@ msgstr ""
 "아래에 있는 %s의 사용 약관을 잘 읽어 보시고\n"
 "동의하실 경우 체크 단추에 체크하십시오.\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "폴더 선택"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "자동으로 만들기"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "메세지마다 물어보기"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "신상 정보"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "메일 받기"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2041
 msgid "Check for _new messages every"
 msgstr "새 메일 확인(_N), 매"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2049
 msgid "minu_tes"
 msgstr "분(_T)"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "메일 보내기"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "기본값"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "보안"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
 msgid "Receiving Options"
 msgstr "받기 옵션"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
 msgid "Checking for New Messages"
 msgstr "새 메일 확인"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "에볼루션 계정 도우미"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[기본값]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "사용"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "계정 이름"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "이름없음"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "언어"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "서명 스크립트 추가"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "서명"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 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:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11061,11 +11695,11 @@ msgstr ""
 "${TimeZone}, ${Sender} 쓰시길:"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "필터 규칙(_F)"
 
@@ -11082,10 +11716,6 @@ msgstr "색 지정"
 msgid "Assign Score"
 msgstr "점수 지정"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "첨부"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "숨긴 참조"
@@ -11103,11 +11733,6 @@ msgstr "참조"
 msgid "Completed On"
 msgstr "완료 날짜"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "포함"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "폴더로 복사"
@@ -11121,7 +11746,7 @@ msgid "Date sent"
 msgstr "보낸 날짜"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11133,11 +11758,6 @@ msgid "Deleted"
 msgstr "지워짐"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "포함하지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "끝나지 않음"
@@ -11162,10 +11782,6 @@ msgstr "비슷한 소리 아님"
 msgid "does not start with"
 msgstr "시작하지 않음"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "존재하지 않음"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "임시 보관함"
@@ -11175,10 +11791,6 @@ msgstr "임시 보관함"
 msgid "ends with"
 msgstr "끝남"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "존재함"
-
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
@@ -11192,16 +11804,11 @@ msgstr "표현"
 msgid "Follow Up"
 msgstr "추가 작업"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "중요"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "같음"
-
-# FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "뒤 날짜"
@@ -11217,21 +11824,6 @@ msgid "is Flagged"
 msgstr "플래그 지정"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "보다 큼"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "보다 적음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "다름"
-
-# FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "플래그 지정 아님"
@@ -11246,7 +11838,7 @@ msgstr "설정 아님"
 msgid "is set"
 msgstr "설정"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "정크메일"
@@ -11255,7 +11847,7 @@ msgstr "정크메일"
 msgid "Junk Test"
 msgstr "정크메일 테스트"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "레이블"
 
@@ -11297,7 +11889,7 @@ msgstr "사운드 재생"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "읽음"
 
@@ -11374,10 +11966,9 @@ msgstr "시작함"
 msgid "Stop Processing"
 msgstr "처리 중지"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11388,11 +11979,11 @@ msgid "Unset Status"
 msgstr "상태 설정 없애기"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "그러면"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "동작 추가(_T)"
 
@@ -11436,46 +12027,51 @@ msgstr "중요한 메세지"
 msgid "Messages Not Junk"
 msgstr "정크메일 아닌 메세지"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "계정 찾기"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "모든 계정 찾기"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "읽지 않은 메세지:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "전체 메세지:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "용량 제한 사용"
+
+#: ../mail/em-folder-properties.c:385
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "폴더 속성"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<폴더를 고를려면 여기를 누르십시오>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "만들기(_R)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "폴더 이름(_N):"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "찾기 폴더"
 
@@ -11485,27 +12081,27 @@ msgstr "찾기 폴더"
 msgid "UNMATCHED"
 msgstr "해당 없음"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "임시 보관함"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:507 ../mail/em-folder-tree.c:2556
+#: ../mail/mail-component.c:160
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "보낼 편지함"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "보낸 편지함"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "읽어들이는 중..."
 
@@ -11524,86 +12120,78 @@ msgstr "읽어들이는 중..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "메일 폴더 트리"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s 폴더를 옮기는 중"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중입니다"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중입니다"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메세지를 맨 위의 저장고에 넣을 수 없습니다"
 
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "폴더로 복사(_C)"
 
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "폴더로 이동(_M)"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"의 폴더를 찾는 중"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "보기(_V)"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "새 창에서 열기(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "이동(_M)..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "이름 바꾸기(_R)..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "새로 고침(_F)"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "보낼 편지함 비우기(_U)"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "휴지통 비우기(_E)"
 
@@ -11612,13 +12200,13 @@ msgstr "휴지통 비우기(_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "`%s'에서 `%s' 폴더로 복사하는 중"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "복사(_O)"
 
@@ -11640,207 +12228,199 @@ msgstr "폴더를 만듭니다"
 msgid "Specify where to create the folder:"
 msgstr "폴더 만들 곳을 지정하십시오:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "메일 지우기가 실패했습니다"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "이 메일을 지울 권한이 없습니다."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "보낸 사람에게 회신(_R)"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "전달(_F)"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "새 메세지로 편집(_E)..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "인쇄(_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "되살리기(_N)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "폴더로 이동(_M)..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "읽은 것으로 표시(_K)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "읽지 않은 것으로 표시(_U)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "중요하지 않은 것으로 표시(_I)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "정크메일로 표시(_J)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "정크메일이 아닌 것으로 표시(_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "추가 작업으로 표시(_W)..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "레이블(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "없음(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "새 레이블(_N)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "표시 완료(_G)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "표시 비우기(_E)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "메시지로부터 규칙 만들기(_T)"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "제목에 따른 찾기 폴더(_S)"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "보낸 사람에 따른 찾기 폴더(_N)"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "받은 사람에 따른 찾기 폴더(_R)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "메일링 리스트에 대한 찾기 폴더(_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "제목에 대한 필터(_J)"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "보낸 사람에 대한 필터(_D)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "받은 사람에 대한 필터(_C)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "메일링 리스트에 대한 필터(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "기본값"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "메세지를 가져올 수 없습니다"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "메세지를 가져오는 중..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "호출하기(_A)..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "찾기 폴더 만들기(_S)"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "이 주소에서(_F)"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "이 주소로(_T)"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "메일을 %s 주소로 보내려면 누르십시오"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "%s에게 호출하려면 누르십시오"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "주소를 감추려면/보이려면 누르십시오"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "일치: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:616
 msgid "Fin_d:"
 msgstr "찾기(_D):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:640
 msgid "_Previous"
 msgstr "이전(_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:645
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:650
 msgid "M_atch case"
 msgstr "대소문자 구별(_A)"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "서명 없음"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11848,11 +12428,11 @@ msgstr ""
 "이 메세지에는 서명이 없습니다.  메세지를 보낸 사람이 확실한 지 보장할 수 없습"
 "니다."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "올바른 서명"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11860,11 +12440,11 @@ msgstr ""
 "이 메세지는 서명되었고 서명이 올바릅니다.  메세지를 보낸 사람은 그 사람이 거"
 "의 확실합니다."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "잘못된 서명"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11872,11 +12452,11 @@ msgstr ""
 "이 메세지의 서명을 확인할 수 없습니다. 메일이 전송중에 변경되었을 수 있습니"
 "다."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "올바른 서명이지만, 보낸 사람을 확인할 수 없습니다"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11884,21 +12464,21 @@ msgstr ""
 "이 메세지는 올바른 서명으로 사인되었습니다. 하지만 메세지를 보낸 사람을 확인"
 "할 수 없습니다."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "서명이 있지만, 공개키가 필요합니다"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "이 메세지는 서명되어 있지만, 서명에 해당하는 공개 키가 없습니다."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "암호화 안 됨"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11906,11 +12486,11 @@ msgstr ""
 "이 메세지는 암호화하지 않았습니다.  인터넷을 통해 전달되는 동안 다른 사람이 "
 "이 메세지를 봤을 수 있습니다."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "암호화됨, 약함"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:961
 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 "
@@ -11920,11 +12500,11 @@ msgstr ""
 "사람이 이 메세지의 내용을 알아 내는 게 어렵긴 하지만, 현실적인 시간 내에 불가"
 "능하지는 않습니다."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "암호화됨"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11932,11 +12512,11 @@ msgstr ""
 "메세지가 암호화되어 있습니다.  다른 사람이 이 메세지의 내용을 알아 내기는 어"
 "렵습니다."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "암호화됨, 강력"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:963
 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 "
@@ -11945,94 +12525,89 @@ msgstr ""
 "메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
 "적인 시간 내에 다른 사람이 이 메세지의 내용을 알아 내는 건 매우 어렵습니다."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1079
 msgid "This certificate is not viewable"
 msgstr "이 인증서는 볼 수 없습니다"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "마침: %Y년 %B %e일, %p %l:%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "마감 지남:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y년 %B %e일, %p %l:%M까지"
 
 # FIXME - inline의 나은 번역을 찾아보자
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1461
 msgid "_View Inline"
 msgstr "인라인으로 보기(_V)"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1462
 msgid "_Hide"
 msgstr "숨기기(_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1463
 msgid "_Fit to Width"
 msgstr "너비에 맞추기(_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1464
 msgid "Show _Original Size"
 msgstr "원래 크기로 표시(_O)"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "첨부"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1984
 msgid "Save attachment as"
 msgstr "다른 이름으로 첨부 문서 저장"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
 msgstr "모든 첨부를 저장할 폴더 선택..."
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
 msgstr "선택한 것 저장(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2106
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d개 첨부(_T)"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
 msgid "S_ave"
 msgstr "저장(_A)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2124
 msgid "S_ave All"
 msgstr "모두 저장(_A)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2198
 msgid "No Attachment"
 msgstr "첨부 없음"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "원본 보기(_U)"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2341
 msgid "Hide _Unformatted"
 msgstr "원본 감추기(_U)"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2396
 msgid "O_pen With"
 msgstr "다른 프로그램으로 열기(_P)"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2467
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "전자메일 크기가 처리하기에 너무 커서 에볼루션에서 표시하지 못했습니다. 원본 "
@@ -12043,276 +12618,291 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "%2$d페이지 중 %1$d페이지"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' 가져오는 중"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "외부 본문 부분이 없습니다."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "외부 본문 부분의 형식이 잘못되었습니다."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 사이트(%s)를 가리킵니다"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "로컬 파일(%s)을 가리킵니다"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "원격 데이터(%s)을 가리킵니다"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
-msgstr "메세지를 포맷하는 중입니다"
+msgstr "메세지 내용을 표시하는 중입니다"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
-msgstr "메세지를 포맷하는 중입니다..."
+msgstr "메세지 내용을 표시하는 중입니다..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "참조"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "숨은 참조"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "메일 프로그램"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "날짜"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "뉴스그룹"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "이 메세지는 <b>%s</b>이(가) <b>%s</b> 자격으로 보냈습니다."
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "보낸 사람"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "회신 주소"
 
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "날짜"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "뉴스그룹"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s 첨부"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME 메세지를 분석할 수 없습니다"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "지원하지 않는 서명 형식입니다"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "서명을 확인하는 중 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message"
 msgstr "PGP 메세지를 분석할 수 없습니다."
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "항상"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "매일"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "매주"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "매달"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "사용자 정의 정크 메일 헤더 추가"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "헤더 이름:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "헤더 값에 포함:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "값 포함"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "색"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "태그"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s 플러그인을 사용할 수 있고 프로그램 바이너리가 설치되어 있습니다."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s 플러그인을 사용할 수 없습니다. 패키지를 설치했는지 확인하십시오."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "정크 메일 플러그인을 사용할 수 없습니다"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "할 일"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "나중에"
 
-#: ../mail/em-migrate.c:1211
-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 ""
-"에볼루션 메일함 폴더의 위치와 구조가 에볼루션 1.x와 다르게 바뀌었습니다.\n"
-"\n"
-"폴더를 옮기는 동안 잠시 기다리십시오..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "'%s' 옮기는 중:"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "`%s' 폴더를 새로 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "`%s' 폴더를 `%s' 폴더로 복사할 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s'에 있는 메일함을 읽을 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1868
+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 ""
+"에볼루션 메일함 폴더의 위치와 구조가 에볼루션 1.x와 다르게 바뀌었습니다.\n"
+"\n"
+"폴더를 옮기는 동안 잠시 기다리십시오..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "과거의 POP keep-on-server 데이터 `%s'을(를) 열 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "POP keep-on-server 데이터 디렉토리 `%s' 디렉토리를 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server 데이터 `%s'을(를) 복사할 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "`%s' 로컬 메일 저장고를 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"에볼루션 메일함 폴더의 형식이 에볼루션 버전 2.24 이후 sqlite로 바뀌었습니"
+"다.\n"
+"\n"
+"폴더를 옮기는 동안 잠시 기다리십시오..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s'에 로컬 메일 폴더를 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12320,64 +12910,67 @@ msgstr ""
 "이전에 설치한 에볼루션에서 설정을 잃어들일 수 없습니다. `evolution/config."
 "xmldb'가 없거나 망가졌습니다."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "보낸 이에게 회신(_R)"
 
 # List는 메일링 리스트를 말함.
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "리스트에 회신(_L)"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "주소록에 추가(_A)"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "이 저장고는 가입을 지원하지 않거나, 가입할 수 있도록 설정하지 않았습니다."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "구독"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "폴더"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "서버를 선택하십시오."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "서버를 선택하지 않았습니다"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "이 메세지를 다시 보지 않기(_D)."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "메세지 필터"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "메세지"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "메세지 저장..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "주소 추가"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "%s에서 온 메일"
@@ -12391,55 +12984,67 @@ msgid "Search Folder source"
 msgstr "폴더 소스 찾기"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"메일 보내고 받기\" 창 높이"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"메일 보내고 받기\" 최대화 상태"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"메일 보내고 받기\" 창 너비"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "에볼루션에서 최대 크기만큼의 텍스트 일부분만 표시하도록 합니다"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "항상 내용 읽음 확인 요청"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "오류를 상태 표시줄에 표시할 시간, 초 단위."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "이모티콘 자동 인식"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "링크 자동 인식"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "정크메일 검사"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "인용문 강조 색"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "인용문 강조 색."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "메세지 작성 창 기본 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "메세지 작성 창 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "메세지 작성 읽어들이기/첨부 디렉토리"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "받는 사람/참조/숨은 참조의 주소를 간략하게 표시"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12447,63 +13052,81 @@ msgstr ""
 "받는 사람/참조/숨은 참조의 주소를 address_count에 지정한 개수만큼 간략하게 표"
 "시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Custom headers to use while checking for junk."
+msgstr "정크 메일을 검사할 때 사용할 사용자 지정 헤더."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"정크 메일을 검사할 때 사용할 사용자 지정 헤더. 목록의 각 항목은 \"헤더이름=값"
+"\" 형식의 문자열입니다."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default charset in which to compose messages"
 msgstr "메세지를 작성할 기본 문자셋"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages."
 msgstr "메세지를 작성할 기본 문자셋."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to display messages"
 msgstr "메세지를 표시할 기본 문자셋"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages."
 msgstr "메세지를 표시할 기본 문자셋."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default forward style"
 msgstr "기본 전달 모양새"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default height of the Composer Window."
 msgstr "메세지 작성 창의 기본 높이."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the message window."
 msgstr "메세지 창의 기본 높이."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the subscribe dialog."
 msgstr "구독 대화 상자의 기본 높이."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default reply style"
 msgstr "기본 회신 모양새"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default value for thread expand state"
 msgstr "글타래 확장 상태에 대한 기본값"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default width of the Composer Window."
 msgstr "메세지 작성 창의 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the message window."
 msgstr "메세지 창의 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the subscribe dialog."
 msgstr "구독 대화 상자의 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr "정크메일 필터링할 때 로컬 주소록에서만 주소를 찾아 볼 지 결정합니다"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "주소록에서 보낸 사람 전자메일을 찾아볼 지 결정합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12514,11 +13137,11 @@ msgstr ""
 "팸 메일이 아니라고 판단합니다. 자동 완성 용도로도 주소록을 찾아 봅니다. LDAP"
 "와 같은 원격 주소록을 자동 완성에 사용할 경우 느릴 수도 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "정크 메일 검사에 사용자 지정 헤더를 사용할 지 결정합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12527,7 +13150,7 @@ msgstr ""
 "정크 메일 검사에 사용자 지정 헤더를 사용할 지 결정합니다. 이 옵션을 사용하고 "
 "헤더를 지정하면 정크 메일 검사 기능의 속도를 높일 수 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12535,55 +13158,59 @@ msgstr ""
 "세로 보기의 \"메세지\" 열에서 \"보낸 사람\" 및 \"제목\" 줄에 같은 글꼴을 사용"
 "할 지 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Directory for loading/attaching files to composer."
 msgstr "메세지 작성에 파일을 읽어들이고 첨부할 때 사용할 디렉토리."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for saving mail component files."
 msgstr "메일 관련 파일을 저장할 디렉토리."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr "폴더 보기에서 폴더 이름 줄여 쓰기 사용을 막을 지 여부"
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
 msgstr "타이프할 때 맞춤법이 틀린 단어에 표시해 줍니다."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Empty Junk folders on exit"
 msgstr "끝날 때 정크메일 폴더를 비웁니다"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Trash folders on exit"
 msgstr "끝날 때 휴지통 폴더를 비웁니다"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "에볼루션이 끝날 때 모든 정크 메일 폴더를 비웁니다."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "에볼루션이 끝날 때 모든 휴지통 폴더를 비웁니다."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "캐릿 모드를 켭니다, 이 모드에서는 메일을 읽을 때 커서가 보입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable or disable magic space bar"
 msgstr "만능 스페이스바 사용 여부"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable type ahead search feature"
 msgstr "텍스트 입력 미리 찾기 기능 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable search folders"
 msgstr "찾기 폴더 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders on startup."
 msgstr "시작할 때 찾기 폴더 사용."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12593,7 +13220,7 @@ msgstr ""
 "보조 모음의 찾기 기능을 사용해 텍스트를 입력해서 찾기를 시작할 수 있습니다. "
 "폴더의 이름을 입력하면 보조 모음에 있는 해당 폴더로 바로 이동합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12601,33 +13228,33 @@ msgstr ""
 "이 기능을 사용하면 스페이스바 키를 이용해 메세지 미리 보기, 메세지 목록, 폴더"
 "를 스크롤합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable to render message text part of limited size."
 msgstr "제한된 크기만큼의 일부 텍스트를 표시하도록 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable/disable caret mode"
 msgstr "캐릿 모드 켜기/끄기"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Height of the message-list pane"
 msgstr "메세지 목록 창의 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane."
 msgstr "메세지 목록 창의 높이."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "폴더별 미리 보기를 감추고 선택을 없앱니다"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "사용자가 10개 이상의 메세지를 한번에 열면, 정말로 열 지 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12635,7 +13262,7 @@ msgstr ""
 "\"미리 보기\" 창이 켜져 있는 경우, 창을 위아래가 아니라 옆으로 나란히 표시합"
 "니다."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
 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 "
@@ -12645,11 +13272,39 @@ msgstr ""
 "서 보노보 컴포넌트 뷰어로 매핑되는 (그놈의 MIME타입 데이터베이스에서) 뷰어가 "
 "내용을 표시하는 데 사용됩니다."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"\"메일 보내고 받기\" 창의 최초 높이. 사용자가 세로 방향으로 창 크기를 바꾸면 "
+"이 값이 바뀝니다."
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"\"메일 보내고 받기\" 창의 최초 최대화 상태. 사용자가 이 창을 최대화하거나 취"
+"소할 때마다 이 값이 바뀝니다. \"메일 보내고 받기\" 창은 최대화할 수 없기 때문"
+"에 이 값은 실제로는 사용하지 않습니다. 이 키는 내부적 용도로만 사용합니다."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"\"메일 보내고 받기\" 창의 최초 너비. 사용자가 가로 방향으로 창 크기를 바꾸면 "
+"이 값이 바뀝니다."
+
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "여러 개의 메세지에 표시할 때 확인 질문을 할 지 여부를 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12657,7 +13312,7 @@ msgstr ""
 "오프라인 모드로 들어갈 때 오프라인 동기화가 필요한 지 여부를 반복해서 묻는 질"
 "문 기능을 끄고 켭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12666,31 +13321,31 @@ msgstr ""
 "찾기 결과에서 지우는 게 아니라, 찾기 폴더에서 메세지를 지울 경우 메세지를 영"
 "구히 지운다고 반복해서 경고하는 기능을 끄고 켭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Last time empty junk was run"
 msgstr "마지막으로 정크 메일을 비운 시각"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty trash was run"
 msgstr "마지막으로 휴지통을 비운 시각"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Level beyond which the message should be logged."
 msgstr "어떤 메세지를 기록할 지 단계."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "List of Labels and their associated colors"
 msgstr "레이블 및 레이블 색의 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of accepted licenses"
 msgstr "승인한 약관의 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accounts"
 msgstr "계정 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12698,11 +13353,15 @@ msgstr ""
 "에볼루션의 메일 컴포넌트에 사용할 계정 목록입니다. 이 목록에는 /apps/"
 "evolution/mail/accounts에 상대적인 서브디렉토리의 이름이 들어 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of custom headers and whether they are enabled."
 msgstr "사용자 지정 헤더와 그 헤더를 사용할 지 여부의 목록."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr "맞춤법 검사에 사용할 사전의 언어 코드 목록."
+
+#: ../mail/evolution-mail.schemas.in.h:76
 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."
@@ -12710,19 +13369,19 @@ msgstr ""
 "에볼루션의 메일 컴포넌트에 사용할 레이블 목록입니다. 이 목록에는 <이름>:<색> "
 "형식의 문자열이 들어 있습니다. 색은 HTML 방식 16진수 인코딩을 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "보노보 컴포넌트 뷰어가 있는 지 검사할 MIME 타입 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of protocol names whose license has been accepted."
 msgstr "약관에 동의한 프로토콜 이름의 목록."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Load images for HTML messages over http"
 msgstr "http로 HTML 메세지의 그림을 읽어들입니다"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net. 1 - Load images in messages from contacts. 2 - "
@@ -12732,242 +13391,239 @@ msgstr ""
 "서 그림을 하나도 읽어들이지 않습니다. 1 - 보낸 사람이 주소록에 들어 있으면 그"
 "림을 읽어들입니다. 2 - 항상 네트워크에서 그림을 읽어들입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Log filter actions"
 msgstr "필터 동작 기록"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions to the specified log file."
 msgstr "지정한 로그 파일에 대한 필터 동작을 기록합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Logfile to log filter actions"
 msgstr "필터 동작을 기록할 로그 파일"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions."
 msgstr "필터 동작을 기록할 로그 파일입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Mark as Seen after specified timeout"
 msgstr "일정 시간이 지나면 읽은 것으로 표시하기"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout."
 msgstr "일정 시간이 지나면 읽은 것으로 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark citations in the message \"Preview\""
 msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시하기"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\"."
 msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Message Window default height"
 msgstr "메세지 창 기본 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default width"
 msgstr "메세지 창 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "메세지-표시 모양새 (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Minimum days between emptying the junk on exit"
 msgstr "끝날 때 정크 메일을 비울 최소 날짜 간격"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the trash on exit"
 msgstr "끝날 때 휴지통을 비울 최소 날짜 간격"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "받는 사람/참조/숨은 참조에 표시할 주소의 길이"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt on empty subject"
 msgstr "제목이 없으면 물어보기"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "사용자가 폴더의 지운 메세지를 비우려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "제목 없는 메세지를 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "사용자에게 즉시 오프라인으로 할 지를 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt when deleting messages in search folder"
 msgstr "찾기 폴더에서 메세지를 지울 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when user expunges"
 msgstr "사용자가 지운 메세지를 비우려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user only fills Bcc"
 msgstr "Bcc만 사용했을 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10개 이상의 메세지를 열려고 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "HTML 메세지를 원하지 않는 사람한테 HTML 메일을 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "To나 Cc로 받는 사람이 없는 상태로 메세지를 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "원하지 않는 HTML을 보내려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt while marking multiple messages"
 msgstr "여러 개 메세지에 표시하려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "텍스트 스마일리를 인식하고 그림으로 바꿉니다."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize links in text and replace them."
 msgstr "텍스트에 들어 있는 링크를 인식하고 바꿉니다."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Run junk test on incoming mail."
 msgstr "받은 메일에 대해 정크메일 검사를 실행합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Save directory"
 msgstr "저장 디렉토리"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Search for the sender photo in local addressbooks"
 msgstr "로컬 주소록에서 보낸 사람의 사진을 찾습니다"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Send HTML mail by default"
 msgstr "기본으로 HTML 메일 보내기"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default."
 msgstr "기본으로 HTML 메일을 보냅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "메세지 목록의 보낸 사람 전자메일 주소 열"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Show Animations"
 msgstr "애니메이션 보기"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Show animated images as animations."
 msgstr "애니메이션이 들어 있는 그림을 애니메이션으로 봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "메세지 목록에 지워진 메세지를 표시합니다 (취소선을 긋습니다)."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show deleted messages in the message-list"
 msgstr "메세지 목록에 지워진 메세지를 표시합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show photo of the sender"
 msgstr "보낸 사람의 사진을 보여줍니다"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "메세지 목록의 별도 열에 보낸 사람의 전자메일을 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "메세지 읽기 창에서 보낸 사람의 사진을 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "정크 메일을 검사할 헤더를 지정합니다."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"정크 메일을 검사할 헤더를 지정합니다. gconf에서 헤더이름=값 형식입니다."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Spell check inline"
 msgstr "인라인 맞춤법 검사"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Spell checking color"
+msgstr "맞춤법 검사 색"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell checking languages"
+msgstr "맞춤법 검사 언어"
+
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Subscribe dialog default height"
 msgstr "구독 대화 상자 기본 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Subscribe dialog default width"
 msgstr "구독 대화 상자 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Terminal font"
 msgstr "터미널 글꼴"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Text message part limit"
 msgstr "텍스트 메세지 최대 크기"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "The default plugin for Junk hook"
 msgstr "정크 메일 후크에 대한 기본 플러그인"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "마지막으로 정크 메일을 비운 시각, 1970년 1월 1일부터 지난 날 수."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "마지막으로 휴지통을 비운 시각, 1970년 1월 1일부터 지난 날 수."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The terminal font for mail display."
 msgstr "메일을 표시할 때 사용할 터미널 글꼴."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The variable width font for mail display."
 msgstr "메일을 표시할 때 사용할 가변폭 글꼴."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "세 가지 값이 가능합니다. 0은 오류, 1은 경고, 2는 디버깅 메세지."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12975,7 +13631,7 @@ msgstr ""
 "에볼루션에서 표시할 수 있는 텍스트의 최대 크기를 지정합니다. 기본값은 4MB / "
 "4096 KB이고 단위는 KB입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12985,7 +13641,7 @@ msgstr ""
 "다. 기본 목록 플러그인을 사용하지 않는 경우, 사용 가능한 다른 플러그인을 대"
 "신 사용하지 않습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This key is read only once and reset to false after read. This unselects the "
 "mail in the list and removes the preview for that folder."
@@ -12993,7 +13649,7 @@ msgstr ""
 "이 키는 한 번만 읽고 읽은 다음에 거짓으로 다시 설정됩니다. 목록의 메일의 선택"
 "을 지우고 그 폴더에 대한 미리 보기를 없앱니다."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 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;"
@@ -13004,11 +13660,20 @@ msgstr ""
 "리스트가 들어 있습니다. XML 구조의 형식은 &lt;header enabled&gt;입니다 - 헤더"
 "를 메일 보기에서 표시하면 enabled로 설정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"이 옵션은 lookup_addressbook 키와 관련 있습니다. 이 옵션에 따라 로컬 주소록에"
+"서 주소를 찾아 보고, 알려진 사람이 보낸 메일을 정크메일 필터에서 제외합니다."
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "This option would help in improving the speed of fetching."
 msgstr "이 옵션으로 가져오기 속도를 높일 수 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13016,7 +13681,7 @@ msgstr ""
 "기본 메세지 목록 보기에서 표시할 주소의 길이를 지정합니다. 길이를 넘어가면 "
 "'...'으로 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13024,7 +13689,7 @@ msgstr ""
 "이 설정은 기본값으로 글타래를 확장 상태로 할 지 축소 상태로 할 지 지정합니"
 "다. 에볼루션을 다시 시작해야 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13033,107 +13698,127 @@ msgstr ""
 "이 설정은 해당 글타래의 최근 메세지를 기준으로 글타래를 정렬할 지 여부를 지정"
 "합니다. 에볼루션을 다시 시작해야 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Thread the message list."
 msgstr "연관된 메세지를 글타래로 만듭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Thread the message-list"
 msgstr "연관된 메세지를 글타래로"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message-list based on Subject"
 msgstr "제목에 따라 메세지 목록을 글타래 표시합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Time interval, in seconds, how often upload store changes to server."
+msgstr "서버에 바뀐 사항을 얼마나 자주 업로드할 지 시간 간격 (초 단위)."
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Time interval, in seconds, how often upload store changes to server. The "
+"actual value cannot be less than 30 seconds."
+msgstr ""
+"서버에 바뀐 사항을 얼마나 자주 업로드할 지 시간 간격 (초 단위). 이 값은 30초"
+"보다 작으면 안 됩니다."
+
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "메세지를 읽은 것으로 표시하는 경과 시간"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "메세지를 읽은 것으로 표시하는 경과 시간."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "기본 계정의 UID 문자열."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "인라인 맞춤법 검사를 사용할 때 맞춤법이 틀린 단어에 밑줄 그을 색."
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "스팸어새신 데몬 및 클라이언트 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "스팸어새신 데몬 및 클라이언트를 (spamc/spamd) 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "사용자 설정 글꼴 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "메일을 표시할 때 사용자 지정 글꼴을 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "로컬 스팸 테스트만 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "로컬 스팸 테스트만 사용합니다 (DNS는 사용하지 않습니다)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "나란히 혹은 옆으로 길게 배치"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "가변폭 글꼴"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "보기/숨은 참조 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "보기/숨은_참조 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "보기/참조 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "보기/참조 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "보기/보낸 사람 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "보기/보낸 사람 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "보기/게시_위치 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "보기/게시_위치 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "보기/회신_주소 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "보기/회신_주소 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "기본값으로 내용 읽음 확인 요청을 모든 메세지에 더할 지 여부."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr "폴더 보기에서 폴더 이름 줄여 쓰기 사용을 막을 지 여부."
+
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13141,43 +13826,43 @@ msgstr ""
 "메세지에 In-Reply-To 혹은 References 헤더가 없을 경우에 대신에 제목으로 글타"
 "래 표시를 할 것인지 여부."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "해당 글타래의 최근 메세지를 기준으로 글타래를 정렬할 지 여부"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "메세지 목록 창의 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "메세지 목록 창의 너비."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "ELM 데이터 가져오기"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
-msgstr "에볼루션 ELM 가져오기 프로그램"
+msgstr "에볼루션 ELM 가져오기"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "ELM에서 메일을 가져옵니다."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "대상 폴더:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "어느 폴더로 가져올 지 선택하십시오"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "버클리 메일박스 (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "버클리 메일박스 형식 폴더 가져오기"
 
@@ -13185,7 +13870,7 @@ msgstr "버클리 메일박스 형식 폴더 가져오기"
 msgid "Importing mailbox"
 msgstr "메일함 가져오기"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "%s 가져오는 중입니다"
@@ -13195,15 +13880,15 @@ msgstr "%s 가져오는 중입니다"
 msgid "Scanning %s"
 msgstr "%s 검색하는 중입니다"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "PINE 데이터 가져오기"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
-msgstr "에볼루션 PINE 가져오기 프로그램"
+msgstr "에볼루션 PINE 가져오기"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "PINE에서 메일을 가져옵니다."
 
@@ -13231,131 +13916,144 @@ msgstr "%s 메일링 리스트"
 msgid "Add Filter Rule"
 msgstr "필터 규칙 추가"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "서식"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d개 선택, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d개 지움"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d개 정크"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d개 임시"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d개 보냄"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d개 안 보냄"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d개 안 읽음, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "전체 %d개"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "새 메일 메세지"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "메일 만들기(_M)"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "메일 메세지를 새로 작성합니다"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "새 메일 폴더"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "메일 설정 혹은 폴더를 업그레이드하는 데 실패했습니다."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "오류"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "오류"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "경고 및 오류"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "디버깅"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "오류, 경고 및 디버깅 메세지"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "디버깅 기록"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "상태 표시줄에서 오류 표시 시간(_E):"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1743
+msgid "second(s)."
 msgstr "초."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "기록 메세지:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "기록 단계"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "시간"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "메세지"
 
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "이 창을 닫습니다"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "지원하는 방법인지 확인(_E) "
@@ -13369,7 +14067,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>이 에볼루션 빌드는 SSL을 지원하지 않습니다</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>보내는 사람 사진</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13450,74 +14148,74 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">인쇄 글꼴</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">프록시 설정</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">필수 정보</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">보안 MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">보안</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">보낸 편지함 및 임시 보관함</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">서버 설정</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">인증 방법(_A)</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "계정 관리"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "새 서명 추가(_W)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "스크립트 추가(_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "이 계정으로 보내는 메세지는 항상 서명(_W)"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "암호화한 메일을 보낼 때 자신에 대해서도 암호화(_F)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "항상 참조(CC) (_S):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "항상 숨은 참조(BCC) (_B):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "암호화할 때 내 키 모음에 들어 있는 키는 언제나 신뢰(_T)"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "암호화한 메일을 보낼 때 자신에 대해서 언제나 암호화(_M)"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "항상 내용 읽음 확인 요청(_D)"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "원문 첨부"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "자동으로 이모티콘 그림 넣기(_E)"
@@ -13535,13 +14233,13 @@ msgid "C_haracter set:"
 msgstr "문자셋(_H):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "정크 메일 검사에 사용자 지정 헤더 검사(_H)"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "지원하는 형식인지 확인(_E) "
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "정크 메일 검사에 사용자 지정 헤더 검사(_S)"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "받은 메일이 정크 메일인지 검사(_M)"
@@ -13602,17 +14300,19 @@ msgstr "끝날 때 정크 메일 지우기(_X)"
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "보내는 메세지에 (기본값으로) 디지털 서명(_U)"
 
+# FIXME - hard to translate UI + string based on English grammar
+# "Do not format messages when text size exceeds" ____ "KB"
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "보낸 사람이 주소록에 들어 있으면 정크메일로 표시하지 않기(_N)"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "메세지의 크기가 다음을 넘어가면 내용 표시하지 않기(_Z): "
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "메세지의 텍스트 크기가 다음을 넘어가면 내용 표시하지 않기(_Z): "
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr "보낸 사람이 주소록에 들어 있으면 정크메일로 표시하지 않기(_K)"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "원문 인용하지 않음"
+msgid "Do not quote"
+msgstr "인용하지 않기"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13675,69 +14375,85 @@ msgid "HTML Messages"
 msgstr "HTML 메세지"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "HTTP 프록시(_T):"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "헤더"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "인용문은 다음 색깔로 표시(_Q):"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "인라인"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "인라인 원본 메세지 (Outlook 형식)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "인라인 (Outlook 방식)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "레이블"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "언어 표"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "메일 설정"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "메일 헤더 표"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "메일함 위치"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "메세지 작성"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "프록시 없는 호스트(_P):"
+
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "주의: 레이블의 밑줄은 메뉴의 단축키를 지정하는 데 사용합니다."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "알림: 처음 연결하면 암호를 물어보는 창이 뜰 것입니다"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "사용자 지정 정크 메일 헤더가 있으면 이 옵션은 무시합니다."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "조직(_G):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 키 ID(_K):"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "암호(_W):"
+
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13745,7 +14461,7 @@ msgstr ""
 "아래 공백에 이 계정에 대해 설명하는 이름을 입력하십시오.\n"
 "이 이름은 표시하는 목적으로만 사용합니다."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13753,122 +14469,130 @@ msgstr ""
 "메일을 보낼 방법에 대해 정보를 입력하십시오. 잘 모르겠으면, 시스템 관리자나 "
 "인터넷 서비스 제공자에게 물어 보십시오."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 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.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "다음 옵션 중에 하나를 선택하십시오"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "포트:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "숨은 참조로만 메세지를 보낼 때 확인 질문(_O)"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "원문 인용"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "인용"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "암호 기억(_M)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "회신 주소(_P):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "암호 기억(_P)"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "SOCKS 호스트(_O):"
+
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "로컬 주소록에서만 보낸 사람의 사진 찾기(_E)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "선택(_E)..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "메세지 수신 확인 보내기(_E):"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "일반 글꼴(_T):"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "HTML 고정폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "인쇄에 사용할 HTML 고정폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML 가변폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "인쇄에 사용할 HTML 가변폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "메일 보내기"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "보낸 편지함 폴더(_M):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "서버에 인증이 필요(_V)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "서버 종류(_T): "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "서명 인증서(_N):"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "서명(_U):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "서명"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "서명 표"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "맞춤법 검사"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "답장할 때 맨 아래부터 입력 시작(_T)"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "방법(_Y): "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "이 언어 목록은 사전을 설치한 언어만 들어 있습니다."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13877,12 +14601,7 @@ msgstr ""
 "다음 스크립트의 출력을 서명으로 사용합니다. \"이름\"은 표시 목적으로만 이용합"
 "니다."
 
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr "사용자 지정 정크 메일 헤더가 있으면 이 옵션보다 우선합니다."
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13890,16 +14609,24 @@ msgstr ""
 "이 계정에 쓸 이름을 입력하십시오.\n"
 "예: \"작업용\" 또는 \"개인용\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "사용자이름(_E):"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "인증 사용(_N)"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "사용자이름(_N):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "가변폭(_A):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13909,102 +14636,129 @@ msgstr ""
 "\n"
 "시작하려면 \"앞으로\"를 누르십시오. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "서명 추가(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "항상 인터넷에서 그림 읽어들이기(_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "자동 프록시 설정 URL(_A):"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "기본 정크 메일 플러그인(_D):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "인터넷에 직접 연결(_D)"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "모임 요청에 서명하지 않기 (Outlook 호환)(_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "전달 모양(_F):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "답장을 쓸 때 원문 위에 서명 놓기(_K)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "주소록에 있는 사람이 보낸 메일의 그림 읽어들이기(_L)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local addressbook only"
+msgstr "로컬 주소록만 찾아 보기(_L)"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "내 기본 계정으로 하기(_M)"
 
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "수동 프록시 설정(_M):"
+
 # FIXME - hard to translate UI + string based on English grammar
 # "Mark messages as read after <seconds> seconds"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "다음 시간이 지나면 읽은 것으로 표시(_M):"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "그림을 인터넷에서 읽어들이지 않기(_N)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "경로(_P):"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "HTML을 받고 싶지 않은 사람한테 보낼 때 확인 질문(_P)"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "HTML 메일을 받고 싶지 않은 사람한테 보낼 때 확인 질문(_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "제목이 없이 메세지를 보낼 때 확인 질문(_P)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "회신 모양(_R):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "스크립트(_S):"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "보안 HTTP 프록시(_S):"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "선택(_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "그림 애니메이션 보기(_S)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "메일 미리 보기에서 보낸 사람의 사진 보기(_S)"
 
-#: ../mail/mail-config.glade.h:176
+# FIXME - hard to translate UI + string based on English grammar
+# "Shrink To / Cc / Bcc headers to ____ addresses"
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "받는 사람 / 참조 / 숨은 참조 헤더 줄이기(_S): "
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "보안 연결 사용(_U):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "시스템 기본값 사용(_U)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "다른 프로그램과 같은 글꼴 사용(_U)"
 
-#: ../mail/mail-config.glade.h:179
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "개 주소"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "색상"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "설명"
 
@@ -14044,43 +14798,43 @@ msgstr "대소문자 구별(_S)"
 msgid "Co_mpleted"
 msgstr "완료됨(_M)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "찾기(_I):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "메세지에서 찾음"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "추가 작업 메세지 플래그"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "폴더 구독"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "사용권 약관"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "선택하지 않았습니다"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "서버(_E):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "보안 정보"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "지정한 폴더"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14088,24 +14842,24 @@ msgstr ""
 "다음은 추가 작업 플래그를 표시하려고 선택한 메세지입니다.\n"
 "\"플래그\" 메뉴에서 추가 작업 동작을 선택하십시오."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "사용권 동의(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "마감(_D):"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "표시(_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "사용권 약관에 동의하시면 여기에 체크하십시오(_T)"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" 연결을 확인하는 중"
@@ -14156,11 +14910,11 @@ msgstr "%2$d개 중에서 %1$d번째 메세지를 보내는 중"
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d개 메세지 중에서 %1$d번째를 보내는 데 실패했습니다"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "취소함."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "완료."
 
@@ -14185,82 +14939,89 @@ msgstr "메시지들을 %s(으)로 복사하는 중"
 msgid "Forwarded messages"
 msgstr "전달한 메시지"
 
+# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../mail/mail-ops.c:1205
 #, c-format
 msgid "Opening folder %s"
-msgstr "%s 폴더를 열기"
+msgstr "%s 폴더를 여는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../mail/mail-ops.c:1270
 #, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "%s 폴더의 용량 제한 정보를 가져오는 중"
+
+# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1339
+#, c-format
 msgid "Opening store %s"
 msgstr "저장고 %s을(를) 여는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s 폴더를 지우는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s 폴더를 저장하는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "계정 '%s'의 지운 메세지를 비우고 내용을 저장하는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s 계정을 저장하는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "폴더 다시 읽는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "지운 메세지를 비우는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' 안의 휴지통을 비우는 중"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "로컬 폴더"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "메세지 %s을(를) 가져오는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "메세지 %d개를 가져오는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "메세지 %d개를 저장하는 중"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14270,11 +15031,11 @@ msgstr ""
 " %s"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14283,55 +15044,55 @@ msgstr ""
 "출력 파일을 만들 수 없음: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
-msgstr "데이터를 쓸 수가 없습니다: %s"
+msgstr "데이터를 쓸 수 없습니다: %s"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s에서 연결 끊는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' 오프라인 계정을 준비 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "서비스 확인중"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "취소하는 중..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
-msgstr "메일 주고받기"
+msgstr "메일 보내고 받기"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "모두 취소(_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "업데이트 중..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "새 메일 확인"
@@ -14359,17 +15120,17 @@ msgstr "암호 입력"
 msgid "User canceled operation."
 msgstr "사용자가 취소한 동작."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "서명 편집"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "저장 후 닫기(_S)"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "이 서명의 이름을 입력하십시오."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "서명 편집"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "이름:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "서명 이름(_S):"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14410,55 +15171,47 @@ msgstr "'%s:%s'에 대한 찾기 폴더를 업데이트하는 중입니다"
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s에 대한 찾기 폴더를 업데이트하는 중입니다"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "찾기 폴더 편집"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "새 찾기 폴더"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr ""
-"&quot;{0}&quot;(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시"
-"오."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "\"{0}\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr ""
-"&quot;{1}&quot;(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시"
-"오."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "\"{1}\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"&quot;{1}&quot;에 비어 있지 않은 폴더가 있습니다.\n"
+"\"{1}\"에 비어 있지 않은 폴더가 있습니다.\n"
 "\n"
 "이 폴더를 무시할 수도 있고, 덮어 쓰거나, 그 내용 뒤에 덧붙이거나, 끝낼 수 있"
 "습니다."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
-"&quot;{1}&quot;에 대해 내용 읽음 확인을 요청받았습니다.  {0}에게 내용 읽음 확"
-"인을 보내시겠습니까?"
+"\"{1}\"에 대해 내용 읽음 확인을 요청받았습니다.  {0}에게 내용 읽음 확인을 보"
+"내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr ""
-"&quot;{1}&quot;(이)라는 이름의 서명이 이미 있습니다. 다른 이름을 사용하십시"
-"오."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "\"{1}\"(이)라는 이름의 서명이 이미 있습니다. 다른 이름을 사용하십시오."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14494,8 +15247,8 @@ msgstr "모든 폴더의 지워진 메세지를 완전히 지우시겠습니까?
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "정말로 &quot;{0}&quot; 폴더의 지운 메세지를 완전히 비우시겠습니까?"
+"folder \"{0}\"?"
+msgstr "\"{0}\" 폴더의 모든 지워진 메세지를 완전히 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14510,99 +15263,102 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "정말로 제목 없는 메세지를 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 때문입니다."
+msgid "Because \"{0}\"."
+msgstr "\"{0}\" 때문입니다."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; 때문입니다."
+msgid "Because \"{2}\"."
+msgstr "\"{2}\" 때문입니다."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "서명 없음"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 찾기 폴더를 더할 수 없습니다."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "\"{0}\" 찾기 폴더를 더할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; 폴더를 &quot;{1}&quot;에 복사할 수 없습니다."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" 폴더를 \"{1}\"에 복사할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 폴더를 만들 수 없습니다."
+msgid "Cannot create folder \"{0}\"."
+msgstr "\"{0}\" 폴더를 만들 수 없습니다."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
-msgstr "임시 저장 디렉토리를 만들 수가 없습니다."
+msgstr "임시 저장 디렉토리를 만들 수 없습니다."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "&quot;{1}&quot; 때문에 디렉토리를 저장할 수 없습니다."
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "\"{1}\" 때문에 디렉토리를 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 폴더를 지울 수 없습니다."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "\"{0}\" 폴더를 지울 수 없습니다."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 시스템 폴더를 지울 수 없습니다."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "\"{0}\" 시스템 폴더를 지울 수 없습니다."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "&quot;{0}&quot; 찾기 폴더를 편집할 수 없습니다: 폴더가 없습니다."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "\"{0}\" 찾기 폴더를 편집할 수 없습니다: 폴더가 없습니다."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; 폴더를 &quot;{1}&quot;에 옮기지 못했습니다."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" 폴더를 \"{1}\"에 옮기지 못했습니다."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "&quot;{1}&quot; 소스를 열 수 없습니다"
+msgid "Cannot open source \"{1}\""
+msgstr "\"{1}\" 소스를 열 수 없습니다"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; 소스를 열 수 없습니다."
+msgid "Cannot open source \"{2}\"."
+msgstr "\"{2}\" 소스를 열 수 없습니다."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; 대상을 열 수 없습니다."
+msgid "Cannot open target \"{2}\"."
+msgstr "\"{2}\" 대상을 열 수 없습니다."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
-"&quot;{0}&quot; 라이선스 파일을 읽을 수 없습니다, 설치 문제 때문입니다. 이 라"
-"이선스에 동의하기 전에는 이 제공자를 사용할 수 없습니다."
+"\"{0}\" 라이선스 파일을 읽을 수 없습니다, 설치 문제 때문입니다. 이 라이선스"
+"에 동의하기 전에는 이 제공자를 사용할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot;을(를) &quot;{1}&quot;(으)로 이름을 바꾸지 못했습니다."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "\"{0}\"을(를) \"{1}\"(으)로 이름을 바꾸지 못했습니다."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 시스템 폴더의 이름을 바꾸거나 옮길 수 없습니다."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "\"{0}\" 시스템 폴더의 이름을 바꾸거나 옮길 수 없습니다."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "바뀐 사항을 계정에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 디렉토리에 저장할 수 없습니다."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "\"{0}\" 디렉토리에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 파일에 저장할 수 없습니다."
+msgid "Cannot save to file \"{0}\"."
+msgstr "\"{0}\" 파일에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 서명 스크립트를 설정할 수 없습니다."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "\"{0}\" 서명 스크립트를 설정할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "정크메일 검사 실패"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14610,46 +15366,42 @@ msgstr ""
 "암호를 정확히 입력해 주십시오.  보통 암호는 대소문자를 구별합니다. 지금 Caps "
 "Lock이 켜져 있을 수도 있습니다."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "서명 파일을 저장할 수 없습니다."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "&quot;{0}&quot;을(를) 지우시겠습니까?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "계정을 지우시겠습니까?"
+msgid "Delete \"{0}\"?"
+msgstr "\"{0}\"을(를) 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "&quot;{0}&quot; 찾기 폴더 안의 메세지를 지우시겠습니까?"
+msgid "Delete account?"
+msgstr "계정을 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "\"{0}\" 찾기 폴더 안의 메세지를 지우시겠습니까?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "찾기 폴더 안의 메세지를 지우시겠습니까?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "바뀐 내용을 버리시겠습니까?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "지우지 않기(_E)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "지우지 않기"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "해제하지 않기"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "하위 폴더에서도 해당 작업을 수행하시겠습니까?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14749,34 +15501,26 @@ msgid "Mark all messages as read"
 msgstr "모든 메세지를 읽은 것으로 표시합니다"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "이 폴더와 하위 폴더의 모든 메세지를 읽은 것으로 표시하시겠습니까?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "폴더가 빠졌습니다."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "소스를 선택하지 않았습니다."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "현재 폴더에만(_C)"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "여러 개의 메세지를 한꺼번에 열면 시간이 오래 걸릴 수도 있습니다."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "계정 설정을 확인하고 다시 시도해 보십시오."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "계정을 사용하도록 만들거나 다른 계정으로 보내 보십시오."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 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."
@@ -14784,7 +15528,7 @@ msgstr ""
 "\"받는 사람:\" 필드에 올바른 전자메일 주소를 입력하십시오. 입력창 옆의 \"받"
 "는 사람:\" 단추를 누르면 전자메일 주소를 찾을 수 있습니다."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14794,34 +15538,42 @@ msgstr ""
 "오:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "이 서명을 구분할 수 있는 고유한 이름을 입력하십시오."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "잠시 기다리십시오."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "과거의 &quot;{0}&quot; 메일 폴더에서 옮겨오는 데 문제가 발생했습니다."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "과거의 \"{0}\" 메일 폴더에서 옮겨오는 데 문제가 발생했습니다."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "서버에 질의하는 중"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "서버에 지원하는 인증 방식 목록 물어보기."
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "내용 읽음 확인을 요청했습니다."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "정말로 \"{0}\" 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "정크메일 알림 실패"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "정말로 &quot;{0}&quot; 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
+msgid "Report Not Junk Failed"
+msgstr "정크메일 아님 알림 실패"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14874,13 +15626,13 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "다음:\n"
 "{0}\n"
 "찾기 폴더는 다음 지워진 폴더를 사용합니다:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "업데이트했습니다."
 
 #: ../mail/mail.error.xml.h:106
@@ -14888,13 +15640,13 @@ msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "다음:\n"
 "{0}\n"
 "필터 규칙은 다음 지워진 폴더를 사용합니다:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "업데이트했습니다."
 
 #: ../mail/mail.error.xml.h:111
@@ -14907,7 +15659,7 @@ msgid ""
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 "이 폴더는 묵시적으로 더한 폴더일 수도 있습니다.\n"
-"필요하다면, 찾기 폴더 편집 창으로 가서 직접 더하십시오."
+"필요하다면, 찾기 폴더 편집 창으로 가서 직접 추가하십시오."
 
 #: ../mail/mail.error.xml.h:114
 msgid ""
@@ -15004,9 +15756,8 @@ msgstr ""
 "부를 선택할 수 있습니다."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"&quot;{0}&quot; 서버에 &quot;{0}&quot; 사용자로 로그인하는 데 실패했습니다."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "\"{0}\" 서버에 \"{0}\" 사용자로 로그인하는 데 실패했습니다."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15028,78 +15779,91 @@ msgstr "비우기(_E)"
 msgid "_Open Messages"
 msgstr "메세지 열기(_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "현재 폴더와 하위 폴더에(_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "봤음"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "응답함"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "전달함"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "여러개의 보지않은 메세지"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "여러 메세지"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "낮음"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "높음"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "가장 높음"
 
 # ???
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "어제 %p %l:%M "
 
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %e일 %p %l:%M"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y년 %b %e일"
 
-#: ../mail/message-list.c:3849
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "메세지 목록 작성중"
 
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"찾기 기준에 해당하는 메세지가 없습니다. 찾기->비우기 메뉴 항목으로 찾기를 지"
+"우거나 찾기 기준을 바꾸십시오."
+
+#: ../mail/message-list.c:4178
+msgid "There are no messages in this folder."
+msgstr "이 폴더에는 메세지가 없습니다."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "기한"
@@ -15129,39 +15893,39 @@ msgstr "보낸 메세지"
 msgid "Size"
 msgstr "크기"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "호출"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "전달하지 않음"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "추가 작업"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "유용한 정보"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "전달"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "회신이 필요 없음"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "회신"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "전체 회신"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "다시 보기"
 
@@ -15199,33 +15963,22 @@ msgid "Provides core functionality for local address books."
 msgstr "로컬 주소록의 주요 기능을 제공합니다."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "첨부 알림 플러그인 사용"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "첨부 알림 플러그인 사용."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr "첨부 알림 플러그인이 메세지 본문에서 찾아볼 근거 목록"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr "첨부 알림 플러그인이 메세지 본문에서 찾아볼 근거 목록."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "키워드"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "첨부 없음 알리기(_M)"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
@@ -15251,9 +16004,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "메세지에 첨부가 없습니다"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "편집 계속(_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "메세지 편집(_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15267,27 +16020,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "오디오 인라인 플러그인"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "에볼루션 백업 파일 이름 선택"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "백업한 다음에 에볼루션 다시 시작(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "복구할 에볼루션 백업 파일 이름 선택"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "복구한 다음에 에볼루션 다시 시작(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "백업에서 복구"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15297,98 +16050,122 @@ msgstr ""
 "를 복구하실 수 있습니다. \n"
 "모든 개인 설정 사항, 메일 필터 기능 등도 복구합니다."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "백업 백업 파일에서 에볼루션 복구(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "복구할 에볼루션 아카이브를 선택해 주십시오:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "복구할 파일을 선택하십시오"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "에볼루션 디렉토리 백업"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "에볼루션 디렉토리 복구"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "에볼루션 백업 검사"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "에볼루션 다시 시작"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "그래픽 사용자 인터페이스 사용"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "에볼루션을 종료하는 중입니다"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "에볼루션 계정 및 설정을 백업하는 중"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "에볼루션 데이터를 백업하는 중 (메일, 연락처, 달력, 작업, 메모)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "백업 완료"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "에볼루션 다시 시작하는 중"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "현재 에볼루션 데이터를 백업"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "백업에서 파일을 추출하는 중"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "에볼루션 설정을 읽어오는 중"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "임시 백업 파일을 삭제하는 중"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "로컬 소스 확인하는 중"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s 폴더에 백업하는 중"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s 폴더에서 복구하는 중"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "에볼루션 백업"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "에볼루션 복구"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "에볼루션 데이터를 백업하는 중입니다"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "에볼루션에서 데이터를 백업하는 동안 잠시 기다리십시오."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "에볼루션 데이터를 복구하는 중입니다"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "에볼루션에서 데이터를 복구하는 동안 잠시 기다리십시오."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "이 작업은 계정의 데이터 크기에 따라 시간이 걸릴 수도 있습니다."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "에볼루션 데이터 및 설정을 백업하고 복구합니다."
+msgstr "에볼루션 데이터 및 설정을 백업하고 복구하는 플러그인."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
@@ -15416,14 +16193,22 @@ msgstr ""
 "로 실행하시고자 할 경우 토글 단추를 활성화합니다."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "권한이 없습니다"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "에볼루션 백업 파일이 잘못되었습니다"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "복구할 올바른 백업 파일을 선택하십시오."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr "선택한 폴더에서는 파일을 만들 권한이 없습니다"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15455,9 +16240,8 @@ msgstr "자동 연락처"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr "메세지에 답장할 때 자동으로 주소록에 연락처 만들기(_A)"
+msgid "_Auto-create addressbook entries when replying to messages"
+msgstr "메세지에 답장하면 자동으로 주소록에 항목 만들기(_A)"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15469,10 +16253,8 @@ msgstr "인스턴스 메시지 연락처"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr "피진 친구 목록의 나오는 정보 및 그림을 주기적으로 동기화"
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "피진 친구 목록의 정보 및 그림을 동기화"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -15496,7 +16278,28 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "%s 실행 중에 오류가 발생했습니다: %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "보고필터 하위 프로세스가 응답하지 않습니다. 강제로 끝냅니다..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "보고필터 하위 프로세스 대기가 중지되었습니다. 강제로 끝냅니다..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "보고필터에 대한 파이프가 실패했습니다. 오류 코드: %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "메세지 텍스트를 유니코드로 변환(_U)"
 
@@ -15517,6 +16320,10 @@ msgid "Bogofilter Options"
 msgstr "보고필터 옵션"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "보고필터 정크메일 플러그인"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "보고필터를 사용해 정크 메세지를 필터링합니다."
 
@@ -15525,12 +16332,12 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "SSL 사용(_S)"
 
@@ -15550,17 +16357,17 @@ msgstr "로컬 달력"
 msgid "Provides core functionality for local calendars."
 msgstr "로컬 달력의 주요 기능을 제공합니다."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "새로 고침(_R):"
+#: ../plugins/google-account-setup/google-source.c:381
+msgid "Re_fresh:"
+msgstr "새로 고침(_F):"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "보안 연결(_S):"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "사용자이름(_M):"
 
@@ -15657,14 +16464,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "에볼루션을 기본 전자메일 프로그램으로 하시겠습니까?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "에볼루션"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "기본 폴더로 표시(_D)"
+msgid "Mark as _default address book"
+msgstr "기본 주소록으로 표시(_D)"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "기본 달력으로 표시(_D)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "기본 작업 목록으로 표시(_D)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "기본 메모 목록으로 표시(_D)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15676,6 +16494,55 @@ msgid ""
 "default one."
 msgstr "달력이나 주소록을 기본값으로 지정하는 기능을 제공합니다."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "사용자 설정 헤더(_C)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "키"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "값"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"사용자 설정 헤더 값을 지정하는 형식은:\n"
+"사용자 설정 헤더의 키와 값을 \";\"으로 구분합니다."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "전자메일 사용자 설정 헤더"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr "보내는 메세지에 사용자 설정 헤더를 추가합니다."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "사용자 설정 헤더"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr "사용자 설정 헤더 목록"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"이 키는 보내는 메세지에 추가할 사용자 설정 헤더의 목록입니다. 헤더와 헤더 값"
+"을 지정하는 방법은 다음과 같습니다: 사용자 설정 헤더의 이름 다음에 \"=\" 다음"
+"에 값을 쓰고 \";\"으로 구분."
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "다른 사용자 폴더 열기"
@@ -15693,34 +16560,34 @@ msgid "_User:"
 msgstr "사용자(_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "보안 암호"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 "이 옵션을 켜면 보안 암호 (NTLM) 인증을 사용해 익스체인지 서버에 연결합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "일반 암호"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 "이 옵션을 켜면 일반 텍스트 암호 인증을 사용해 익스체인지 서버에 연결합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "부재 중"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -15728,77 +16595,81 @@ msgstr ""
 "아래에 지정한 메세지는 부재 중에 메일을 보낸 각 사람들에게\n"
 "자동으로 전달합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "현재 외부에 있음"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "현재 내부에 있음"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
-msgstr "Exchange 계정의 암호 바꾸기"
+msgstr "익스체인지 계정의 암호 바꾸기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "암호 바꾸기"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
-msgstr "Exchange 계정의 대리인 설정을 관리합니다"
+msgstr "익스체인지 계정의 대리인 설정을 관리합니다"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "대리인 도우미"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "기타"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
-msgstr "모든 Exchange 폴더의 크기 보기"
+msgstr "모든 익스체인지 폴더의 크기 보기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "폴더 크기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
-msgstr "Exchange 설정"
+msgstr "익스체인지 설정"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:674
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:700
 msgid "A_uthenticate"
 msgstr "인증(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:721
+msgid "_Mailbox:"
+msgstr "메일함(_M):"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:922
 msgid "_Authentication Type"
 msgstr "인증 방법(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "Ch_eck for Supported Types"
 msgstr "지원하는 방법인지 확인(_E) "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1048
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -15816,13 +16687,13 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 msgstr "현재 암호가 계정의 암호와 맞지 않습니다. 올바른 암호를 입력하십시오"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "두 암호가 맞지 않습니다. 암호를 다시 입력하십시오."
 
@@ -15847,33 +16718,33 @@ msgstr "현재의 암호가 사용 만료되었습니다. 지금 암호를 바�
 msgid "Your password will expire in the next %d days"
 msgstr "암호가 앞으로 %d일 안에 만료됩니다."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "사용자 설정"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "편집자 (읽기, 만들기, 편집)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "저자 (읽기, 만들기)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "검토자 (읽기전용)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "대리 권한"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s에 대한 권한"
@@ -15881,7 +16752,7 @@ msgstr "%s에 대한 권한"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -15891,66 +16762,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "내 폴더에 다음과 같은 권한을 부여 받았습니다:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "내 개인 항목을 볼 수 있습니다."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "하지만 내 개인 항목은 볼 수 없습니다."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "귀하는 %s의 대리인으로 지정되었습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "대리"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "대리인 %s을(를) 지우시겠습니까?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "액티브 디렉토리에 접근할 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "액티브 디렉토리에서 자신을 찾을 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "액티브 디렉토리에서 %s 대리를 찾을 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "%s 대리를 지울 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "대리 목록을 업데이트할 수 없습니다."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "%s 대리를 더할 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "대리 목록을 읽어들이는 데 오류."
 
@@ -15998,42 +16869,47 @@ msgstr "권한 요약(_S)"
 msgid "_Tasks:"
 msgstr "작업(_T):"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "권한..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "폴더 이름"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "폴더 크기"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "사용자"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "다른 사용자의 폴더에 구독"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
-msgstr "Exchange 폴더 트리"
+msgstr "익스체인지 폴더 트리"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "폴더 구독 해제..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "정말로 \"%s\" 폴더를 구독 해제하시겠습니까?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\"에서 구독 해제"
@@ -16097,15 +16973,18 @@ msgstr "암호가 7일 안에 만료됩니다..."
 msgid "_Change Password"
 msgstr "암호 바꾸기(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(권한이 거부되었습니다.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "사용자 추가:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "사용자 추가"
 
@@ -16229,11 +17108,11 @@ msgstr "사용자(_U)"
 msgid "button-user"
 msgstr "단추-사용자"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "사용자 선택"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "주소록..."
 
@@ -16247,9 +17126,9 @@ msgstr "다른 사용자의 달력 구독"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
-msgstr "익스체인지 계정에 관계된 동작이나 기능들을 처리하는 플러그인."
+msgstr "익스체인지 계정 관련 동작이나 기능들을 관리하는 플러그인."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -16338,10 +17217,14 @@ msgid "Could not update out-of-office state"
 msgstr "부재중 상태를 업데이트할 수 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "구독 사용자의 메일함을 읽어들이려면 에볼루션을 다시 시작해야 합니다"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "익스체인지 계정이 오프라인입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16363,38 +17246,38 @@ msgstr ""
 "이 기능을 사용하도록 만들어야 에볼루션 익스체인지\n"
 "커넥터를 사용할 수 있습니다.\n"
 "\n"
-"익스체인지 관리자에게 보여줄 정보는, 아래의\n"
+"익스체인지 관리자에게 보여줄 정보는 아래의\n"
 "링크를 참고하십시오:\n"
 "\n"
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "대리자를 업데이트하는 데 실패했습니다:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "폴더가 이미 있습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "폴더가 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "폴더 오프라인"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "일반 오류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Global Catalog 서버에 연결할 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16402,72 +17285,72 @@ msgstr ""
 "다른 경로에서 OWA가 실행하고 있다면, 계정 설정 대화 상자에서 그 경로를 지정해"
 "야 합니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0}에 대한 메일 박스는 이 서버에 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "URL이 올바른 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "서버 이름의 철자가 맞는 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "사용자 이름과 암호가 올바른 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "이 계정에서 Global Catalog 서버를 설정하지 않았습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "{0} 사용자의 메일박스가 {1}에 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "{0} 사용자가 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "암호를 성공적으로 바꿨습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "대리인의 ID를 입력하거나 대리인 자격으로 보내기 옵션을 사용하지 마십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Global Catalog 서버 이름이 올바른지 확인하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "바뀐 사항을 적용하려면 에볼루션을 다시 시작해 주십시오"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "사용자를 선택하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "암호가 너무 취약하기 때문에 서버에서 거부했습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "에볼루션을 끝내면 익스체인지 계정을 사용하지 않게 됩니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "에볼루션을 끝내면 익스체인지 계정을 지우게 됩니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "이 익스체인지 서버는 익스체인지 커넥터와 호환되지 않습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16475,7 +17358,7 @@ msgstr ""
 "서버가 익스체인지 5.5를 실행하고 있습니다. 익스체인지 커넥터는\n"
 "마이크로소프트 익스체인지 2000 및 2003만 지원합니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16489,69 +17372,69 @@ msgstr ""
 "\n"
 "아니면 단순히 암호를 잘못 입력했을 수도 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "다른 암호로 다시 시도해 보십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "사용자를 접근권한 컨트롤 목록에 더할 수 없습니다:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "대리인을 편집할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "{0}을(를) 찾아보는 데 알 수 없는 오류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "알 수 없는 오류."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "알 수 없는 종류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "지원하지 않는 동작"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr "이 서버에서 사용할 수 있는 메일 저장 한계 용량에 가까워져 있습니다."
+msgstr "이 서버에서 사용할 수 있는 메일 저장 제한 용량에 가까워져 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "한번에 한 명의 대리인을 통해서만 메세지를 보낼 수 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "자기 자신을 자신의 대리인으로 만들 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "이 서버에 메일을 저장할 수 있는 제한 용량을 넘어갔습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "한 개의 익스체인지 계정만 설정할 수 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "현재 사용량은: {0}KB입니다. 메일을 지워서 공간을 더 확보해 보십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "현재 사용량은: {0}KB입니다. 현재 메일을 보내거나 받지 못할 것입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16559,19 +17442,19 @@ msgstr ""
 "현재 사용량은: {0}KB입니다. 메일을 지워서 공간을 더 확보하지 않으면 메일을 보"
 "내지 못할 것입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "암호가 만료되었습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0}을(를) 접근 권한 조정 목록에 더할 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0}은(는) 이미 대리인입니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0}은(는) 이미 목록에 있습니다"
 
@@ -16583,6 +17466,14 @@ msgstr "다른 사용자의 작업에 구독"
 msgid "Check folder permissions"
 msgstr "폴더 권한 검사"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "기본 외부 편집기"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "편집기로 사용할 기본 명령어."
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
@@ -16596,6 +17487,28 @@ msgstr ""
 msgid "External Editor"
 msgstr "외부 편집기"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "임시 파일을 만들 수 없습니다"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "편집기를 시작할 수 없습니다"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr "메일을 저장할 임시 파일을 만들 수 없습니다. 나중에 다시 시도하십시오."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"플러그인 기본 설정에서 지정한 외부 편지기를 실행할 수 없습니다. 다른 편집기"
+"를 설정해 보십시오."
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in External Editor"
 msgstr "외부 편집기에서 작성"
@@ -16604,15 +17517,27 @@ msgstr "외부 편집기에서 작성"
 msgid "Compose messages using an external editor"
 msgstr "외부 편집기를 사용해 메세지 작성"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr "편집기를 실행할 명령어: "
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"이맥스의 경우 \"xemacs\"를 사용하고\n"
+"VI는 \"gvim\"을 사용하십시오"
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "크기가 700바이트보다 작은 (48*48) PNG를 고르십시오"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG 파일"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "얼굴(_F)"
 
@@ -16647,20 +17572,37 @@ msgstr "폴더 구독 해제"
 msgid "_Unsubscribe"
 msgstr "구독 중지(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "구글"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+msgid "<b>Server</b>"
+msgstr "<b>서버</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "사용자 이름:"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "Update every" <spinbox> "seconds"
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+msgid "Update every"
+msgstr "업데이트 주기: "
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "구글 달력 소스를 설정하는 플러그인."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "구글 달력 및 연락처를 설정하는 플러그인."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "구글 소스"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "확인목록"
 
@@ -16740,23 +17682,29 @@ msgid "_Junk List"
 msgstr "정크메일 목록(_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "메세지 철회"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"메세지를 철회하면 받은 사람 메일함에서 지워질 수 있습니다. 정말로 철회하시겠"
+"습니까?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
-msgstr "메세지를 성공적으로 가져왔습니다"
+msgstr "메세지를 성공적으로 철회했습니다"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
-msgstr "메일 가져오기"
+msgstr "메일 철회"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "그룹와이즈 메세지에 보내기 옵션 추가"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "보내기 옵션"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "그룹와이즈 계정 기능에 대한 플러그인."
@@ -16765,6 +17713,73 @@ msgstr "그룹와이즈 계정 기능에 대한 플러그인."
 msgid "Groupwise Features"
 msgstr "그룹웨어 기능"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "메세지 철회가 실패했습니다"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "선택한 메세지의 철회를 서버에서 허용하지 않았습니다."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "잘못된 사용자"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "프록시 권한을 &quot;{0}&quot; 사용자에게 부여할 수 없습니다"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "사용자 지정"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "이 사용자에게 이미 프록시 권한을 부여했습니다."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr "프록시 권한을 부여하려면 올바른 사용자 이름을 지정해야 합니다."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "&quot;{0}&quot; 계정이 이미 있습니다. 폴더 트리를 확인하십시오."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "계정이 이미 있습니다"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+msgstr ""
+"&quot;{0}&quot; 사용자의 프록시 로그인이 실패했습니다. 전자메일 ID를 확인하"
+"고 다시 시도하십시오."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "반복 모임입니다"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "받아들이시겠습니까?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "거부하시겠습니까?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "폴더를 지정한 &quot;{0}&quot; 사용자와 공유할 수 없습니다"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "목록에 추가할 사용자 이름을 지정해야 합니다"
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "시험 삼아 허용"
@@ -16864,9 +17879,9 @@ msgstr "<b>계정 이름</b>"
 msgid "Proxy Login"
 msgstr "프록시 로그인"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16875,20 +17890,20 @@ msgstr "%s%s(사용자 %s)의 암호를 입력하십시오"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "프록시 로그인(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "해당 계정이 온라인 상태일 경우에만 프록시 탭을 사용할 수 있습니다."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "해당 계정을 사용할 경우에만 프록시 탭을 사용할 수 있습니다."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "사용자"
 
@@ -16904,11 +17919,15 @@ msgstr "새 공유 폴더(_S)..."
 msgid "Sharing"
 msgstr "공유"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "사용자 지정 알림"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "추가   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "바꾸기"
 
@@ -16953,7 +17972,6 @@ msgstr "지움: "
 msgid "Declined: "
 msgstr "거부: "
 
-# FIXME - hard to translate UI + string based on English grammar
 #: ../plugins/groupwise-features/status-track.c:220
 msgid "Completed: "
 msgstr "완료: "
@@ -16974,11 +17992,11 @@ msgstr "hula 달력 소스를 설정하는 플러그인."
 msgid "Hula Account Setup"
 msgstr "Hula 계정 설정"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "사용자 설정 헤더"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP 헤더"
 
@@ -17031,28 +18049,28 @@ msgstr "IMAP 계정 기능에 대한 플러그인."
 msgid "IMAP Features"
 msgstr "IMAP 기능"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "달력으로 가져오기(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "작업으로 가져오기(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS 가져오기"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "작업 목록 선택"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "달력 선택"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "가져오기(_I)"
 
@@ -17090,8 +18108,8 @@ msgstr ""
 "동기화할 아이팟을 에볼루션에서 찾을 수 없습니다. 아이팟이 시스템에 연결이 되"
 "지 않았거나 전원이 꺼져 있습니다."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar 형식 (.ics)"
 
@@ -17144,92 +18162,92 @@ msgstr "어느 메모 목록에서도 이 메모를 찾을 수 없습니다"
 msgid "Searching for an existing version of this appointment"
 msgstr "이 약속의 현재 버전을 찾는 중입니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:946
 msgid "Unable to parse item"
 msgstr "항목을 파싱할 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1004
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "항목을 '%s' 달력에 보낼 수 없습니다.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1016
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' 달력에 수락이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "'%s' 달력에 미정이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' 달력에 거절이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1030
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' 달력에 취소라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "주최자가 대리인 %s을(를) 지웠습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 msgid "Sent a cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보낼 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "참석자를 업데이트할 수 없습니다. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 msgid "Attendee status updated"
 msgstr "참석자 상태를 업데이트했습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Meeting information sent"
 msgstr "모임 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
 msgstr "작업 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 msgid "Memo information sent"
 msgstr "메모 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "모임 정보를 보낼 수 없습니다. 해당 모임이 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid "Unable to send task information, the task does not exist"
 msgstr "작업 정보를 보낼 수 없습니다. 해당 작업이 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "메모 정보를 보낼 수 없습니다. 해당 메모가 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The calendar attached is not valid"
 msgstr "첨부한 달력이 잘못되었습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17237,16 +18255,16 @@ msgstr ""
 "메세지에 달력이 들어 있다고 되어 있으나, 그 달력이 올바른 iCalendar가 아닙니"
 "다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "달력 안이 항목이 올바르지 않습니다"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17254,325 +18272,325 @@ msgstr ""
 "메세지에 달력이 들어 있으나, 달력에 행사, 작업, 약속 있음/없음 정보가 하나도 "
 "들어 있지 않습니다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "첨부한 달력에 여러 개의 항목이 들어 있습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "이 항목을 모두 처리하려면, 파일을 저장해서 그 달력을 가져와야 합니다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "이 약속 반복"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "이 작업 반복"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "이 메모 반복"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "적용한 다음에 메세지 지우기(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "충돌 찾기"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "충돌하는 모임을 찾을 달력을 선택하십시오"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "오늘"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "오늘 %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "내일"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "내일 %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "내일 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%B %e일 %A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%B %e일 %A, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%B %e일 %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%B %e일 %A, %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%B %e일 %A, %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%Y년 %B %e일 %A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y년 %B %e일 %A, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y년 %B %e일 %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y년 %B %e일 %A, %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y년 %B %e일 %A, %p %l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "<b>%s</b> 자격으로 응답하십시오."
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> 자격으로 받음"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 정보를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b>님이 다음 모임 정보를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b>님이 다음 모임을 위임했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임에 참석하시기를 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b>님이 다음 모임에 참석하시기를 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 기존 모임에 참석하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b>님이 기존 모임에 참석하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임의 최신 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b>님이 다음 모임의 최신 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음과 같은 모임 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b>님이 다음과 같은 모임 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b>님이 다음 모임을 취소했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 변경을 제안했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b>님이 다음 모임 변경을 제안했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 변경을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b>님이 다음 모임 변경을 거절했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업을 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b>님이 다음 작업을 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b>님이 다음 작업에 %s님의 할당을 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 작업을 할당했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b>님이 작업을 할당했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 기존 작업에 참여하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b>님이 기존 작업에 참여하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17580,7 +18598,7 @@ msgid ""
 msgstr ""
 "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당의 최근 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -17588,129 +18606,129 @@ msgid ""
 msgstr "<b>%s</b>님이 다음 작업 할당의 최근 정보를 받고 싶어합니다:"
 
 # FIXME: through what?
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b>님이 다음 작업 할당 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 할당 작업을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b>님이 다음 할당 작업을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당 변경을 제안했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b>님이 다음 작업 할당 변경을 제안했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b>님이 다음 작업 할당을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 메모를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b>님이 다음 메모를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b>님이 %s을(를) 통해 기존 메모에 내용을 더하고 싶어합니다:"
+msgstr "<b>%s</b>님이 %s을(를) 통해 기존 메모에 내용을 추가하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b>님이 기존 메모에 내용을 더하고 싶어합니다:"
+msgstr "<b>%s</b>님이 기존 메모에 내용을 추가하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 공유 메모를 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>님이 다음 공유 메모를 취소했습니다:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "달력 열기(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "거부(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "허용(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "모두 거부(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "모두 잠정적(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "잠정적(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "모두 허용(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "정보 보내기(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "참석자 상태 업데이트(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "업데이트(_U)"
 
@@ -17767,7 +18785,7 @@ msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
 msgstr ""
-"&quot;{0}&quot;이(가) 모임을 위임했습니다. {1} 대리인을 더하시겠습니까?"
+"&quot;{0}&quot;이(가) 모임을 위임했습니다. {1} 대리인을 추가하시겠습니까?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -17776,7 +18794,8 @@ msgstr "이 모임은 위임되었습니다"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 더하시겠습니까?"
+msgstr ""
+"현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 추가하시겠습니까?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
@@ -17857,12 +18876,20 @@ msgstr "아이콘을 깜박일 지 여부."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "받은 편지함 폴더에만 새 메세지를 알릴 지 여부."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "D-Bus 메세지 보내기(_D)"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+msgid "Evolution's Mail Notification"
+msgstr "에볼루션 메일 알림"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+msgid "Mail Notification Properties"
+msgstr "메일 알림 속성"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17874,54 +18901,54 @@ msgstr[0] ""
 "새로 %d개의 메세지를 받았습니다.\n"
 "(%s 폴더)"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "새로 %d개의 메세지를 받았습니다."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "새 메일"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "알림 영역에서 아이콘 표시(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "알림 영역에서 아이콘 깜박이기(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "아이콘과 같이 메세지 팝업 표시(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "새 메세지가 도착하면 사운드 재생(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "삑 소리(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "사운드 파일 재생(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "파일 이름 지정(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "사운드 파일을 고르십시오"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "재생(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "받은 편지함의 경우에만 새 메세지 알림(_I)"
 
@@ -18065,12 +19092,12 @@ msgstr "메일링 리스트로 전자메일을 보내시겠습니까?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"해당 동작을 수행할 수 없습니다. 해당 헤더에 처리할 수 있는 동작이 들어 있지 "
-"않습니다.\n"
+"해당 동작을 수행할 수 없습니다. 해당 동작에 대한 헤더에 처리할 수 있는 동작"
+"이 들어 있지 않습니다.\n"
 "\n"
 "헤더: {0}"
 
@@ -18146,6 +19173,26 @@ msgstr "리스트에 가입(_S)"
 msgid "_Unsubscribe from List"
 msgstr "리스트에서 탈퇴(_U)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "이 폴더와 하위 폴더의 모든 메세지를 읽은 것으로 표시하시겠습니까?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "하위 폴더에서도 해당 작업을 수행하시겠습니까?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "모든 메세지를 읽은 것으로 표시"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "현재 폴더와 하위 폴더(_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "현재 폴더만(_F)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "모두 읽은 것으로 표시"
@@ -18176,11 +19223,11 @@ msgstr "오프라인에서 사용할 수 있게 하기(_M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr "Mono 플러그인을 구현하는 플러그인."
+msgstr "모노 플러그인을 구현하는 플러그인."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
-msgstr "Mono 로더"
+msgstr "모노 로더"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
@@ -18188,7 +19235,7 @@ msgstr "어느 플러그인을 사용하고 사용하지 않을 지 관리하는
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "플러그인 관리자"
 
@@ -18200,33 +19247,24 @@ msgstr "플러그인 사용 여부"
 msgid "_Plugins"
 msgstr "플러그인(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "개발자"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "설명"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "설정"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "주의: 일부 바뀐 사항은 다시 시작해야 적용됩니다"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "개요"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "설정"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "이 플러그인은 설정 옵션이 없습니다."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "플러그인"
 
@@ -18250,41 +19288,22 @@ msgstr "일반 텍스트 모드"
 msgid "Prefer plain-text"
 msgstr "일반 텍스트 선호"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "HTML이 있으면 표시"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "일반 텍스트 선호"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "일반 텍스트만 표시"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML 모드(_M)"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "편지 작성에서 인쇄할 수 있는 옵션 사용."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "메세지 인쇄"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "인쇄 미리 보기(_V)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "메세지를 인쇄합니다"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "에볼루션 프로파일러"
@@ -18309,13 +19328,7 @@ msgstr "위치"
 msgid "_Publish Calendar Information"
 msgstr "달력 정보 게시(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s'의 암호를 입력하십시오"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "정말로 이 URL을 지우시겠습니까?"
 
@@ -18405,15 +19418,75 @@ msgstr ""
 "iCal\n"
 "약속 있음/없음"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "헬로 파이썬"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "파이썬 플러그인 로더 테스트"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "파이썬 테스트 플러그인"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "파이썬 EPlugin 로더 테스트 플러그인."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "파이썬으로 작성한 다른 플러그인을 읽어들이는 플러그인."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "파이썬 로더"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "스팸어새신 (내부에 포함)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
-msgstr "이렇게 하면 스팸어새신이 더욱 잘 작동하지만, 훨씬 더 느립니다"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "스팸어새신이 없습니다. 코드: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "파이프를 만드는 데 실패했습니다: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "프로세스 만든 뒤에 오류: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "스팸어새신 하위 프로세스가 응답하지 않습니다. 강제로 끝냅니다..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "스팸어새신 하위 프로세스 대기가 중지되었습니다. 강제로 끝냅니다..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "스팸어새신에 대한 파이프가 실패했습니다. 오류 코드: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "스팸어새신을 사용할 수 없습니다."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "이렇게 하면 스팸어새신이 더 안정적으로 작동하지만, 더 느립니다"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "원격 테스트 포함(_N)"
 
@@ -18439,7 +19512,7 @@ msgstr "메세지의 모든 첨부물이나 그 일부를 한 번에 저장하�
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "첨부 저장"
 
@@ -18451,16 +19524,15 @@ msgstr "첨부 저장..."
 msgid "Save all attachments"
 msgstr "모든 첨부 저장"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "저장할 위치 선택"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME 형식"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "저장"
 
@@ -18468,79 +19540,79 @@ msgstr "저장"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "설명 목록"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "분류 목록"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "메모 목록"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "만듦"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "연락처 목록"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "시작"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "끝"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "퍼센트 완료"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "참석자 목록"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "바뀜"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV 형식의 고급 옵션"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "앞에 헤더 붙임"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "값 구분:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "레코드 구분:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "값을 둘러싸는 문자:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "콤마로 구분한 값 형식 (.csv)"
 
@@ -18561,15 +19633,15 @@ msgstr "디스크에 저장(_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF 형식 (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "대상 파일 선택"
 
@@ -18594,8 +19666,8 @@ msgid "Show _only this Task List"
 msgstr "이 작업 목록만 표시(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "시작 마법사를 처리하는 플러그인."
+msgid "A plugin that manages the Startup wizard."
+msgstr "시작 마법사를 관리하는 플러그인."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
@@ -18627,24 +19699,24 @@ msgid "Importing files"
 msgstr "파일 가져오기"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "다음에서 가져오고 싶은 정보를 선택하십시오:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "%s에서:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "데이터를 가져오는 중입니다."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "잠시 기다리십시오"
 
@@ -18667,6 +19739,28 @@ msgstr "제목에 따라 메세지를 글타래로 표시합니다"
 msgid "F_all back to threading messages by subject"
 msgstr "연관된 메세지가 아니더라도 제목에 따라 글타래로 만들기(_A)"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "서식 플러그인에서 메세지 본문 대신 사용할 키/값 쌍의 목록."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "제목 없음"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "서식으로 저장(_T)"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "서식으로 저장"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "메일 초안 기준 서식 플러그인"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "YTNEF를 사용해 TNEF 첨부를 디코딩하는 간단한 플러그인."
@@ -18692,86 +19786,160 @@ msgid "Evolution Test component"
 msgstr "에볼루션 테스트 컴포넌트"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "현재 프린터 설정의 설명 문자열."
+msgid "Authenticate proxy server connections"
+msgstr "프록시 서버 연결 인증하기"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "자동 프록시 설정 URL"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "설정 버전"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "이상 종료 검사를 실행할 지 여부를 결정합니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "기본 보조 모음 너비"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "기본 창 높이"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "기본 창 상태"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "기본 창 너비"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "인터넷을 통해 HTTP 및 보안 HTTP를 사용할 때 프록시 설정을 사용합니다."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr "HTTP 프록시 호스트 이름"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr "HTTP 프록시 암호"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr "HTTP 프록시 포트"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr "HTTP 프록시 사용자 이름"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "맨 처음 시작할 때 기본으로 보여줄 컴포넌트 ID 혹은 별명."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username/password combo is defined by \"/apps/evolution/shell/network_config/"
+"authentication_user\" and locally stored password in .gnome2_private/."
+msgstr ""
+"참이면 프록시 서버에 연결할 때 인증이 필요합니다. 사용자 이름과 암호는 \"/"
+"apps/evolution/shell/network_config/authentication_user\"에 정의하고 로컬 컴"
+"퓨터의 .gnome2_private/ 안에 저장합니다."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "최근 업그레이드한 설정 버전"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "오프라인에서 사용할 때 동기화할 폴더의 경로 목록"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr "프록시 없음 호스트"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "HTTP 프록시에 인증할 때 넘길 암호."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr "프록시 설정 모드"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr "SOCKS 프록시 호스트 이름"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr "SOCKS 프록시 포트"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr "보안 HTTP 프록시 호스트 이름"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr "보안 HTTP 프록시 포트"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+"프록시 설정 모드를 선택합니다. 지원하는 값은 0, 1, 2, 3이고, 각각의 의미는 "
+"\"시스템 설정 사용\", \"프록시 없음\", \"수동 프록시 설정 사용\", \"자동 설"
+"정 URL에 들어 있는 프록시 설정 사용\"입니다."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "보조 모음을 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "개발 버전 경고 건너 뛰기"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "복구 경고 건너 뛰기"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "오프라인 모드에서 시작"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "상태 표시줄을 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 "에볼루션의 설정 버전, major/minor/configuration 단계. (예를 들어 \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "메인 창의 기본 높이, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "메인 창의 기본 너비, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "보조 모음의 기본 너비, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18779,7 +19947,43 @@ msgstr ""
 "최근 업그레이드한 에볼루션의 설정 버전, major/minor/configuration 단계. (예"
 "를 들어 \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr "HTTP 프록시로 사용할 컴퓨터 이름."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr "보안 HTTP 프록시로 사용할 컴퓨터 이름."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr "SOCKS 프록시로 사용할 컴퓨터 이름."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"프록시로 이용할 \"/apps/evolution/shell/network_config/http_host\"에서 지정"
+"한 컴퓨터의 포트."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"프록시로 이용할 \"/apps/evolution/shell/network_config/secure_host\"에서 지정"
+"한 컴퓨터의 포트."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"프록시로 이용할 \"/apps/evolution/shell/network_config/socks_host\"에서 지정"
+"한 컴퓨터의 포트."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18788,52 +19992,76 @@ msgstr ""
 "창 단추의 모양새. \"text\", \"icons\", \"both\", \"toolbar\" 사용 가능. "
 "\"toolbar\"일 경우 그놈 도구 모음 설정에 따라서 단추의 모양새가 결정됩니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"이 키에는 프록시를 사용하지 않고 (프록시가 있더라도) 직접 연결할 호스트의 목"
+"록이 들어 있습니다. 이 값에는 호스트 이름, 도메인(*.foo.com과 같이 앞에 와일"
+"드카드 사용), IP 주소(IPv4와 IPv6 모두 가능), 네트마스크를 사용한 네트워크 주"
+"소(192.168.0.0/24와 같이) 모두 사용할 수 있습니다."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "도구 모음을 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr "프록시 설정 값이 들어 있는 URL."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "HTTP 프록시 사용"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "HTTP 프록시에 인증할 때 넘길 사용자 이름."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "에볼루션이 처음에 온라인이 아니라 오프라인 모드로 시작하는 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "이상 종료 검사를 해야 할 지 여부"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "창을 최대화할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "보조 모음을 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "상태 표시줄을 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "도구 모음을 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "에볼루션 개발 버전의 경고 대화 상자를 건너 뛸지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "에볼루션 복구 대화 상자를 건너 뛸지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "창 단추를 표시해야 하는 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "창 단추 모양새"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "창 단추 표시할 지 여부"
 
@@ -18849,11 +20077,11 @@ msgstr "사용하고 있는 연결"
 msgid "Click OK to close these connections and go offline"
 msgstr "연결을 끊고 오프라인으로 가려면 확인을 누르십시오"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "실행할 가져오기 종류를 선택하십시오:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18867,11 +20095,11 @@ msgstr ""
 "파일 종류를 모르겠으면 \"자동\"을 선택하면, 에볼루션에서 자동으로 파일 종류"
 "를 알아내 처리하려고 합니다."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "어디로 가져올 지를 고르십시오"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18882,150 +20110,134 @@ msgstr ""
 "PINE, 넷스케이프, ELM, iCalendar. 가져올 수 있는 설정을 찾을 수\n"
 "없었습니다. 다시 시도하려면 \"뒤로\" 단추를 누르십시오.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "파일 이름(_I):"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "파일을 고르십시오"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "파일 종류(_T):"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "과거에 쓰던 프로그램에서 데이터 및 설정 사항 가져오기(_O)"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "파일 한 개 가져오기(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "에볼루션 기본 설정"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "폴더 이름을 지정하지 않았습니다."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "폴더 이름에 리턴 문자가 들어갈 수 없습니다."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "폴더 이름에 \"/\" 문자가 들어갈 수 없습니다."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "폴더 이름에 \"#\" 문자가 들어갈 수 없습니다."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' 과 '..'는 쓸 수 없는 폴더 이름입니다."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 에볼루션"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "이 시스템에 그놈 파일럿 툴이 설치되지 않았습니다."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "%s 실행 중 오류가 발생했습니다."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy가 설치되지 않았습니다."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy를 실행할 수 없습니다."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "GNOME Korea <gnome-kr-hackers@lists.kldp.net>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "에볼루션 웹사이트"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "FAQ 웹페이지를 여는 중에 오류가 발생했습니다."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "온라인 작업(_W)"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "오프라인 작업(_W)"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "오프라인에서 작업"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"에볼루션은 현재 온라인 상태입니다. 오프라인 상태로 작업하려면 이 단추를 누르"
-"십시오."
+"에볼루션은 현재 온라인 상태입니다.\n"
+"오프라인 상태로 작업하려면 이 단추를 누르십시오."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "에볼루션은 오프라인 상태로 가는 중입니다."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"에볼루션은 현재 오프라인 상태입니다. 온라인 상태로 작업하려면 이 단추를 누르"
-"십시오."
+"에볼루션은 현재 오프라인 상태입니다.\n"
+"온라인 상태로 작업하려면 이 단추를 누르십시오."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "%s 창으로 바꾸기"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "알 수 없는 시스템 오류."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "확인"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "인자가 잘못되었습니다"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "OAF에 등록할 수 없습니다"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "설정 데이터베이스를 찾을 수 없습니다"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "새로 만들기"
 
@@ -19080,7 +20292,7 @@ msgstr ""
 "르십시오."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19114,7 +20326,7 @@ msgstr ""
 "우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에\n"
 "기여해 주시기를 목이 빠지게 기다리겠습니다!\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19122,19 +20334,19 @@ msgstr ""
 "고맙습니다\n"
 "에볼루션 팀\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "다시 알리지 않기"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "에볼루션 이상 종료 검사"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "무시(_N)"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19145,43 +20357,43 @@ msgstr ""
 "문제 예방을 위해 미리 보기 창을 감춥니다. 보기 메뉴에서 미리 보기\n"
 "창을 다시 표시할 수 있습니다.\n"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "이 메세지를 다시 보지 않기(_D)"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "에볼루션 시작할 때 특정 컴포넌트를 활성화합니다"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "온라인 모드에서 시작"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "강제로 모든 에볼루션 컴포넌트를 끝냅니다"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "강제로 에볼루션 1.4에서 다시 옮겨 옵니다"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "모든 컴포넌트의 디버깅 출력을 파일로 보냅니다."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "플러그인을 아무것도 읽어들이지 않습니다."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "전자메일, 연락처, 작업의 미리 보기 창을 사용하지 않습니다."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- 에볼루션 개인정보 관리 및 메일 클라이언트"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19323,7 +20535,7 @@ msgstr ""
 "\n"
 "계속하시면, 과거의 데이터중에 접근할 수 없는 데이터가 있을 수 있습니다.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19334,7 +20546,7 @@ msgstr ""
 "\n"
 "신뢰 수준을 편집하십시오:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19343,7 +20555,7 @@ msgstr ""
 "이 인증서를 발급한 인증 기관을 신뢰한다고 하셨으므로, 따로 지정하지 않는 한 "
 "이 인증서를 믿을만 하다고 신뢰합니다."
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19400,11 +20612,16 @@ msgstr "전자메일 주소"
 msgid "All CA certificate files"
 msgstr "모든 CA 인증서 파일"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "인증서 보기: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "`%s'의 암호를 입력하십시오"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19415,7 +20632,7 @@ msgid "Enter new password"
 msgstr "새 암호를 입력하십시오"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19424,7 +20641,7 @@ msgstr ""
 "발급 대상:\n"
 "  소유자: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19433,7 +20650,7 @@ msgstr ""
 "발급자:\n"
 "  소유자: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "인증서 선택"
 
@@ -19620,7 +20837,7 @@ msgid "_Edit CA Trust"
 msgstr "인증 기관 신뢰수준 편집(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "인증서가 이미 있습니다"
 
@@ -19828,8 +21045,7 @@ msgstr "모든 연락처 복사(_P)..."
 msgid "Contact _Preview"
 msgstr "연락처 미리 보기(_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "복사"
@@ -19854,8 +21070,7 @@ msgstr "폴더로 복사..."
 msgid "Create a new addressbook folder"
 msgstr "새 주소록 폴더를 만듭니다"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "잘라내기"
@@ -19896,8 +21111,7 @@ msgstr "선택한 폴더의 연락처를 다른 폴더로 옮깁니다"
 msgid "Move to Folder..."
 msgstr "폴더로 이동..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "붙여 넣기"
@@ -19934,13 +21148,11 @@ msgstr "선택한 연락처를 VCard로 저장합니다."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "선택한 폴더의 연락처를 VCard로 저장합니다"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "모두 선택"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "전부 선택(_A)"
 
@@ -20070,7 +21282,7 @@ msgid "Month"
 msgstr "한 달"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "다음"
 
@@ -20079,7 +21291,7 @@ msgid "Previews the calendar to be printed"
 msgstr "인쇄할 달력을 미리 봅니다"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "이전"
 
@@ -20147,237 +21359,6 @@ msgstr "근무 주"
 msgid "_Open Appointment"
 msgstr "약속 열기(_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "선택한 메세지를 클립보드로 복사합니다"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "선택한 사항을 클립보드로 복사합니다"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "선택한 텍스트를 클립보드로 잘라냅니다"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "선택한 사항을 클립보드로 잘라냅니다"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "클립보드에서 붙여 넣습니다"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "클립보드에서 텍스트를 붙여 넣습니다"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "모든 텍스트 선택"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "첨부"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "파일을 첨부하려면 여기를 누르십시오"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "현재 창을 닫으려면 여기를 누르십시오"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "현재 창을 저장하려면 여기를 누르십시오"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "해당 도움말을 보려면 여기를 누르십시오"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "닫기"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "넣기(_N)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "첨부(_A)..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "닫기(_C)"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "파일(_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "도움말(_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "옵션(_O)"
-
-# event -> 행사, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "하루 종일 행사"
-
-# event -> 행사, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "하루 종일 행사(_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "비밀로 분류"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "개인으로 분류"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "공용으로 분류"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "이 행사에 알림을 설정하거나 해제하려면 여기를 누르십시오"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "고급 보내기 옵션 넣기"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "반복 행사로 만듭니다"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "공개(_B)"
-
-# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "참석자의 약속 있음/없음 정보를 알아봅니다"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "역할 항목(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "보내기 옵션(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "시간을 약속 있음으로 표시(_B)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "시간대(_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "참석자 종류 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "응답요청 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "역할 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "상태 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "시간대 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "분류를 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "하루 종일 행사가 있는 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "시간을 약속 있음으로 보여줄 지 토글합니다"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "알림(_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "분류(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "분류(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "비밀(_C)"
-
-# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "약속 있음/없음(_F):"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "개인(_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "응답바람(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "반복(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "상태 항목(_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "종류 항목(_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "현재 메일 동작을 취소합니다"
@@ -20407,7 +21388,6 @@ msgid "Empty _Trash"
 msgstr "휴지통 비우기(_T)"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "폴더(_O)"
 
@@ -21089,9 +22069,9 @@ msgstr "확대/축소(_Z)"
 msgid "_Zoom In"
 msgstr "확대(_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "이 창을 닫습니다"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "닫기"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21129,291 +22109,6 @@ msgstr "선택한 메모를 봅니다"
 msgid "_Open Memo"
 msgstr "메모 열기(_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "파일을 첨부합니다"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "현재 파일을 닫습니다"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "서명만 남기고 모두 지웁니다"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "이 메세지를 PGP로 암호화합니다"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "이 메세지를 S/MIME 암호화 인증서로 암호화합니다"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "형식(_M)"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "메세지를 읽으면 배달 확인 받기"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HTML(_M)"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "보내기 옵션 넣기"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "파일을 엽니다"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP 암호화"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP 서명"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP 암호화(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP 서명(_S)"
-
-# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "내용 읽음 확인 요청(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME 암호화(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME 암호화"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME 서명(_N)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME 서명"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "보내기(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "다른 이름으로 저장"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "임시 보관함에 저장"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "다른 이름으로 저장(_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "임시 보관함에 저장(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "임시 보관함에 저장"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "폴더로 저장..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "현재 파일을 저장합니다"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "현재 파일을 다른 이름으로 저장합니다"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "메세지를 지정한 폴더로 저장합니다"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "보내기"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "메일을 HTML형식으로 보냄"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "이 메세지를 지금 보냅니다"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "메세지 우선순위를 높입니다"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "이 메세지를 PGP키로 서명합니다"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "이 메세지를 S/MIME 서명 증명으로 서명합니다"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "숨은 참조 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "참조 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "발신 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "올리는 곳 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "회신 주소 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "받는 사람 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "숨은 참조 항목(_B)"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "참조 항목(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "모두 지우기(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "발신 항목(_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "열기(_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "올리는 곳 항목(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "메세지 우선순위 높이기(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "회신 주소 항목(_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "보안(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "보내기 옵션(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "받는 사람 항목(_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "닫기(_L)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "HTML(_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "저장 후 닫기"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "저장 후 닫기(_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "이 파일을 저장하고 창을 닫습니다"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "구독 폴더의 목록에 폴더를 더합니다"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "목록 다시읽음"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "폴더 목록을 다시 읽습니다"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "구독 폴더의 목록에서 폴더를 지웁니다"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "구독"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "구독 중지"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "선택 반전(_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "누르면 작업의 자세한 정보를 바꾸거나 봅니다"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "상태 자세히"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "시간대"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "상태 자세히(_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "선택한 작업을 복사합니다"
@@ -21727,11 +22422,11 @@ msgid "With _Status"
 msgstr "상태 포함(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -21748,8 +22443,8 @@ msgid "Select a Time Zone"
 msgstr "시간대를 선택하십시오"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "시간대 콤보 상자"
+msgid "Timezone drop-down combination box"
+msgstr "시간대 드롭다운 콤보 상자"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21760,19 +22455,19 @@ msgstr ""
 "왼쪽 마우스 단추로 지도에서 특정 지역을 확대한 다음 시간대를 선택하십시오.\n"
 "오른쪽 마우스 단추로 축소합니다."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "모음"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s에 대한 뷰 정의"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "뷰 정의"
 
@@ -21782,18 +22477,18 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\"에 대한 뷰 정의"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "도표"
 
 # NOTE: 겉으로 나오는 번역이 아니므로 번역이 별로 의미없음.  view의 instance.
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "인스턴스"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "현재 뷰 저장"
 
@@ -21845,11 +22540,11 @@ msgstr "현재 사용자 보기 저장"
 msgid "Create or edit views"
 msgstr "보기 만들기 또는 편집"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "팩토리"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "새 뷰 정의"
 
@@ -21865,17 +22560,17 @@ msgstr "뷰 종류"
 msgid "Type of view:"
 msgstr "뷰 종류:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "첨부 모음"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "%s 파일을 첨부할 수 없습니다: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s 파일을 첨부할 수 없습니다: 일반 파일이 아닙니다"
@@ -21897,33 +22592,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시 권하기"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%Y년 %B"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "달별 달력"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "채우기 색"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK 채우기 색"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "스티플 채우기"
 
@@ -21948,29 +22642,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "최소 너비"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "최소 너비"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "공백"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "현재"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "시간은 다음과 같은 형식이어야 합니다: %s"
@@ -21979,189 +22673,187 @@ msgstr "시간은 다음과 같은 형식이어야 합니다: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "퍼센트 값은 0과 100을 포함하여 그 사이어야 합니다."
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "아랍어"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "발트어"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "중앙 유럽어"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "중국어"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "키릴어"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "그리스어"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "히브리어"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "일본어"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "한국어"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "타이어"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "터키어"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "유니코드"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "서부 유럽어"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "서부 유럽어, 새로운 인코딩"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "번체"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "간체"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "우크라이나어"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "비주얼"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "알 수 없는 문자셋: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "문자 인코딩"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "사용할 문자셋 입력하십시오"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "그 외..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "문자 인코딩(_A)"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "날짜 및 시간"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "날짜 입력하는 텍스트 엔트리"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "달력을 보려면 단추를 누르십시오"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
-msgstr "시간을 선택하는 콤보 상자"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr "시간을 선택하는 드롭다운 콤보 상자"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "현재(_W)"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "오늘(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "날짜 값이 잘못되었습니다"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "시간 값이 잘못되었습니다"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "확장됨"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "확장 단추가 확장되었는 지 여부"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "확장 단추의 레이블 텍스트"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "밑줄 사용"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 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:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "레이블과 하위 위젯 사이에 넣을 공백"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "레이블 위젯"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "일반적인 확장 단추 레이블 대신에 표시할 위젯"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "확장 단추 크기"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "확장 화살표의 크기"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "표시 여백"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "확장 화살표 주위의 여백"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "고급 찾기"
 
@@ -22206,21 +22898,29 @@ msgstr "현재 폴더"
 msgid "Current Message"
 msgstr "현재 메세지"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "그림을 고르십시오"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "세계 지도"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
-"마우스를 이용해 시간대를 선택하는 지도 위젯. 키보드 사용자는 아래의 콤보 상자"
-"를 이용해 시간대를 선택해야 합니다."
+"마우스를 이용해 시간대를 선택하는 지도 위젯. 키보드 사용자는 아래의 드롭다운 "
+"콤보 상자를 이용해 시간대를 선택해야 합니다."
+
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "인라인"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "단추 상태가 온라인입니다."
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22246,62 +22946,62 @@ msgstr "리플로우 모델"
 msgid "Column width"
 msgstr "열 너비"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "찾기"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "찾기 종류를 바꾸려면 여기를 누르십시오"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "찾기(_S)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "지금 찾기(_F)"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "비우기(_C)"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "항목 ID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "텍스트"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "보기(_W): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "찾기(_C): "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " 위치(_N) : "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "커서 행"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "커서 열"
@@ -22318,7 +23018,7 @@ msgstr "선택 모드"
 msgid "Cursor Mode"
 msgstr "커서 모드"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "지울 때(_L):"
 
@@ -22342,10 +23042,6 @@ msgstr "<b>상태 추적</b>"
 msgid "A_uto-delete sent item"
 msgstr "보낸 항목 자동으로 지우기(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "분류"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "정보 추적을 위한 보낸 항목 만들기(_E)"
@@ -22428,39 +23124,40 @@ msgstr "다음 뒤에(_A):"
 msgid "_All information"
 msgstr "모든 정보(_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "메세지 배달 지연(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "배달됨(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "만료 날짜 설정(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "기한(_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "편리한 때에(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "열면(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
@@ -22505,23 +23202,23 @@ msgstr "포커스한 열"
 msgid "Unselected Column"
 msgstr "선택 해제한 열"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "취소선 열"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "밑줄 열"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "굵은 글자 열"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "색깔 있는 열"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "배경색 열"
 
@@ -22559,7 +23256,7 @@ msgid "A_vailable Fields:"
 msgstr "사용 가능한 필드(_V):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "증가"
 
@@ -22572,7 +23269,7 @@ msgid "Clear _All"
 msgstr "모두 지우기(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "감소"
 
@@ -22635,14 +23332,14 @@ msgstr "정렬(_S)..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "끌어놓기 코드"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "완전한 제목"
 
@@ -22659,7 +23356,7 @@ msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr ""
-"표에 열을 더하려면, 열을 표시할\n"
+"표에 열을 추가하려면, 열을 표시할\n"
 "위치에 열을 끌어 놓으십시오."
 
 #: ../widgets/table/e-table-group-container.c:345
@@ -22674,293 +23371,491 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d개 항목)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "행에 색 교차"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "가로 격자 그리기"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "세로 격자 그리기"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "포커스 그리기"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "커서 모드"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "선택 모델"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "길이 한계치"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "행 높이 통일"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "고정"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "현재 뷰 사용자 설정하기"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "오름차순 정렬 (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "내림차순 정렬(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "정렬 안함(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "이 범위로 묶음(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "상자로 묶음(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "열 지우기(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "열 추가(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "정렬(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "자동 맞춤(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "열 형식(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "현재 보기 사용자 설정(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "정렬 기준(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "글꼴 설명"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "정렬 정보"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "트리"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "테이블 헤더"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "테이블 모델"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "커서 행"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "언제나 찾기"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "추가하려면 누르기 사용"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
 msgid "ETree table adapter"
 msgstr "ETree 테이블 어댑터"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
 msgid "Retro Look"
 msgstr "리트로 모양"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
 msgid "Draw lines and +/- expanders."
 msgstr "선과 +/- 확장 버튼을 그립니다."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "입력기"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "이벤트 처리기"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "굵은 글씨"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "취소선"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "연결"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "맞춤"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "자르기 너비"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "자르기 높이"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "자르기"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "자르기 사각형"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "가로 오프셋"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "세로 오프셋"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "텍스트 너비"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "텍스트 높이"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
-msgstr "타원 사용"
+msgstr "말줄임표 사용"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
-msgstr "타원"
+msgstr "말줄임표"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "줄 바꿈"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "끊김 문자"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "최대 줄 수"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "테두리 그리기"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "줄바꿈 허용"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "배경 그리기"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "단추 그리기"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "커서 위치"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "입력기 컨텍스트"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "팝업 처리"
 
+#~ msgid "Permission Denied."
+#~ msgstr "권한이 거부되었습니다."
+
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>표시</b>"
+
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>서버 정보</b>"
+
+#~ msgid "Unknown reason"
+#~ msgstr "알 수 없는 이유"
+
+#~ msgid "Open File"
+#~ msgstr "파일 열기"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "&quot;{0}&quot; 파일을 열 수 없습니다."
+
+#~ msgid "Attach original message"
+#~ msgstr "원문 첨부"
+
+#~ msgid "Do not quote original message"
+#~ msgstr "원문 인용하지 않음"
+
+#~ msgid "Quote original message"
+#~ msgstr "원문 인용"
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "이 서명의 이름을 입력하십시오."
+
+#~ msgid "Name:"
+#~ msgstr "이름:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr "정말로 &quot;{0}&quot; 폴더의 지운 메세지를 완전히 비우시겠습니까?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "&quot;{0}&quot;을(를) 지우시겠습니까?"
+
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "&quot;{0}&quot; 찾기 폴더 안의 메세지를 지우시겠습니까?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "현재 폴더에만(_C)"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "첨부 알림 플러그인 사용"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "첨부 알림 플러그인 사용."
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "첨부 없음 알리기(_M)"
+
+#~ msgid "_Continue Editing"
+#~ msgstr "편집 계속(_C)"
+
+#~ msgid "_Refresh:"
+#~ msgstr "새로 고침(_R):"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "이 플러그인은 설정 옵션이 없습니다."
+
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr "편지 작성에서 인쇄할 수 있는 옵션 사용."
+
+#~ msgid "Print Message"
+#~ msgstr "메세지 인쇄"
+
+#~ msgid "Prints the message"
+#~ msgstr "메세지를 인쇄합니다"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "현재 프린터 설정의 설명 문자열."
+
+#~ msgid "No folder name specified."
+#~ msgstr "폴더 이름을 지정하지 않았습니다."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "폴더 이름에 리턴 문자가 들어갈 수 없습니다."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "폴더 이름에 \"/\" 문자가 들어갈 수 없습니다."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "폴더 이름에 \"#\" 문자가 들어갈 수 없습니다."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' 과 '..'는 쓸 수 없는 폴더 이름입니다."
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "선택한 사항을 클립보드로 복사합니다"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "선택한 사항을 클립보드로 잘라냅니다"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "클립보드에서 붙여 넣습니다"
+
+# event -> 행사, Microsoft Office XP 참고
+#~ msgid "All Day Event"
+#~ msgstr "하루 종일 행사"
+
+#~ msgid "Send _Options"
+#~ msgstr "보내기 옵션(_O)"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "서명만 남기고 모두 지웁니다"
+
+#~ msgid "For_mat"
+#~ msgstr "형식(_M)"
+
+#~ msgid "HT_ML"
+#~ msgstr "HTML(_M)"
+
+#~ msgid "Open a file"
+#~ msgstr "파일을 엽니다"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP 암호화"
+
+#~ msgid "PGP Sign"
+#~ msgstr "PGP 서명"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "S/MIME 암호화"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "S/MIME 서명"
+
+#~ msgid "Save As"
+#~ msgstr "다른 이름으로 저장"
+
+#~ msgid "Save Draft"
+#~ msgstr "임시 보관함에 저장"
+
+#~ msgid "Save in folder..."
+#~ msgstr "폴더로 저장..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "메세지를 지정한 폴더로 저장합니다"
+
+#~ msgid "Send"
+#~ msgstr "보내기"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "메일을 HTML형식으로 보냄"
+
+#~ msgid "_Delete all"
+#~ msgstr "모두 지우기(_D)"
+
+#~ msgid "_Open..."
+#~ msgstr "열기(_O)..."
+
+#~ msgid "C_lose"
+#~ msgstr "닫기(_L)"
+
+#~ msgid "H_TML"
+#~ msgstr "HTML(_T)"
+
+#~ msgid "Save and _Close"
+#~ msgstr "저장 후 닫기(_C)"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "이 파일을 저장하고 창을 닫습니다"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "구독 폴더의 목록에 폴더를 더합니다"
+
+#~ msgid "Refresh List"
+#~ msgstr "목록 다시읽음"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "폴더 목록을 다시 읽습니다"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "구독 폴더의 목록에서 폴더를 지웁니다"
+
+#~ msgid "Subscribe"
+#~ msgstr "구독"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "구독 중지"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "선택 반전(_I)"
+
+#~ msgid "Status Details"
+#~ msgstr "상태 자세히"
+
+#~ msgid "Time Zone"
+#~ msgstr "시간대"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "시간대 콤보 상자"
+
 #~ msgid ""
 #~ "The address book {0} is read only, thus you cannot add contacts there. "
 #~ "Select other address book, please."
@@ -23031,9 +23926,6 @@ msgstr "팝업 처리"
 #~ msgid "System error: %s"
 #~ msgstr "시스템 오류: %s"
 
-#~ msgid "Camel error: %s"
-#~ msgstr "Camel 오류: %s"
-
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "전자메일을 보낼 수 없는 계정입니다"
 
@@ -23107,18 +23999,12 @@ msgstr "팝업 처리"
 #~ msgid "Di_sable"
 #~ msgstr "사용하지 않음(_S)"
 
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "스마일리 자동 인식"
-
 #~ msgid "HTML Mail"
 #~ msgstr "HTML 메일"
 
 #~ msgid "Select a (48*48) png of size < 720bytes"
 #~ msgstr "크기가 720바이트보다 작은 (48*48) PNG를 고르십시오"
 
-#~ msgid "_Phone List"
-#~ msgstr "전화 목록(_P)"
-
 #~ msgid "<- _Remove"
 #~ msgstr "<- 지우기(_R)"
 
diff --git a/po/nb.po b/po/nb.po
index 7b930504bc..85994d9dcc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.23.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-09 13:59+0200\n"
-"PO-Revision-Date: 2008-07-09 14:08+0200\n"
+"POT-Creation-Date: 2008-07-29 12:10+0200\n"
+"PO-Revision-Date: 2008-07-29 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -337,11 +337,9 @@ msgstr "aktiver"
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr ""
-"«{0}» er en skrivebeskyttet adressebokkilde. Bytt til kontaktvisning og merk "
-"en adressebok som kan motta kontakter."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr "«{0}» er en skrivebeskyttet adressebok og kan ikke endres. Velg en annen adressebok fra sidelinjen i kontaktvisning."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -389,7 +387,7 @@ msgstr "Kunne ikke fjerne adressebok."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Foreløpig kan du kun aksessere systemadresseboken for GroupWise fra "
 "Evolution. Vennligst bruk en annen GroupWise-klient en gang for å få tak i "
@@ -511,11 +509,8 @@ msgstr ""
 "for best ytelse."
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr ""
-"Du har ikke tilstrekkelige rettigheter til å slette kontakter i denne "
-"adresseboken."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Du har ikke rettigheter til å slette kontakter i denne adresseboken."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -556,7 +551,7 @@ msgstr "Br_uk som den er"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -644,8 +639,9 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
@@ -662,7 +658,7 @@ msgstr "På denne datamaskinen"
 #: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
 #: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1055
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Personlig"
 
@@ -725,7 +721,7 @@ msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generelt"
@@ -746,12 +742,12 @@ msgstr "Autentisering"
 
 #: ../addressbook/gui/component/addressbook-config.c:977
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
 #: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Søker"
 
@@ -765,12 +761,12 @@ msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrerer..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
@@ -852,10 +848,10 @@ msgstr "Lagre som vCard..."
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
 #: ../calendar/gui/calendar-component.c:620
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/e-calendar-table.c:1588
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -1237,7 +1233,7 @@ msgstr "kort"
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "minutter"
 
@@ -1343,7 +1339,7 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Arbeid"
 
@@ -1365,9 +1361,9 @@ msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -1470,7 +1466,7 @@ msgstr "Adresse"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2795,7 +2791,7 @@ msgstr "_Medlemmer"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Bok"
 
@@ -2889,7 +2885,7 @@ msgstr[1] "%d kontakter"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Spør"
 
@@ -2900,7 +2896,7 @@ msgstr "Feil under henting av bokvisning"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2932,8 +2928,8 @@ msgid "Save as vCard..."
 msgstr "Lagre som vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -2984,19 +2980,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "_Flytt til adressebok..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2045
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopier"
 
@@ -3193,11 +3188,11 @@ msgstr "Nettside"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Bredde"
@@ -3208,11 +3203,11 @@ msgstr "Bredde"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Høyde"
@@ -3242,7 +3237,14 @@ msgstr "Maksimal lengde på feltnavn"
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr "\n\nSøker etter kontakter..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3256,7 +3258,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3270,7 +3272,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3280,7 +3282,7 @@ msgstr ""
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3290,7 +3292,7 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -3320,7 +3322,7 @@ msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
@@ -3384,8 +3386,7 @@ msgstr "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
@@ -3407,13 +3408,13 @@ msgid "Web Log"
 msgstr "Nettdagbok"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Bryllupsdag"
@@ -3460,7 +3461,7 @@ msgstr "Egen kontaktinformasjon er ikke definert"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
@@ -3485,8 +3486,8 @@ msgstr "Protokollen er ikke støttet"
 #: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -4081,20 +4082,16 @@ msgstr "Uhåndtert feil"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
-msgstr ""
-"«{0}» er en skrivebeskyttet kalenderkilde. Bytt til en kalender som kan motta "
-"avtaler."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr "«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen kalender fra sidelinjen i kalendervisning."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr ""
-"«{0}» er en skrivebeskyttet kalenderkilde. Bytt til kalendervisning og merk "
-"en kalender som kan motta avtaler."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr "«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen kalender som kan motta avtaler."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4353,8 +4350,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "Notatlisten er ikke merket for frakoblet bruk"
+msgid "The memo list is not marked for offline usage."
+msgstr "Notatlisten er ikke merket for frakoblet bruk."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4451,7 +4448,6 @@ msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
 #: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
-#: ../ui/evolution-editor.xml.h:23
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -4516,7 +4512,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
@@ -4570,7 +4566,7 @@ msgid "Memos"
 msgstr "Notater"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
 #: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
 #: ../calendar/gui/tasks-component.c:540
 #: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
@@ -4610,7 +4606,7 @@ msgstr[1] "minutter"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "timer"
@@ -4627,10 +4623,10 @@ msgstr "Avtaler"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Plassering:"
 
@@ -4639,14 +4635,15 @@ msgid "Snooze _time:"
 msgstr "Utsett-_tid:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "R_ediger"
 
@@ -4659,7 +4656,7 @@ msgid "location of appointment"
 msgstr "lokasjon for avtalen"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
@@ -4677,13 +4674,13 @@ msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4695,7 +4692,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4712,7 +4709,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -5262,7 +5259,7 @@ msgstr "Slett hendelser eldre enn"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dager"
@@ -5294,14 +5291,14 @@ msgstr "_Ny kalender"
 
 #: ../calendar/gui/calendar-component.c:617
 #: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2090
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopier..."
 
 #: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:2034
 #: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Egenska_per..."
@@ -5424,7 +5421,7 @@ msgid "Competition"
 msgstr "Konkurranse"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:340
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -5517,20 +5514,19 @@ msgid "Phone Calls"
 msgstr "Telefonsamtaler"
 
 #: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:339
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
 #: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:338 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Offentlig"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
+#: ../calendar/gui/dialogs/event-editor.c:298
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
@@ -5552,7 +5548,7 @@ msgstr "Strategier"
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/tasktypes.xml.h:40
 #: ../plugins/save-calendar/csv-format.c:361
 msgid "Summary"
 msgstr "Sammendrag"
@@ -5618,7 +5614,7 @@ msgstr "Tilgang nektet ved åpning av kalender"
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Rediger varsel"
 
@@ -5722,6 +5718,7 @@ msgid "hour(s)"
 msgstr "time(r)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -5740,7 +5737,6 @@ msgstr "Le_gg til"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Varsel"
 
@@ -5818,7 +5814,7 @@ msgid "Display"
 msgstr "Vis"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Fredag"
@@ -5834,7 +5830,7 @@ msgstr ""
 "Dager"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Mandag"
@@ -5858,7 +5854,7 @@ msgstr ""
 "Søndag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -5868,7 +5864,7 @@ msgid "S_un"
 msgstr "S_ø."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Lørdag"
@@ -5886,7 +5882,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Søndag"
@@ -5905,7 +5901,7 @@ msgid "Template:"
 msgstr "Mal:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torsdag"
@@ -5920,13 +5916,13 @@ msgid "Time format:"
 msgstr "Tidformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tirsdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -6099,39 +6095,39 @@ 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:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " til "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1772
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
 #: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
@@ -6139,117 +6135,259 @@ msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Rediger avtale"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Møte- %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Avtale - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tildelt oppgave - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Oppgave - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Notat - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Ingen sammendrag"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Klikk her for å lukke dette vinduet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Kopier valgt tekst til utklippstavlen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Klipp ut valgt tekst til utklippstavlen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "klikk her for å vise tilgjengelig hjelp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Lim inn tekst fra utklippstavlen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Klikk her for å lagre dette vinduet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Velg all tekst"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "K_lassifisering"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_Fil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "Sett _inn"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Alternativer"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "_Vis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Vedlegg..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "klikk her for å legge ved en fil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Kategorier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Slår av/på visning av kategorier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Tids_sone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Slår av/på visning av tidssone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "O_ffentlig"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Klassifiser som offentlig"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Klassifiser som privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Konfidensiell"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Klassifiser som konfidensiell"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "R_olle-felt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Slår av/på visning av rolle-feltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Slår av/på visning av RSVP-feltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "_Status-felt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Slår av/på visning av status-feltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "_Type felt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Slår av/på visning av deltakertype-feltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Siste doku_menter"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Legg ved"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> vedlegg"
 msgstr[1] "<b>%d</b> vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Skjul ve_dleggsfelt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Legg til vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Vis vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Trykk mellomrom for å slå av/på vedleggsfeltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Rediger avtale"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Møte- %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Avtale - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tildelt oppgave - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Oppgave - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Notat - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Ingen sammendrag"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -6330,117 +6468,168 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "V_arsel"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Klikk her for å sette eller fjerne varsling for denne hendelsen"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "Gjeninnt_reffelse"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Gjør denne hendelsen til repeterende"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Alternativer for sending"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Sett inn avanserte alternativer for sending"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Avtale som varer hele _dagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Slår av/på hendelser som varer hele dagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Vis tiden som _opptatt"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Slår av/på visning av tid som opptatt"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Ledig/opptatt"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "Av_tale"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Legg til"
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dager før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timer før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Tilpass"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
 #: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
@@ -6450,7 +6639,7 @@ msgstr "Tilpass"
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6530,16 +6719,16 @@ msgstr "Ko_ntakter..."
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
@@ -6560,7 +6749,7 @@ msgid "_Description:"
 msgstr "_Beskrivelse:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -6601,18 +6790,18 @@ msgstr "Denne og fremtidige instanser"
 msgid "All Instances"
 msgstr "Alle instanser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "på"
 
@@ -6620,7 +6809,7 @@ msgstr "på"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "første"
 
@@ -6629,7 +6818,7 @@ msgstr "første"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "sekund"
 
@@ -6637,7 +6826,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "tredje"
 
@@ -6645,7 +6834,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "fjerde"
 
@@ -6653,13 +6842,13 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -6667,7 +6856,7 @@ msgstr "Annen dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "Første til tiende"
 
@@ -6675,7 +6864,7 @@ msgstr "Første til tiende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -6683,45 +6872,45 @@ msgstr "ellevte til tjuende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "tjueførste til trettiførste"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "dag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg å endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg å slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -6772,12 +6961,12 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Nettside"
 
@@ -6795,8 +6984,8 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 #: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:365
@@ -6805,8 +6994,8 @@ msgstr "Fullført"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:360 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Høy"
 
@@ -6815,22 +7004,22 @@ msgstr "Høy"
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:362 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1061
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
@@ -6838,8 +7027,8 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Ikke startet"
@@ -6853,7 +7042,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -6870,25 +7059,38 @@ msgstr "_Prioritet:"
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Detaljert _status"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Klikk for å endre/vise detaljer om status for oppgaven"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Alternativer for _sending"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 #: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -6990,14 +7192,13 @@ msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
-#: ../shell/e-shell-folder-title-bar.c:586
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -7035,7 +7236,7 @@ msgstr "Ferdig-dato:"
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
@@ -7053,12 +7254,12 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:612
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Opptatt"
@@ -7098,9 +7299,9 @@ msgstr "Nei"
 #: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
 #: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
+#: ../plugins/itip-formatter/itip-formatter.c:2047
 #: ../plugins/plugin-manager/plugin-manager.c:73
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Ukjent"
@@ -7126,9 +7327,9 @@ msgstr "Velg mappe å lagre valgte vedlegg i..."
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
@@ -7146,126 +7347,152 @@ msgstr "_Lagre utvalg"
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:330
+msgid "* No Summary *"
+msgstr "* Ingen sammendrag *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisator: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisator: %s"
+
+#: ../calendar/gui/e-calendar-table.c:400
+msgid "Start: "
+msgstr "Start: "
+
+#: ../calendar/gui/e-calendar-table.c:412
+msgid "Due: "
+msgstr "Ferdig: "
+
+#: ../calendar/gui/e-calendar-table.c:581
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:583
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:584
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:585
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:586
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:587
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:871
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1155
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1340
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1563
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1569
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Sk_riv ut..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1573
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1575
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1581
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1582
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1583
 msgid "_Mark as Incomplete"
 msgstr "_Merk som ikke-fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1584
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Merk valgte oppgaver som ikke-fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1826
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
@@ -7358,7 +7585,7 @@ msgstr "_Videresend som iCalendar..."
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7376,26 +7603,14 @@ msgstr "Slett denne _hendelsen"
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisator: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisator: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Plassering: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -7565,12 +7780,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
@@ -7578,7 +7793,7 @@ msgstr "Akseptert tentativt"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Avslått"
 
@@ -7954,7 +8169,7 @@ msgstr "Tentativ"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -8696,7 +8911,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
@@ -10313,16 +10528,12 @@ msgstr "Le_gg ved"
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
-#: ../composer/e-composer-actions.c:472 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Vedlegg..."
-
 #: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
 #: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -10330,7 +10541,7 @@ msgstr "L_ukk"
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1343
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
@@ -10371,10 +10582,6 @@ msgstr "S_end"
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../composer/e-composer-actions.c:528 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Alternativer for _sending"
-
 #: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Sett inn alternativer for sending"
@@ -10499,10 +10706,6 @@ msgstr "_Til-felt"
 msgid "Toggles whether the To field is displayed"
 msgstr "Slå av/på visning av Til-feltet"
 
-#: ../composer/e-composer-actions.c:700 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Legg ved"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
@@ -10767,7 +10970,7 @@ msgstr "_Lagre melding"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-post og kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
@@ -11210,7 +11413,7 @@ msgstr "tiden du spesifiserer"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "uker"
 
@@ -11280,10 +11483,10 @@ msgstr "Brukervalg-kontroll for Evolution e-post"
 msgid "Evolution Network configuration control"
 msgstr "Konfigurasjonskontroll for nettverk i Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
@@ -11342,7 +11545,7 @@ msgstr "Spør for hver melding"
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
@@ -11354,7 +11557,7 @@ msgstr "Se etter _nye meldinger hver(t)"
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
@@ -11363,7 +11566,7 @@ msgid "Defaults"
 msgstr "Forvalg"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sikkerhet"
@@ -11415,18 +11618,18 @@ msgstr "Legg til signaturskript"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: ../mail/em-composer-utils.c:1007 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1819
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. 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:1866
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11434,7 +11637,7 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
@@ -11535,7 +11738,7 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Viktig"
 
@@ -11747,11 +11950,11 @@ msgstr "Viktige meldinger"
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Søk i alle kontoer"
 
@@ -11802,27 +12005,27 @@ msgstr "Søkemapper"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Skisser"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
+#: ../mail/em-folder-tree-model.c:507 ../mail/em-folder-tree.c:2556
 #: ../mail/mail-component.c:160
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Laster..."
 
@@ -11841,85 +12044,78 @@ msgstr "Laster..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:371
+#: ../mail/em-folder-tree.c:380
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2082 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Vis"
-
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
@@ -11928,13 +12124,13 @@ msgstr "_Tøm papirkurven"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -11956,168 +12152,168 @@ msgstr "Opprett mappe"
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Videresend"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Merk som uv_iktig"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "_Etikett"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Søkemappe ba_sert på emne"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Søkemappe basert på se_nder"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Søkemappe basert på mottake_re"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Søkemappe basert på e-post_liste"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filter basert på em_ne"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filter basert på sen_der"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filter basert på motta_kere"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filter basert på e-_postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Henter melding..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "R_ing til..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Opprett _søkemappe"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
@@ -12407,7 +12603,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
@@ -12555,71 +12751,87 @@ msgid "No Junk plugin available"
 msgstr "Ingen tillegg for uønsket e-post tilgjengelig"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Senere"
 
-#: ../mail/em-migrate.c:1210
-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 ""
-"Lokasjon og hierarki for Evolutions e-postmapper er endret siden Evolution 1."
-"x.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrerer «%s»:"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+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 ""
+"Lokasjon og hierarki for Evolutions e-postmapper er endret siden Evolution 1."
+"x.\n"
+"\n"
+"Vennligst vent mens Evolution migrere dine mapper..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
 "tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Klarte ikke å opprette katalog for bevaring av data på POP3-tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kan ikke kopiere data for bevaring på POP3-tjener: «%s»: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Sammendragsformat for Evolutions e-postmapper bruker sqlite fra Evolution 2.24.\n"
+"\n"
+"Vennligst vent mens Evolution migrere dine mapper..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12889,7 +13101,7 @@ msgstr "Katalog for å lagre komponentfiler for e-post."
 
 #: ../mail/evolution-mail.schemas.in.h:40
 msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr ""
+msgstr "Slå av eller på bruk av ellipse for mappenavn i mappetreet"
 
 #: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
@@ -13644,142 +13856,148 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Maler"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "Feil"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "Feil"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "Advarsler og feil"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "Feil, advarsler og feilsøkingsmeldinger"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "Feilsøkingslogger"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "Vis f_eil i statuslinjen i"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1743
 msgid "second(s)."
 msgstr "sekund(er)."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "Loggmeldinger:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Tid"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2429
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
@@ -14030,8 +14248,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer _utgående meldinger digitalt (som forvalg)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "Ikke formatter tekstinnhold i meldinger hvis st_ørrelsen overstiger"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Ikke formater meldinger når st_ørrelsen overstiger"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
@@ -14167,18 +14385,22 @@ msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Alternativet vil ignoreres hvis det finnes treff for egendefinerte meldingshoder for uønsket e-post."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14186,7 +14408,7 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14194,7 +14416,7 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 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 "
@@ -14204,115 +14426,115 @@ msgstr ""
 "må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "S_OCKS-vert:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "Kun søk etter bilde av avsender i lokale adressebøker"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Tabell med signaturer"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14320,7 +14542,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14330,13 +14552,6 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Dette alternativet vil overstyres hvis det finnes treff for egendefinerte "
-"meldingshoder for uønsket e-post."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14354,7 +14569,7 @@ msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
@@ -14433,7 +14648,7 @@ msgid "_Path:"
 msgstr "S_ti:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
 #: ../mail/mail-config.glade.h:179
@@ -14529,43 +14744,43 @@ msgstr "_Skill mellom små/store bokstaver"
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "F_inn:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ingen valgt"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14573,19 +14788,19 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
@@ -14831,11 +15046,6 @@ msgstr "Operasjon avbrutt av bruker."
 msgid "_Save and Close"
 msgstr "L_agre og lukk"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Fil"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Rediger signatur"
@@ -15501,78 +15711,79 @@ msgstr "T_øm"
 msgid "_Open Messages"
 msgstr "_Åpne meldinger"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3884
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4170
+#: ../mail/message-list.c:4176
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15580,7 +15791,7 @@ msgstr ""
 "Ingen meldinger passer dine søkekriterier. Du kan enten tømme søket med "
 "menyoppføringen Søk->Tøm eller endre det."
 
-#: ../mail/message-list.c:4172
+#: ../mail/message-list.c:4178
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -15698,6 +15909,7 @@ msgstr ""
 "påminnelse om vedlegg."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Nøkkelord"
 
@@ -15968,8 +16180,7 @@ msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du svarer på e-post"
 
 #: ../plugins/bbdb/bbdb.c:571
@@ -15982,11 +16193,8 @@ msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr ""
-"Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin periodisk"
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -16070,7 +16278,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
 
@@ -16092,7 +16300,7 @@ msgstr "Gir kjernefunksjoner for lokale kalendere."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:381
 msgid "Re_fresh:"
 msgstr "O_ppdater"
 
@@ -16232,10 +16440,26 @@ msgstr ""
 "Gir grunnleggende funksjonalitet for markering av forvalgt kalender eller "
 "adressebok."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
 msgstr "E_gendefinert meldingshode"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Nøkkel"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Verdier"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "Egendefinert meldingshode i e-post"
@@ -16612,7 +16836,7 @@ msgstr "Mappestørrelse"
 msgid "User"
 msgstr "Bruker"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Abonner på annen brukers mappe"
@@ -16943,10 +17167,14 @@ msgid "Could not update out-of-office state"
 msgstr "Kunne ikke oppdatere «ute fra kontoret»-tilstand"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange-kontoen er frakoblet."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16974,32 +17202,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Kunne ikke oppdatere delegater:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Mappen eksisterer allerede"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Mappen eksisterer ikke"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Mappen er frakoblet"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Global katalogtjener kan ikke nås"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17007,72 +17235,72 @@ msgstr ""
 "Hvis OWA bruker en annen sti må denne oppgis i konfigurasjonsdialogen for "
 "kontoen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "E-postboks for {0} er ikke på denne tjeneren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Se til at URL-en er riktig og prøv igjen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Se til at tjenernavnet er stavet riktig og prøv igjen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "Se til at brukernavnet og passordet er riktig og prøv igjen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Ingen global katalogtjener er konfigurert for denne kontoen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Ingen postboks for bruker {0} på {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Bruker {0} finnes ikke"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Endring av passord fullført."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Vennligst oppgi ID for delegat eller fjern valget for å sende som delegat."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Vennlist sjekk at navnet på Global Catalog Server er korrekt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Vennligst start Evolution på nytt for at endringene skal aktiveres"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Velg en bruker."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Tjeneren avslo passordet fordi det er for svakt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange-kontoen vil bli deaktivert når du avslutter Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange-kontoen vil bli fjernet når du avslutter Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange-tjeneren samspiller ikke med Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17080,7 +17308,7 @@ msgstr ""
 "Denne tjeneren kjører Exchange 5.5. Exchange Connector \n"
 "støtter bare Microsoft Exchange 2000 og 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17094,59 +17322,59 @@ msgstr ""
 "\n"
 "Eller du kan ha skrevet inn feil passord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Prøv igjen med et annet passord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Klarte ikke å legge til bruker i listen over tilgangskontroll:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Klarte ikke å redigere delegater."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Ukjent feil ved oppslag av {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Ukjent type"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Operasjonen er ikke støttet"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Du nærmer deg den tilgjengelige kvoten for lagring av e-post på denne "
 "tjeneren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Du kan kun sende en melding på vegne av en bruker om gangen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Du kan ikke gjøre deg selv til din egen delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Du har overgått din kvote for lagring av e-post på denne tjeneren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Du kan bare konfigurere en Exchange-konto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17154,14 +17382,14 @@ msgstr ""
 "Din nåværende bruk er: {0} KB. Prøv å frigjøre litt plass ved å slette noen "
 "meldinger."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "Din nåværende bruk er: {0} KB. Du vil ikke kunne sende eller motta e-post nå."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17169,19 +17397,19 @@ msgstr ""
 "Din nåværende bruk er: {0} KB. Du vil ikke kunne sende e-post før du frigjør "
 "litt plass ved å slette noen meldinger."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Passordet ditt har forfallt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} kan ikke legges til i listen over tilgangskontroll"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} er allerede en delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} finnes allerede på listen"
 
@@ -17302,14 +17530,29 @@ msgstr "Fjern abonnement på mapper"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+msgid "<b>Server</b>"
+msgstr "<b>Tjener</b> "
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+msgid "Update every"
+msgstr "Oppdaterer hver"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Et tillegg for å sette opp kalenderressurser fra Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Et tillegg for å sette opp kalenderressurser og kontakter fra Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17418,12 +17661,6 @@ msgstr "Kall tilbake e-post"
 msgid "Add Send Options to groupwise messages"
 msgstr "Legg til sendingsalternativer for GroupWise-meldinger"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Alternativer for sending"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Tillegg for funksjoner vedrørende GroupWise-kontoer."
@@ -17486,14 +17723,18 @@ msgid "This is a recurring meeting"
 msgstr "Dette er et repeterende møte"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "Hva ønsker du å {0}?"
+msgid "Would you like to accept it?"
+msgstr "Vil du godta den?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "Vil du avslå den?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "Du kan ikke dele en mappe med oppgitt bruker &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Du må oppgi et brukernavn du ønsker å legge til på listen"
 
@@ -18000,31 +18241,31 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
@@ -18457,42 +18698,42 @@ msgid "_Update"
 msgstr "_Oppdater"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Start-tid:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Slutt-tid:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "Send sva_r til avsender"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "B_ruk på alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Oppgaver :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Notater :"
 
@@ -18600,12 +18841,20 @@ msgstr "Om ikonet skal blinke eller ikke."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Im nye meldinger kun skal varsles i innboksen."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+msgid "Evolution's Mail Notification"
+msgstr "Varsling om ny e-post for Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+msgid "Mail Notification Properties"
+msgstr "Egenskaper for varsling om ny e-post"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18620,55 +18869,55 @@ msgstr[1] ""
 "Du har mottatt %d nye meldinger\n"
 "i %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har mottatt %d ny melding."
 msgstr[1] "Du har mottatt %d nye meldinger."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "B_linkende ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "_Spill en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "Sp_ill"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
@@ -19262,7 +19511,6 @@ msgid "MIME Type"
 msgstr "MIME-type"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Lagre"
 
@@ -19467,6 +19715,28 @@ msgstr "Vis meldingstråder etter emne"
 msgid "F_all back to threading messages by subject"
 msgstr "F_all tilbake til tråding av meldinger etter emne"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "Liste med nøkkelord-/verdi-par for mal-tillegg for å sette inn i en meldingskropp."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Ingen tittel"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Lagre som _mal"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Lagre som mal"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Tillegg for å lage maler av skisser"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Et enkelt tillegg som buker ytnef til å dekode tnef-vedlegg."
@@ -19833,29 +20103,9 @@ msgstr "Importer en en_kelt fil"
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Ingen mappenavn spesifisert."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Mappenavn kan ikke inneholde linjeskift."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Mappenavn kan ikke inneholde tegnet «/»."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Mappenavn kan ikke inneholde tegnet «#»."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "«.» og «..» er reserverte mappenavn."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19881,45 +20131,51 @@ msgstr "Bug buddy kunne ikke kjøres."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Feil under åpning av nettside med ofte stilte spørsmål"
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
+"Evolution er koblet til.\n"
+"Klikk på denne knappen for å arbeide frakoblet."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
+"Evolution er frakoblet.\n"
+"Klikk på denne knappen for å arbeide tilkoblet."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
@@ -19949,9 +20205,9 @@ msgstr "Kan ikke registrere i OAF"
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Ny"
 
@@ -20871,7 +21127,7 @@ msgstr "Lagre kontakter i valgt mappe som VCard"
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Velg _alle"
 
@@ -21078,192 +21334,6 @@ msgstr "Arbeidsuke"
 msgid "_Open Appointment"
 msgstr "_Åpne avtale"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "klikk her for å legge ved en fil"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Klikk her for å lukke dette vinduet"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Klikk her for å lagre dette vinduet"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "klikk her for å vise tilgjengelig hjelp"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Lukk"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopier valgt tekst til utklippstavlen"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Klipp ut valgt tekst til utklippstavlen"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "Sett i_nn"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Lim inn tekst fra utklippstavlen"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Velg all tekst"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Alternativer"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Avtale som varer hele dagen"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Avtale som varer hele _dagen"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Klassifiser som konfidensiell"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Klassifiser som privat"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Klassifiser som offentlig"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klikk her for å sette eller fjerne varsling for denne hendelsen"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Sett inn avanserte alternativer for sending"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Gjør denne hendelsen til repeterende"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "O_ffentlig"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "R_olle-felt"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Alter_nativer for sending"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Vis tiden som _opptatt"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Tids_sone"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Slår av/på visning av deltaker-feltet"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Slår av/på visning av RSVP-feltet"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Slår av/på visning av rolle-feltet"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Slår av/på visning av status-feltet"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Slår av/på visning av tidssone"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Slår av/på visning av kategorier"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Slår av/på hendelser som varer hele dagen"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Slår av/på visning av tid som opptatt"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "V_arsel"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorier"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "K_lassifisering"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Konfidensiell"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Ledig/opptatt"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privat"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "Gjeninnt_reffelse"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Status-felt"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Type felt"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
@@ -21965,6 +22035,10 @@ msgstr "_Zoom"
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Lukk"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
@@ -22001,22 +22075,6 @@ msgstr "Vis valgt notat"
 msgid "_Open Memo"
 msgstr "_Åpne notat"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Klikk endre/vis status for oppgaven"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Detaljert status"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Tidssone"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Detaljert _status"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopier valgte oppgaver"
@@ -22469,36 +22527,10 @@ msgstr "Type visning"
 msgid "Type of view:"
 msgstr "Type visning:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Vedleggsfelt"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-msgid "Recent Docu_ments"
-msgstr "Siste doku_menter"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22577,16 +22609,16 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Minste bredde"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Minste bredde"
 
@@ -22850,6 +22882,14 @@ msgstr ""
 "Mus-basert interaktivt kartfelt for å velge tidssone. Tastaturbrukere må "
 "velge tiddsone fra kombinasjonsboksen nedenfor."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "Tilkoblet"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "Knappetilstanden er tilkoblet"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synkroniser med:"
@@ -22874,52 +22914,52 @@ msgstr "Oppdater modell"
 msgid "Column width"
 msgstr "Kolonnebredde"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Søk"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Klikk her for å endre søketype"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID for oppføring"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Tekst"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "_Vis: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "Sø_k: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " _i "
 
@@ -23075,14 +23115,14 @@ msgid "_When opened:"
 msgstr "_Ved åpning:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
@@ -23298,81 +23338,81 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d oppføring)"
 msgstr[1] "%s (%d oppføringer)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Skiftende farger på rader"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Horisontalt rutenett for tegning"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Vertikalt rutenett for tegning"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Tegn fokus"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Markørmodus"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Utvalgsmodell"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Lengdeterskel"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Enhetlig høyde på rad"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Frosset"
 
@@ -23448,24 +23488,24 @@ msgstr "Sorteringsinformasjon"
 msgid "Tree"
 msgstr "Tre"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Tabellhode"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modell for tabell"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Pekerrad"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Alltid søk"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Bruk klikk for å legge til"
 
diff --git a/po/ps.po b/po/ps.po
new file mode 100644
index 0000000000..f5337b68b9
--- /dev/null
+++ b/po/ps.po
@@ -0,0 +1,22868 @@
+# Pashto translation of Evolution
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the evolution package.
+# Zabeeh Khan <zabeehkhan@gmail.com>, 2008.
+#
+#: ../shell/main.c:683
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution.head\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-07-23 23:48+0200\n"
+"PO-Revision-Date: 2008-07-23 21:37-0800\n"
+"Last-Translator: Zabeeh Khan <zabeehkhan@gmail.com>\n"
+"Language-Team: Pashto <pathanisation@goolgegroups.com>\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);\n"
+"X-Poedit-Language: Pashto, Pushto\n"
+"X-Poedit-Country: AFGHANISTAN\n"
+
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution addressbook"
+msgstr "اېوليوشن پته کتاب"
+
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:228
+msgid "New Contact"
+msgstr "نوی اړيکلور"
+
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:236
+msgid "New Contact List"
+msgstr "نوی اړيکلور لړ"
+
+#: ../a11y/addressbook/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../a11y/addressbook/ea-minicard.c:31
+msgid "Open"
+msgstr "پرانيستل"
+
+#: ../a11y/addressbook/ea-minicard.c:141
+msgid "Contact List: "
+msgstr ":اړيکلور لړ"
+
+#: ../a11y/addressbook/ea-minicard.c:142
+msgid "Contact: "
+msgstr ":اړيکلوری"
+
+#: ../a11y/addressbook/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "اېوليوشن مينيکارډ"
+
+#: ../a11y/calendar/ea-cal-view-event.c:266
+msgid "It has alarms."
+msgstr ".دا خبرونې لري"
+
+#: ../a11y/calendar/ea-cal-view-event.c:269
+msgid "It has recurrences."
+msgstr ".دا بياپېښېدنې لري"
+
+#: ../a11y/calendar/ea-cal-view-event.c:272
+msgid "It is a meeting."
+msgstr ".دا يوه کتنه ده"
+
+#: ../a11y/calendar/ea-cal-view-event.c:278
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr ".%s کليز پېښه: لنډيز دا دی"
+
+#: ../a11y/calendar/ea-cal-view-event.c:280
+msgid "Calendar Event: It has no summary."
+msgstr ".کليز پېښه: کوم لنډيز نه لري"
+
+#: ../a11y/calendar/ea-cal-view-event.c:300
+msgid "calendar view event"
+msgstr "کليز ليد پېښه"
+
+#: ../a11y/calendar/ea-cal-view-event.c:528
+msgid "Grab Focus"
+msgstr "منځواله نيول"
+
+#: ../a11y/calendar/ea-cal-view.c:302
+msgid "New Appointment"
+msgstr "نوې ټاکنه"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "New All Day Event"
+msgstr "نوې ټوله ورځ پېښه"
+
+#: ../a11y/calendar/ea-cal-view.c:304
+msgid "New Meeting"
+msgstr "نوې کتنه"
+
+#: ../a11y/calendar/ea-cal-view.c:305
+msgid "Go to Today"
+msgstr "نن ته ورتلل"
+
+#: ../a11y/calendar/ea-cal-view.c:306
+msgid "Go to Date"
+msgstr "نېټې ته ورتلل"
+
+#: ../a11y/calendar/ea-day-view-main-item.c:303
+#: ../a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr ""
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "پېښه لري. %d دا"
+msgstr[1] "پېښې لري. %d دا"
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+msgid "It has no events."
+msgstr ".دا کومه پېښه نه لري"
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:162
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "%s .%s ‎:دنده اونۍ ليد"
+
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:168
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "%s .%s ‎:ورځ کوت"
+
+#: ../a11y/calendar/ea-day-view.c:199
+msgid "calendar view for a work week"
+msgstr "د يوې دنده اونۍ کليز ليد"
+
+#: ../a11y/calendar/ea-day-view.c:201
+msgid "calendar view for one or more days"
+msgstr "د يو يا ډېرو ورځو کليز ليد"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../calendar/gui/calendar-component.c:758
+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.
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../a11y/calendar/ea-gnome-calendar.c:200
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:217
+#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../a11y/calendar/ea-gnome-calendar.c:231
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. 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.
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:766
+msgid "Gnome Calendar"
+msgstr "جنومي کليز"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:290
+msgid "search bar"
+msgstr "پلټون پټه"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:291
+msgid "evolution calendar search bar"
+msgstr "د اېوليوشن کليز پلټون پټه"
+
+#: ../a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr "ټوپ تڼۍ"
+
+#: ../a11y/calendar/ea-jump-button.c:158
+msgid "Click here, you can find more events."
+msgstr ".دلته کېکاږﺉ، تاسو نورې پېښې هم موندلی شئ"
+
+#: ../a11y/calendar/ea-week-view.c:157
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "%s .%s ‎:مياشت ليد"
+
+#: ../a11y/calendar/ea-week-view.c:161
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "%s .%s ‎:اونۍ ليد"
+
+#: ../a11y/calendar/ea-week-view.c:192
+msgid "calendar view for a month"
+msgstr "د يوې مياشتې لپاره کليز ليد"
+
+#: ../a11y/calendar/ea-week-view.c:194
+msgid "calendar view for one or more weeks"
+msgstr "د يوې يا ډېرو اونېو لپاره کليز ليد"
+
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+msgid "popup"
+msgstr "بړبوکول"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+msgid "popup a child"
+msgstr "ماشمو بړبوکول"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+msgid "edit"
+msgstr "سمون"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+msgid "begin editing this cell"
+msgstr "د دې خونې سمول پېلول"
+
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+msgid "toggle"
+msgstr "څرنګتياونج"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+msgid "toggle the cell"
+msgstr "خونه څرنګتياونجول"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+msgid "expand"
+msgstr "غځول"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+msgid "expands the row in the ETree containing this cell"
+msgstr ""
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+msgid "collapse"
+msgstr "وېجاړېدل"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+msgid "collapses the row in the ETree containing this cell"
+msgstr ""
+
+#: ../a11y/e-table/gal-a11y-e-cell.c:107
+msgid "Table Cell"
+msgstr "لښتيال خونه"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
+#: ../widgets/table/e-table-click-to-add.c:581
+msgid "click to add"
+msgstr "د زياتولو لپاره کېکاږﺉ"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+msgid "click"
+msgstr "کېکاږﺉ"
+
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+msgid "sort"
+msgstr "اڼل"
+
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../a11y/widgets/ea-calendar-item.c:306
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "%s نه تر‎ ‎%s کليز: له‎"
+
+#: ../a11y/widgets/ea-calendar-item.c:341
+msgid "evolution calendar item"
+msgstr "اېوليوشن کليز توکی"
+
+#: ../a11y/widgets/ea-combo-button.c:39
+msgid "Combo Button"
+msgstr "تړنګ تڼۍ"
+
+#: ../a11y/widgets/ea-combo-button.c:49
+msgid "Activate Default"
+msgstr "تلواله چارندول"
+
+#: ../a11y/widgets/ea-combo-button.c:51
+msgid "Popup Menu"
+msgstr "بړبوکیزه غورنۍ"
+
+#: ../a11y/widgets/ea-expander.c:39
+msgid "Toggle Attachment Bar"
+msgstr "څرنګتياونج نښلن پټه"
+
+#: ../a11y/widgets/ea-expander.c:49
+msgid "activate"
+msgstr "چارندول"
+
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:3
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:4
+msgid "Address '{0}' already exists."
+msgstr ".پته د مخکې نه شتون لري '{0}'"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "نوی اړيکلوری نه شي زياتولی"
+
+#: ../addressbook/addressbook.error.xml.h:6
+msgid "Cannot move contact."
+msgstr ".اړيکلور نه شي خوځولی"
+
+#: ../addressbook/addressbook.error.xml.h:7
+msgid "Category editor not available."
+msgstr ".ټولۍ سمونګر نه شته"
+
+#: ../addressbook/addressbook.error.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/addressbook.error.xml.h:9
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Could not remove addressbook."
+msgstr "پته کتاب نه شي ړنګولی"
+
+#: ../addressbook/addressbook.error.xml.h:11
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and GroupWise Personal Contacts folders."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "Delete address book '{0}'?"
+msgstr "پته کتاب ړنګول غواړﺉ؟ ‎'{0}'"
+
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Error loading addressbook."
+msgstr ".د پته کتاب په لېښلو کې تېروتنه"
+
+#: ../addressbook/addressbook.error.xml.h:14
+msgid "Error saving {0} to {1}: {2}"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+msgid "Failed to delete contact"
+msgstr "د اړيکلوري په ړنګولو کې پاتې راغی"
+
+#: ../addressbook/addressbook.error.xml.h:17
+msgid "GroupWise Address book creation:"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:19
+msgid "Server Version"
+msgstr "د پالنګر نسخه"
+
+#: ../addressbook/addressbook.error.xml.h:20
+msgid "Some features may not work properly with your current server"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:23
+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/addressbook.error.xml.h:24
+msgid "This address book will be removed permanently."
+msgstr ".دا پته کتاب به د تل لپاره وړنګول شي"
+
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This addressbook could not be opened."
+msgstr ".دا پته کتاب نه شي پرانيستل کېدی"
+
+#: ../addressbook/addressbook.error.xml.h:26
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:28
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open addressbook"
+msgstr "پته کتاب نه شي پرانيستلی"
+
+#: ../addressbook/addressbook.error.xml.h:30
+msgid "Unable to perform search."
+msgstr ".پلټون نه شي ترسره کولی"
+
+#: ../addressbook/addressbook.error.xml.h:31
+msgid "Unable to save {0}."
+msgstr ".نه شي ساتلی ‎{0}"
+
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "Would you like to save your changes?"
+msgstr "تاسو غواړﺉ چې خپل بدلونونه وساتئ؟"
+
+#: ../addressbook/addressbook.error.xml.h:33
+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/addressbook.error.xml.h:34
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:36
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:37
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../plugins/groupwise-features/junk-settings.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Add"
+msgstr "زياتول_"
+
+#: ../addressbook/addressbook.error.xml.h:39
+msgid "_Discard"
+msgstr "بندول_"
+
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "_Do not save"
+msgstr "نه ساتل_"
+
+#: ../addressbook/addressbook.error.xml.h:41
+msgid "_Resize"
+msgstr "بياکچول_"
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "_Use as it is"
+msgstr "کارول لکه څنګه چې دی_"
+
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+msgid "{0}"
+msgstr "{0}"
+
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:46
+msgid "{1}"
+msgstr "{1}"
+
+#: ../addressbook/conduit/address-conduit.c:299
+msgid "Default Sync Address:"
+msgstr ":تلواله هممهالي پته"
+
+#: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load addressbook"
+msgstr "پته کتاب نه شي لېښلی"
+
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
+msgid "Could not read pilot's Address application block"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "خپلبشپړېدنه"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "ا_ړيکلوري"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "برېليکونه"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "خپلبشپړېدنه دلته وسازوﺉ"
+
+#. Create the contacts group
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
+msgid "Contacts"
+msgstr "اړيکلوري"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book"
+msgstr "اېوليوشن پته کتاب"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address popup"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book address viewer"
+msgstr "اېوليوشن پته کتاب پته ليدانی"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book card viewer"
+msgstr "اېوليوشن پته کتاب کارډ ليدانی"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Address Book component"
+msgstr "اېوليوشن پته کتاب رغتوکی"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr ""
+
+#. create the local source group
+#. On This Computer is always first and Search Folders is always last
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
+msgid "On This Computer"
+msgstr "په دې سولګر کې"
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. Create the default Person addressbook
+#. orange
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+msgid "Personal"
+msgstr "وګړيز"
+
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "پالنګرونو LDAP په"
+
+#: ../addressbook/gui/component/addressbook-component.c:229
+msgid "_Contact"
+msgstr "اړيکلوری_"
+
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgid "Create a new contact"
+msgstr "نوی اړيکلوری جوړول"
+
+#: ../addressbook/gui/component/addressbook-component.c:237
+msgid "Contact _List"
+msgstr "اړيکلور _لړ"
+
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgid "Create a new contact list"
+msgstr "نوی اړيکلور لړ جوړول"
+
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1192
+msgid "New Address Book"
+msgstr "نوی پته کتاب"
+
+#: ../addressbook/gui/component/addressbook-component.c:245
+msgid "Address _Book"
+msgstr "پته _کتاب"
+
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgid "Create a new address book"
+msgstr "نوی پته کتاب جوړول"
+
+#: ../addressbook/gui/component/addressbook-component.c:409
+msgid "Failed upgrading Address Book settings or folders."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:315
+msgid "Base"
+msgstr "بنسټ"
+
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+msgid "_Type:"
+msgstr ":ډول_"
+
+#: ../addressbook/gui/component/addressbook-config.c:618
+msgid "Copy _book content locally for offline operation"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:967
+#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "ټولګړي"
+
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
+msgid "Address Book"
+msgstr "پته کتاب"
+
+#: ../addressbook/gui/component/addressbook-config.c:972
+msgid "Server Information"
+msgstr "د پالنګر خبرتياوې"
+
+#: ../addressbook/gui/component/addressbook-config.c:974
+msgid "Authentication"
+msgstr "کرونه"
+
+#: ../addressbook/gui/component/addressbook-config.c:977
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "خبرتياوې"
+
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
+msgid "Searching"
+msgstr "پلټل کيږي"
+
+#: ../addressbook/gui/component/addressbook-config.c:980
+msgid "Downloading"
+msgstr "لېښل کيږي"
+
+#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/ldap-config.glade.h:11
+msgid "Address Book Properties"
+msgstr "د پته کتاب ځانتياوې"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
+msgid "Migrating..."
+msgstr "...لېږدول کيږي"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:195
+#, c-format
+msgid "Migrating `%s':"
+msgstr ":لېږدول کيږي `%s'"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:645
+msgid "LDAP Servers"
+msgstr "پالنګرونه LDAP"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:760
+msgid "Autocompletion Settings"
+msgstr "د خپلبشپړېدنې امستنې"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
+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/addressbook-migrate.c:1150
+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:1159
+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:1169
+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:430
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ":پوښۍ بيانومول \"%s\" ته"
+
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "پوښۍ بيانومول"
+
+#: ../addressbook/gui/component/addressbook-view.c:438
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "نه شي لرلی. '/' د پوښېو نومونه"
+
+#: ../addressbook/gui/component/addressbook-view.c:950
+msgid "_New Address Book"
+msgstr "نوی پته کتاب_"
+
+#: ../addressbook/gui/component/addressbook-view.c:951
+msgid "Save As vCard..."
+msgstr "...ساتل ‎vCard لکه‎"
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1347
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "ړنګول_"
+
+#: ../addressbook/gui/component/addressbook-view.c:957
+msgid "_Properties..."
+msgstr "...ځانتياوې_"
+
+#: ../addressbook/gui/component/addressbook-view.c:1345
+msgid "Contact Source Selector"
+msgstr "اړيلکلور سرچينه ټاکونکی"
+
+#: ../addressbook/gui/component/addressbook.c:99
+msgid "Accessing LDAP Server anonymously"
+msgstr "پالنګر ته بېنومه لاسرسی کول LDAP"
+
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+msgid "Failed to authenticate.\n"
+msgstr ".په کره کولو کې پاتې راغی\n"
+
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook.c:215
+#: ../calendar/common/authentication.c:51
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "تېرنويې وليکئ"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
+msgid "EFolderList XML for the list of completion URIs"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
+msgid "EFolderList XML for the list of completion URIs."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show preview pane"
+msgstr "مخليد چوکاټ ښودل"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "Vertical pane position"
+msgstr "د نېغ چوکاټ ځای"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+msgid "Whether to show the preview pane."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+msgid "1"
+msgstr "۱"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
+msgid "3268"
+msgstr "۳۲۶۸"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:3
+msgid "389"
+msgstr "۳۸۹"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:4
+msgid "5"
+msgstr "۵"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:5
+msgid "636"
+msgstr "۶۳۶‍"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+msgid "<b>Authentication</b>"
+msgstr "<b>کرونه</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+msgid "<b>Downloading</b>"
+msgstr "<b>لېښل کيږي</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:8
+msgid "<b>Searching</b>"
+msgstr "<b>پلټل کيږي</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:9
+msgid "<b>Type:</b>"
+msgstr "<b>:ډول</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:10
+msgid "Add Address Book"
+msgstr "پته کتاب زياتول"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
+msgid "Always"
+msgstr "تل"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:13
+msgid "Anonymously"
+msgstr "بېنومه"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+msgid "Basic"
+msgstr "بنسټيز"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
+msgid "Distinguished name"
+msgstr "پېژندل شوی نوم"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+msgid "Email address"
+msgstr "برېښليک پته"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid "Find Possible Search Bases"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid "Lo_gin:"
+msgstr ":نن_وتل"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../mail/em-account-editor.c:760
+msgid "Never"
+msgstr "هېڅکله"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../mail/em-account-editor.c:288
+msgid "No encryption"
+msgstr "هېڅ کوډه کښنه"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+msgid "One"
+msgstr "يو"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:296
+msgid "SSL encryption"
+msgstr "کوډه کښنه SSL"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "Search Filter"
+msgstr "پلټون چاڼ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+msgid "Search _base:"
+msgstr ":پلټون _بنسټ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search _filter:"
+msgstr ":پلټون _چاڼ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search filter"
+msgstr "پلټون چاڼ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+
+#: ../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 ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid "Sub"
+msgstr "څېرمه"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid "Supported Search Bases"
+msgstr ""
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../mail/em-account-editor.c:292
+msgid "TLS encryption"
+msgstr "کوډه کښنه TLS"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:37
+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:38
+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:39
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:40
+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:41
+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:42
+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:43
+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 ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:44
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:45
+msgid "Using email address"
+msgstr "برېښليک کاروي"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:46
+msgid "Whenever Possible"
+msgstr "هر کله چې شونی وي"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+msgid "_Add Address Book"
+msgstr "پته کتاب زياتول_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:48
+msgid "_Download limit:"
+msgstr ":د رالېښنې بريد_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:49
+msgid "_Find Possible Search Bases"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Login method:"
+msgstr "د ننوتو لېله:_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+msgid "_Name:"
+msgstr ":نوم_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:52
+msgid "_Port:"
+msgstr ":درشل_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+msgid "_Search scope:"
+msgstr ":پلټون سيمه_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+msgid "_Server:"
+msgstr ":پالنګر_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:55
+msgid "_Timeout:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+msgid "_Use secure connection:"
+msgstr ":خوندي نښلېدنه کارول_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:57
+msgid "cards"
+msgstr "کارډونه"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/calendar-http/calendar-http.c:279
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:401
+msgid "minutes"
+msgstr "مېنټه"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "<b>Email</b>"
+msgstr "<b>برېښليک</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "<b>Home</b>"
+msgstr "<b>کور</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "<b>Instant Messaging</b>"
+msgstr "<b>ژر استوزونه</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "<b>Job</b>"
+msgstr "<b>دنده</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>ګډوډ</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Other</b>"
+msgstr "<b>نور</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "<b>Telephone</b>"
+msgstr "<b>ټېلېفون</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "<b>Web Addresses</b>"
+msgstr "<b>ګورت پتې</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "<b>Work</b>"
+msgstr "<b>دنده</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "...ټو_لۍ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/widgets/e-minicard.c:198
+msgid "Contact"
+msgstr "اړيکلوری"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+msgid "Contact Editor"
+msgstr "اړيکلور سمونګر"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Full _Name..."
+msgstr "...بشپړ _نوم"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Image"
+msgstr "انځور"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+msgid "MSN Messenger"
+msgstr "استوزګر ‎MSN"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "Mailing Address"
+msgstr "استونې پته"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
+msgstr ":ستا_ېنوم"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell Groupwise"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "Personal Information"
+msgstr "وکړيزې خبرتياوې"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "Telephone"
+msgstr "ټېلېفون"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1057
+msgid "Work"
+msgstr "دنده"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr ":پته_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Anniversary:"
+msgstr ":کليزه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Assistant:"
+msgstr ":مرستيال_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Birthday:"
+msgstr ":زوکړه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:788
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1848
+msgid "_Calendar:"
+msgstr ":کليز_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_City:"
+msgstr ":ښار_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Company:"
+msgstr ":کمپنۍ_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Country:"
+msgstr ":هېواد_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Department:"
+msgstr ":برخه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_File under:"
+msgstr ":ليکل لاندې د_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_Free/Busy:"
+msgstr ":وزګار/بوخت_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Home Page:"
+msgstr ":کور پاڼه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Manager:"
+msgstr ":سمبالګر_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_Notes:"
+msgstr ":يادښتونه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+msgid "_Office:"
+msgstr ":افس_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_PO Box:"
+msgstr ":پوسټ بکس_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "_Profession:"
+msgstr ":دنده_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+msgid "_Spouse:"
+msgstr ":کورودانې_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_State/Province:"
+msgstr ":ولايت_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr ":سرليک_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+msgid "_Video Chat:"
+msgstr ":وېديو بنډار_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+msgid "_Wants to receive HTML mail"
+msgstr "ليک ترلاسه کول غواړي HTML_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+msgid "_Web Log:"
+msgstr ":ګورت خبرال_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "_Where:"
+msgstr ":چېرته_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+msgid "_Zip/Postal Code:"
+msgstr ":زېپ/پوسټي کوډ_"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
+msgid "Address"
+msgstr "پته"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
+msgid "Editable"
+msgstr "سمونوړ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+msgid "United States"
+msgstr "امرېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+msgid "Afghanistan"
+msgstr "افغانستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+msgid "Albania"
+msgstr "البانيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+msgid "Algeria"
+msgstr "الجيريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+msgid "American Samoa"
+msgstr "امريکايي سموا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "Andorra"
+msgstr "انډورا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+msgid "Angola"
+msgstr "انګولا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Anguilla"
+msgstr "انګوېلا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+msgid "Antarctica"
+msgstr "انټارکټېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+msgid "Antigua And Barbuda"
+msgstr "انټېګوا او باربوډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+msgid "Argentina"
+msgstr "ارجېنټينا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+msgid "Armenia"
+msgstr "ارمينيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+msgid "Aruba"
+msgstr "اروبا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+msgid "Australia"
+msgstr "اسټريليا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Austria"
+msgstr "اسټريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+msgid "Azerbaijan"
+msgstr "ازربايجان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Bahamas"
+msgstr "بهاماس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+msgid "Bahrain"
+msgstr "بحرېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+msgid "Bangladesh"
+msgstr "بنګلدېش"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+msgid "Barbados"
+msgstr "برباډوس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Belarus"
+msgstr "بېلاروس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Belgium"
+msgstr "بېلجيم"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+msgid "Belize"
+msgstr "بېلېز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Benin"
+msgstr "بېنېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+msgid "Bermuda"
+msgstr "برموډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Bhutan"
+msgstr "بهوټان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+msgid "Bolivia"
+msgstr "بوليويا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "Bosnia And Herzegowina"
+msgstr "بوسنيا او هرزېګوينا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Botswana"
+msgstr "بوټسوانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+msgid "Bouvet Island"
+msgstr "بوېټ ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Brazil"
+msgstr "برازيل"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+msgid "Brunei Darussalam"
+msgstr "بروني دارالسلام"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+msgid "Bulgaria"
+msgstr "بلګاريه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+msgid "Burkina Faso"
+msgstr "برکينا فاسو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Burundi"
+msgstr "بورونډې"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+msgid "Cambodia"
+msgstr "کمبوډيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+msgid "Cameroon"
+msgstr "کېمېرون"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+msgid "Canada"
+msgstr "کاناډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+msgid "Cape Verde"
+msgstr "کېپې ورډي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "Cayman Islands"
+msgstr "کېمېن ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+msgid "Central African Republic"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Chad"
+msgstr "چاډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+msgid "Chile"
+msgstr "چاېل"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "China"
+msgstr "چين"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+msgid "Christmas Island"
+msgstr "کرېسمېس ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+msgid "Colombia"
+msgstr "کولمبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+msgid "Comoros"
+msgstr "کوموروس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "Congo"
+msgstr "کونګو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+msgid "Congo, The Democratic Republic Of The"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+msgid "Cook Islands"
+msgstr "کوک ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+msgid "Costa Rica"
+msgstr "کوسټا رېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+msgid "Croatia"
+msgstr "کروټيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+msgid "Cuba"
+msgstr "کيوبا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+msgid "Cyprus"
+msgstr "سېپرس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+msgid "Czech Republic"
+msgstr "د چېک ولسواکيز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "Denmark"
+msgstr "ډېنمارک"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+msgid "Djibouti"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+msgid "Dominica"
+msgstr "ډومېنېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Ecuador"
+msgstr "اېکوېډر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+msgid "Egypt"
+msgstr "مصر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+msgid "El Salvador"
+msgstr "ال سلوېډر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+msgid "Eritrea"
+msgstr "اېرېټريه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Estonia"
+msgstr "اسټونيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Ethiopia"
+msgstr "اېټوپيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+msgid "Falkland Islands"
+msgstr "فېلکلېنډ ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+msgid "Faroe Islands"
+msgstr "فېرو ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "Fiji"
+msgstr "فېجې"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "Finland"
+msgstr "فېنلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "France"
+msgstr "فرانسه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "French Guiana"
+msgstr "فرېنچ ګويانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "French Polynesia"
+msgstr "فرېنچ پولېنيشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+msgid "Gabon"
+msgstr "ګابون"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+msgid "Gambia"
+msgstr "ګامبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+msgid "Georgia"
+msgstr "ګورجيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+msgid "Germany"
+msgstr "جرمني"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+msgid "Ghana"
+msgstr "ګانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+msgid "Gibraltar"
+msgstr "ګېبرالټر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Greece"
+msgstr "يونان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Greenland"
+msgstr "ګرينلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+msgid "Grenada"
+msgstr "ګرېناډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Guadeloupe"
+msgstr "ګواډېلوپ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Guam"
+msgstr "ګاوم"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+msgid "Guatemala"
+msgstr "ګواټيمالا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+msgid "Guernsey"
+msgstr "ګورنسي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Guinea"
+msgstr "ګوينيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
+msgstr "ګوينيا-بېساو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+msgid "Guyana"
+msgstr "ګويانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Haiti"
+msgstr "هاېټاې"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+msgid "Heard And McDonald Islands"
+msgstr "هېرډ او مېکډونلډ ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+msgid "Holy See"
+msgstr "هالي سي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+msgid "Honduras"
+msgstr "هونډوراس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Hong Kong"
+msgstr "هانګ کانګ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+msgid "Hungary"
+msgstr "هنګري"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Iceland"
+msgstr "اېسلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+msgid "India"
+msgstr "انډيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+msgid "Indonesia"
+msgstr "انډونيشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+msgid "Iran"
+msgstr "ايران"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+msgid "Iraq"
+msgstr "عراق"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+msgid "Ireland"
+msgstr "اېرېلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+msgid "Isle of Man"
+msgstr "اېسل اف مېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Israel"
+msgstr "اسرايل"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+msgid "Italy"
+msgstr "اټاليه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+msgid "Jamaica"
+msgstr "جماېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Japan"
+msgstr "جاپان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+msgid "Jersey"
+msgstr "جرسي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+msgid "Jordan"
+msgstr "جوردان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+msgid "Kazakhstan"
+msgstr "کزاکستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Kenya"
+msgstr "کينيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Kiribati"
+msgstr "کېرېبتي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Korea, Democratic People's Republic Of"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+msgid "Korea, Republic Of"
+msgstr "کوريا، ولسواکيز د"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+msgid "Kuwait"
+msgstr "کوېټ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+msgid "Kyrgyzstan"
+msgstr "کرغزستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Laos"
+msgstr "لاوس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Latvia"
+msgstr "لېټويا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+msgid "Lebanon"
+msgstr "لبنان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Lesotho"
+msgstr "لېسوټو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Liberia"
+msgstr "لېبيريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Libya"
+msgstr "ليبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+msgid "Liechtenstein"
+msgstr "لیکټنسټاېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Lithuania"
+msgstr "لېټوانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+msgid "Luxembourg"
+msgstr "لکسېمبرګ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Macao"
+msgstr "مکاو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Macedonia"
+msgstr "مېسېډونيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Madagascar"
+msgstr "مډګسکر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+msgid "Malawi"
+msgstr "ملاوي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Malaysia"
+msgstr "مليشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Maldives"
+msgstr "مالديوز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+msgid "Mali"
+msgstr "مالي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+msgid "Malta"
+msgstr "مالټا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Marshall Islands"
+msgstr "مارشل ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+msgid "Martinique"
+msgstr "مارټينيک"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Mauritania"
+msgstr "مورېټانيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+msgid "Mauritius"
+msgstr "مورېشيز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Mayotte"
+msgstr "ميوټي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Mexico"
+msgstr "مېکسيکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Micronesia"
+msgstr "ماېکرونيشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+msgid "Moldova, Republic Of"
+msgstr "مولډوا، ولسواکيز د"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Monaco"
+msgstr "موناکو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+msgid "Mongolia"
+msgstr "منګوليا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+msgid "Montserrat"
+msgstr "مونټسېرټ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+msgid "Morocco"
+msgstr "موروکو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+msgid "Mozambique"
+msgstr "موزامبېک"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+msgid "Myanmar"
+msgstr "ميانمار"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+msgid "Namibia"
+msgstr "نمېبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+msgid "Nauru"
+msgstr "ناورو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Nepal"
+msgstr "نيپال"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+msgid "Netherlands"
+msgstr "نيدرلېنډز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+msgid "New Caledonia"
+msgstr "نوی کېلېډونيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+msgid "New Zealand"
+msgstr "نوی زيلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Nicaragua"
+msgstr "نېکراګوا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+msgid "Niger"
+msgstr "ناېجر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Nigeria"
+msgstr "ناېجيريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+msgid "Niue"
+msgstr "نيو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+msgid "Norfolk Island"
+msgstr "نارفولک ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+msgid "Northern Mariana Islands"
+msgstr "شمالي ماريانا ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+msgid "Norway"
+msgstr "ناروې"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+msgid "Oman"
+msgstr "عمان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+msgid "Pakistan"
+msgstr "پاکستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+msgid "Palau"
+msgstr "پلاو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+msgid "Palestinian Territory"
+msgstr "فلستين"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+msgid "Panama"
+msgstr "پناما"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Paraguay"
+msgstr "پراګ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Peru"
+msgstr "پېرو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Philippines"
+msgstr "فېلېپين"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Pitcairn"
+msgstr "پېټکاېرن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Poland"
+msgstr "پولېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+msgid "Portugal"
+msgstr "پرټګال"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+msgid "Puerto Rico"
+msgstr "پيورټو ريکو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Qatar"
+msgstr "قطر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+msgid "Reunion"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Romania"
+msgstr "رومانيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+msgid "Russian Federation"
+msgstr "رشين فېډېرېشن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Rwanda"
+msgstr "روانډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+msgid "Saint Kitts And Nevis"
+msgstr "سېنټ کېټس او نېوس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+msgid "Saint Lucia"
+msgstr "سېنټ لوشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+msgid "Saint Vincent And The Grenadines"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+msgid "Samoa"
+msgstr "سموا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+msgid "San Marino"
+msgstr "سېن مارينو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+msgid "Sao Tome And Principe"
+msgstr "ساو ټومي او پرېنسېپ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+msgid "Saudi Arabia"
+msgstr "سعودي عربيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+msgid "Senegal"
+msgstr "سېنېګال"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+msgid "Serbia And Montenegro"
+msgstr "سربيا او مونټېنېګرو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+msgid "Seychelles"
+msgstr "سيچېلېس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+msgid "Sierra Leone"
+msgstr "سيرا ليوني"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+msgid "Singapore"
+msgstr "سنګاپور"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Slovakia"
+msgstr "سلواکيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Slovenia"
+msgstr "سلوينيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Solomon Islands"
+msgstr "سولومون ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+msgid "Somalia"
+msgstr "سوماليا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+msgid "South Africa"
+msgstr "سهيلي افريکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+msgid "Spain"
+msgstr "سپېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Sri Lanka"
+msgstr "سري لانکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+msgid "St. Helena"
+msgstr "سېنټ هېلېنا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "St. Pierre And Miquelon"
+msgstr "سېنټ پيري او مېکوېلان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+msgid "Sudan"
+msgstr "سوډان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+msgid "Suriname"
+msgstr "سورينام"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "Swaziland"
+msgstr "سوازيلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+msgid "Sweden"
+msgstr "سوېډېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Switzerland"
+msgstr "سوېټزرلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Syria"
+msgstr "سيريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Taiwan"
+msgstr "ټاېوان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Tajikistan"
+msgstr "تاجکستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "Thailand"
+msgstr "تهاېلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+msgid "Timor-Leste"
+msgstr "ټېمور-لېسټي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+msgid "Togo"
+msgstr "ټوګو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+msgid "Tokelau"
+msgstr "ټوکيلاو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+msgid "Tonga"
+msgstr "ټونګا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Trinidad And Tobago"
+msgstr "ټرېنېډېډ او ټوبېګو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+msgid "Tunisia"
+msgstr "ټونيشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+msgid "Turkey"
+msgstr "ترکيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Turkmenistan"
+msgstr "ترکمنستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+msgid "Turks And Caicos Islands"
+msgstr "ټورکس او کاېکوس ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+msgid "Tuvalu"
+msgstr "ټېوالو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+msgid "Uganda"
+msgstr "وګېنډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+msgid "Ukraine"
+msgstr "وکرېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+msgid "United Arab Emirates"
+msgstr "د عربو متحده امارات"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+msgid "United Kingdom"
+msgstr "برتانيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+msgid "Uruguay"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+msgid "Uzbekistan"
+msgstr "ازبکستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+msgid "Vanuatu"
+msgstr "وېنواټو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+msgid "Venezuela"
+msgstr "وېنزوېلا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+msgid "Viet Nam"
+msgstr "وېټنام"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+msgid "Virgin Islands, British"
+msgstr "ورجېن ټاپوګان، برتانيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+msgid "Virgin Islands, U.S."
+msgstr "ورجېن ټاپوګان، امريکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+msgid "Wallis And Futuna Islands"
+msgstr "وېلېس او فوټونا ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+msgid "Western Sahara"
+msgstr "لويديځه سهارا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+msgid "Yemen"
+msgstr "يمن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+msgid "Zambia"
+msgstr "زامبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+msgid "Zimbabwe"
+msgstr "زمبابوی"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
+msgid "Name"
+msgstr "نوم"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+msgid "AOL Instant Messenger"
+msgstr "ژر استوزګر AOL"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
+msgid "Jabber"
+msgstr "جېبر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+msgid "Yahoo Messenger"
+msgstr "ياهو استوزګر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+msgid "Gadu-Gadu Messenger"
+msgstr "ګېډو-ګېډو استوزګر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+msgid "Service"
+msgstr "پالنه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
+msgid "Location"
+msgstr "ځای"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+msgid "Username"
+msgstr "کارننوم"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
+msgid "Home"
+msgstr "کور"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+msgid "Other"
+msgstr "بل"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
+msgid "Yahoo"
+msgstr "ياهو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
+msgid "Gadu-Gadu"
+msgstr "ګاډو-ګاډو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
+msgid "GroupWise"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+msgid "Source Book"
+msgstr "سرچينه کتاب"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+msgid "Target Book"
+msgstr "موخه کتاب"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+msgid "Is New Contact"
+msgstr "نوی اړيکلوری دی"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+msgid "Writable Fields"
+msgstr "ليکوړ ډګرونه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+msgid "Required Fields"
+msgstr "اړين ډګرونه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+msgid "Changed"
+msgstr "بدل شوی"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#, c-format
+msgid "Contact Editor - %s"
+msgstr "%s - اړيکلور سمونګر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+msgid "Please select an image for this contact"
+msgstr "د دې اړيکلوري لپاره يو انځور وټاکئ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+msgid "_No image"
+msgstr "هېڅ انځور_"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+msgid ""
+"The contact data is invalid:\n"
+"\n"
+msgstr ""
+":د اړيکلوري اومتوک ناسم دی\n"
+"\n"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#, c-format
+msgid "%s'%s' is empty"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+msgid "Invalid contact."
+msgstr ".ناسم اړيکلوری"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+msgid "Contact Quick-Add"
+msgstr "اړيکلوری ژر-زياتول"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "_Edit Full"
+msgstr "بشپړ سمول_"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+msgid "_Full name"
+msgstr "بشپړ نوم"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+msgid "E_mail"
+msgstr "ب_رېښليک"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+msgid "_Select Address Book"
+msgstr "پته کتاب ټاکل_"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr ":۲مه _پته"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Ci_ty:"
+msgstr ":ښ_ار"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr ":هېوا_د"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Full Address"
+msgstr "ټوله پته"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_ZIP Code:"
+msgstr ":زېپ کوډ_"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Dr."
+msgstr "ډاکټر"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Esq."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Full Name"
+msgstr "بشپړ نوم"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr "۱"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr "۲"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr "۳"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr "اغلې"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr "ښاغلی"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr "ښاغلې"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr "اغلې"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr ":لومړی_"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr ":وروستی_"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr ":منځنی_"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+msgid "Add IM Account"
+msgstr "ګڼون زياتول IM"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:2
+msgid "_Account name:"
+msgstr ":ګڼون نوم_"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:3
+msgid "_IM Service:"
+msgstr ":پالنه IM_"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:234
+msgid "_Location:"
+msgstr ":ځای_"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "<b>Members</b>"
+msgstr "<b>غړي</b>"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+msgid "Contact List Editor"
+msgstr "لړ سمونګر سره اړيکه نيول"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "...ټاکل"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_List name:"
+msgstr ":د لړ نوم_"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "د اړيکلور لړ غړي"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "غړي_"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
+msgid "Book"
+msgstr "کتاب"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+msgid "Is New List"
+msgstr "نوی لړ دی"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ":بدل شوی اړيکلوری"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+msgid "Duplicate Contact Detected"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The name or email of this contact already 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/eab-contact-duplicate-detected.glade.h:3
+msgid "Original Contact:"
+msgstr ":ار اړيکلوری"
+
+#: ../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/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "اړيکلوری سره ننويستل"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
+msgid "_Merge"
+msgstr "سره ننويستل_"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "برېښليک"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+msgid "Any field contains"
+msgstr "هر ډګر لري"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+msgid "Email begins with"
+msgstr "برېښليک پېلېږي په"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+msgid "Name contains"
+msgstr "نوم لري"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+msgid "No contacts"
+msgstr "هېڅ اړيکلوري"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "اړيکلوری %d"
+msgstr[1] "اړيکلوري %d"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
+msgid "Query"
+msgstr "پوښتن"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+msgid "Error getting book view"
+msgstr "د کتاب کوت په اخيستلو کې تېروتنه"
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
+#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-selection-model.c:303
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
+msgid "Model"
+msgstr "بېلګه"
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+msgid "Error modifying card"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "نوم پېليږي په"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+msgid "Source"
+msgstr "سرچينه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Type"
+msgstr "ډول"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+msgid "Save as vCard..."
+msgstr "...ساتل vCard لکه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
+#: ../ui/evolution-addressbook.xml.h:56
+msgid "_Open"
+msgstr "پرانيستل_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+msgid "_New Contact..."
+msgstr "...نوی اړيکلوری_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+msgid "New Contact _List..."
+msgstr "...نوی اړيکلور _لړ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+msgid "_Save as vCard..."
+msgstr "...ساتل vCard لکه_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Forward Contact"
+msgstr "اړيکلوری مخکې کول_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+msgid "_Forward Contacts"
+msgstr "اړيکلوري مخکې کول_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+msgid "Send _Message to Contact"
+msgstr "اړيکلوري ته _استوزه لېږل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+msgid "Send _Message to List"
+msgstr "لړ ته _استوزه لېږل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+msgid "Send _Message to Contacts"
+msgstr "اړيکلوريو ته _استوزه لېږل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+msgid "_Print"
+msgstr "چاپول_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+msgid "Cop_y to Address Book..."
+msgstr "...پته کتاب ته لمېس_ل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+msgid "Mo_ve to Address Book..."
+msgstr "...پته کتاب ته خوځ_ول"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+msgid "Cu_t"
+msgstr "سکڼ_ل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "لمېسل_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+msgid "P_aste"
+msgstr "س_رېښل"
+
+#. All, unmatched, separator
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
+msgid "Any Category"
+msgstr "هره ټولۍ"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "بله تېروتنه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
+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 "د سوداګرۍ ۲ ټېلېفون"
+
+#: ../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/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
+msgid "Categories"
+msgstr "ټولۍ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "کمپنۍ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "د کمپنۍ ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 2"
+msgstr "۲م برېښليک"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Email 3"
+msgstr "۳م برېښليک"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "Family Name"
+msgstr "د کورنۍ نوم"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "File As"
+msgstr "ليکل لکه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Given Name"
+msgstr "ورکړل شوی نوم"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Fax"
+msgstr "د کور فېکس"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone"
+msgstr "د کور ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone 2"
+msgstr "د کور ۲ ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "ISDN Phone"
+msgstr "ټېلېفون ISDN"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Journal"
+msgstr "ورځپاڼه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+msgid "Manager"
+msgstr "سمبالګر"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
+msgid "Mobile Phone"
+msgstr "ګرځنده ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Nickname"
+msgstr "ستاېنوم"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
+msgid "Note"
+msgstr "يادښت"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+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/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
+msgid "Role"
+msgstr "رول"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
+msgid "Spouse"
+msgstr "کورودانه"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "ټېلېکس"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "سرليک"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr "يوون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "ګورت پاڼه"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+msgid "Width"
+msgstr "پلنوالی"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+msgid "Height"
+msgstr "اوږدوالی"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
+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:137
+msgid "Column Width"
+msgstr "د ستن پلنوالی"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+".د اړيکلوري لپاره پلټل"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"د اړيکلوری ولټوﺉ\n"
+"\n"
+".یا دلته دوه ځله کېکاږﺉ چې نوی ګڼون جوړ کړﺉ"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
+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"
+".دلته دوه ځله کېکاږﺉ چې نوی ګڼون جوړ کړﺉ"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+".د اړيکلوري لپاره پلټل"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+".په دې ليد کې د ښودلو لپاره کوم توکي نشته"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
+msgid "Adapter"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard.c:99
+msgid "Work Email"
+msgstr "د دندې برېښليک"
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+msgid "Home Email"
+msgstr "د کور برېښليک"
+
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
+msgid "Other Email"
+msgstr "بل برېښليک"
+
+#: ../addressbook/gui/widgets/e-minicard.c:177
+msgid "Selected"
+msgstr "ټاکل شوی"
+
+#: ../addressbook/gui/widgets/e-minicard.c:184
+msgid "Has Cursor"
+msgstr "ځری لري"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+msgid "_Open Link in Browser"
+msgstr "تړنه په لټووني کې پرانيستل_"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2810
+msgid "_Copy Link Location"
+msgstr "د تړنې ځای لمېسل_"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+msgid "_Send New Message To..."
+msgstr "...ته نوې استوزه لېږل_"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "برېښليک _پته لمېسل"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
+msgid "(map)"
+msgstr "(نخچه)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
+msgid "map"
+msgstr "نخچه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
+msgid "List Members"
+msgstr "غړي لړول"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+msgid "Department"
+msgstr "برخه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
+msgid "Profession"
+msgstr "دنده"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+msgid "Position"
+msgstr "ځای"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+msgid "Video Chat"
+msgstr "وېډيو بنډار"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "کليز"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:114
+msgid "Free/Busy"
+msgstr "وزګار/بوخت"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
+msgid "Phone"
+msgstr "ټېلېفون"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
+msgid "Fax"
+msgstr "فېکس"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+msgid "Home Page"
+msgstr "کور پاڼه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
+msgid "Web Log"
+msgstr "ګورت خبرال"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+msgid "Birthday"
+msgstr "کليزه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+msgid "Anniversary"
+msgstr "کليزه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
+msgid "Job Title"
+msgstr "د دندې سرليک"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
+msgid "Home page"
+msgstr "کور پاڼه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
+msgid "Blog"
+msgstr "بلاګ"
+
+#. E_BOOK_ERROR_OK
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Success"
+msgstr "بری"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Address Book does not exist"
+msgstr "پته کتاب شتون نه لري"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
+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:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Permission denied"
+msgstr "پرېښله ونه منل شوه"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+msgid "Contact not found"
+msgstr "اړيکلوری ونه موندل شو"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
+msgid "Contact ID already exists"
+msgstr "اړيکلوری پېژند د مخکې نه شتون لري"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Protocol not supported"
+msgstr "باندره نه منل کيږي"
+
+#. E_BOOK_ERROR_CANCELLED
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
+msgid "Canceled"
+msgstr "بند شو"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Could not cancel"
+msgstr "نه شي بندولی"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../calendar/gui/comp-editor-factory.c:423
+msgid "Authentication Failed"
+msgstr "کرونه پاتې راغله"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+msgid "Authentication Required"
+msgstr "کرونه اړينه ده"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+msgid "TLS not Available"
+msgstr "نه شته ‎TLS"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
+msgid "No such source"
+msgstr "داسې سرچينه نشته"
+
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
+msgid "Not available in offline mode"
+msgstr "په ناليکه اکر کې شتون نه لري"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Invalid server version"
+msgstr "د پالنګر ناسمه نسخه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, c-format
+msgid ""
+"We were unable to open this addressbook.  Please check that the path %s "
+"exists and that you have permission to access it."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
+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:124
+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:131
+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:154
+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:160
+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:166
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
+msgid "Error adding list"
+msgstr "د لړ په زياتولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
+msgid "Error adding contact"
+msgstr "د اړيکلوري په زياتولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
+msgid "Error modifying list"
+msgstr "د اړ په سمولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
+msgid "Error modifying contact"
+msgstr "د اړيکلوري په سمولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
+msgid "Error removing list"
+msgstr "د لړ په ړنګولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
+msgid "Error removing contact"
+msgstr "د اړيکلوري په ړنګولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#, c-format
+msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
+msgid "_Don't Display"
+msgstr "نه ښودل_"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
+msgid "Display _All Contacts"
+msgstr "ټول _اړيکلوري ښودل"
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
+msgid "Overwrite"
+msgstr "ځاېناستول"
+
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "اړيکلور"
+msgstr[1] "اړيکلوري"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
+msgid "card.vcf"
+msgstr "کارډ.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
+msgid "Select Address Book"
+msgstr "پته کتاب ټاکل"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
+msgid "list"
+msgstr "لړ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
+msgid "Move contact to"
+msgstr "ته اړيکلوری خوځول"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
+msgid "Copy contact to"
+msgstr "ته اړيکلوری لمېسل"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
+msgid "Move contacts to"
+msgstr "ته اړيکلوري خوځول"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
+msgid "Copy contacts to"
+msgstr "ته اړيکلوري لمېسل"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
+msgid "Multiple vCards"
+msgstr "vCards ګڼ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#, c-format
+msgid "vCard for %s"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#, c-format
+msgid "Contact information"
+msgstr "د اړيکلوري خبرتياوې"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#, c-format
+msgid "Contact information for %s"
+msgstr "اړيکلوري خبرتياوې %s ‎د"
+
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
+msgid "Querying Address Book..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#, c-format
+msgid "There is one other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr "ښودل vCard بشپړ"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact vCard"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+msgid "Save in addressbook"
+msgstr "په پته کتاب کې ساتل"
+
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr "کارډ ليد"
+
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+msgid "Importing..."
+msgstr "...دننول کيږي"
+
+#: ../addressbook/importers/evolution-csv-importer.c:860
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:861
+msgid "Outlook CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:869
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:870
+msgid "Mozilla CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:878
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:879
+msgid "Evolution CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-ldif-importer.c:665
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-ldif-importer.c:666
+msgid "Evolution LDIF importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-vcard-importer.c:547
+msgid "vCard (.vcf, .gcrd)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-vcard-importer.c:548
+msgid "Evolution vCard Importer"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "‍۱۰ ټکي. تاهوما"
+
+#: ../addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "۸ ټکي. تاهوما"
+
+#: ../addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "تنه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr ":لاندې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr ":ډډې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:7
+msgid "F_ont..."
+msgstr "...ل_يکبڼه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "ليکبڼې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr ":پښۍ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "بڼه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:11
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:648
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:310
+msgid "Header"
+msgstr "سرۍ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr "سرۍ/پښۍ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "سريزونه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr "د هر ليک لپاره سريزونه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr ":اوږدوالی"
+
+#: ../addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ":‍‍ننويستل"
+
+#: ../addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "پسوریز"
+
+#: ../addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr ":کيڼ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "مورګې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:22
+msgid "Number of columns:"
+msgstr ":د ستنو شمېر"
+
+#: ../addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "غوراوي"
+
+#: ../addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "لورموندنه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "مخ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr ":مخ امسته"
+
+#: ../addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr ":پاڼه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr ":د پاڼو سرچينه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "تيک"
+
+#: ../addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr ":مخليد"
+
+#: ../addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr ":ښي"
+
+#: ../addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr ":برخې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr ""
+
+#. FIXME: Take care of i18n
+#: ../addressbook/printing/e-contact-print.glade.h:36
+#: ../plugins/exchange-operations/exchange-account-setup.c:1055
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:217
+msgid "Size:"
+msgstr ":کچ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "په نوي مخ پېلول"
+
+#: ../addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr ":ډول نوم"
+
+#: ../addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr ":بره"
+
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr ":ډول"
+
+#: ../addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr ":پلنوالی"
+
+#: ../addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr "...ليکبڼه_"
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
+msgid "Contact Print Style Editor Test"
+msgstr ""
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:44
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr ""
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
+msgid "This should test the contact print style editor widget"
+msgstr ""
+
+#: ../addressbook/printing/test-print.c:43
+msgid "Contact Print Test"
+msgstr ""
+
+#: ../addressbook/printing/test-print.c:46
+msgid "This should test the contact print code"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+msgid "Can not open file"
+msgstr "دوتنه نه شي پرانيستلی"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+msgid "Couldn't get list of addressbooks"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+msgid "failed to open book"
+msgstr "د کتاب په پرانيستلو کې پاتې راغی"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:49
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:50
+msgid "OUTPUTFILE"
+msgstr "وتېدوتنه"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:53
+msgid "List local addressbook folders"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:56
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:57
+msgid "[vcard|csv]"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "Export in asynchronous mode"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:65
+msgid "NUMBER"
+msgstr "شمېره"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:102
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:116
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:125
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:133
+msgid "In normal mode, there is no need for the size option."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:164
+msgid "Unhandled error"
+msgstr ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:5
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:6
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:7
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:8
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:9
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:10
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:11
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:12
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:13
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:14
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:16
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:18
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to delete this appointment?"
+msgstr "تاسو په ډاډه توګه دا ټاکنه ړنګول غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:179
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "تاسو په ډاډه توګه دا کتنه ړنګول غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:185
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "تاسو په ډاډه توګه دا ميمو ړنګول غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:182
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "تاسو په ډاډه توګه دا دنده ړنګول غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:25
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:26
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:27
+msgid "Are you sure you want to send the task without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:28
+msgid "Cannot create a new event"
+msgstr "نوې پېښه نه شي جوړولی"
+
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "پېښه نه شي ساتلی"
+
+#: ../calendar/calendar.error.xml.h:30
+msgid "Delete calendar '{0}'?"
+msgstr "کليز ړنګول غواړﺉ؟ ‎'{0}'"
+
+#: ../calendar/calendar.error.xml.h:31
+msgid "Delete memo list '{0}'?"
+msgstr "ميمو لړ ړنګول غواړﺉ؟ ‎'{0}'"
+
+#: ../calendar/calendar.error.xml.h:32
+msgid "Delete task list '{0}'?"
+msgstr "دنده لړ ړنګول غواړﺉ؟ ‎'{0}'"
+
+#: ../calendar/calendar.error.xml.h:33
+msgid "Do _not Send"
+msgstr "نه_ لېږل"
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Download in progress. Do you want to save the task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:36
+msgid "Editor could not be loaded."
+msgstr ".سمونګر نه شي لېښل کېدی"
+
+#: ../calendar/calendar.error.xml.h:37
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:38
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:39
+msgid "Error loading calendar"
+msgstr "د کليز په لېښلو کې ستونزه"
+
+#: ../calendar/calendar.error.xml.h:40
+msgid "Error loading memo list"
+msgstr "د ميمو لړ په لېښلو کې ستونزه"
+
+#: ../calendar/calendar.error.xml.h:41
+msgid "Error loading task list"
+msgstr "د دنده لړ په لېښلو کې ستونزه"
+
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:45
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:46
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:47
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:48
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "Some features may not work properly with your current server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ".د اېوليوشن کليز په ناسمه توګه بند کړل شو"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "The Evolution memo has quit unexpectedly."
+msgstr ".د اېوليوشن ميمو په ناسمه توګه بنده کړل شوه"
+
+#: ../calendar/calendar.error.xml.h:52
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ".د اېوليوشن دندې په ناسمه توګه بندې کړل شوې"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "The calendar is not marked for offline usage."
+msgstr ".کليز د ناليکه کارونې لپاره نه دی نښول شوی"
+
+#: ../calendar/calendar.error.xml.h:54
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
+msgstr ".د ميموګانو لړ د ناليکه کارونې لپاره نه دی نښول شوی"
+
+#: ../calendar/calendar.error.xml.h:55
+msgid "The task list is not marked for offline usage."
+msgstr ".د دندو لړ د ناليکه کارونې لپاره نه دی نښول شوی"
+
+#: ../calendar/calendar.error.xml.h:56
+msgid "This calendar will be removed permanently."
+msgstr ".دا کليز به د تل لپاره وړنګول شي"
+
+#: ../calendar/calendar.error.xml.h:57
+msgid "This memo list will be removed permanently."
+msgstr ".دا ميمو به د تل لپاره وړنګول شي"
+
+#: ../calendar/calendar.error.xml.h:58
+msgid "This task list will be removed permanently."
+msgstr ".دا دنده لړ به د تل لپاره وړنګول شي"
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to save your changes to this appointment?"
+msgstr "دې ټاکنه کې خپلې بدلونې ساتل غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "Would you like to save your changes to this memo?"
+msgstr "دې ميمو کې خپلې بدلونې ساتل غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "Would you like to save your changes to this task?"
+msgstr "دې دنده کې خپلې بدلونې ساتل غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:63
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:64
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "Would you like to send this task to participants?"
+msgstr "تاسو غواړﺉ چې دا دنده ونډوالو ته ولېږﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:68
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:69
+msgid "You have changed this appointment, but not yet saved it."
+msgstr ".تاسو دې ټاکنه کې بدلونونه کړي، خو تر اوسه مو نه دي ساتلي"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "You have changed this task, but not yet saved it."
+msgstr ".تاسو دې دنده کې بدلونونه کړي، خو تر اوسه مو نه دي ساتلي"
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr ".تاسو دې ميمو کې بدلونونه کړي، خو تر اوسه مو نه دي ساتلي"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:74
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "بدلونونه پرېښودل_"
+
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+msgid "_Save"
+msgstr "ساتل_"
+
+#: ../calendar/calendar.error.xml.h:77
+msgid "_Save Changes"
+msgstr "بدلونونه ساتل_"
+
+#: ../calendar/calendar.error.xml.h:78
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+msgid "_Send"
+msgstr "لېږل_"
+
+#: ../calendar/calendar.error.xml.h:79
+msgid "_Send Notice"
+msgstr "يادښت لېږل_"
+
+#: ../calendar/calendar.error.xml.h:80
+msgid "{0}."
+msgstr ".{0}"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
+msgid "Could not start evolution-data-server"
+msgstr "اېوليوشن-اومتوک-پالنګر نه شي پېلولی"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
+msgid "Could not read pilot's Memo application block"
+msgstr ""
+
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
+msgid "Could not write pilot's Memo application block"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:240
+msgid "Default Priority:"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
+msgid "Could not write pilot's ToDo application block"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2359
+msgid "Calendar and Tasks"
+msgstr "کليز او دندې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1403
+msgid "Calendars"
+msgstr "کليزونه"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "خپله مهالسيمه، کليز او دنده لړ دلته وسازوﺉ"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "اېوليوشن کليز او دندې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "د اېوليوشن کليز سازونې مهار"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "اېوليوشن کليز/دنده سمونګر"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "د اېوليوشن کليز رغتوکی"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "د اېوليوشن ميمو رغتوکی"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Tasks component"
+msgstr "د اېوليوشن دندو رغتوکی"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "ميموګان_ې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
+msgid "Memos"
+msgstr "ميموګانې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "دندې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "کليزونه_"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../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:102
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "مېنټ"
+msgstr[1] "مېنټه"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:280
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:402
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "ګېنټې"
+msgstr[1] "ګېنټې"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+msgid "Start time"
+msgstr "پېل مهال"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+msgid "Appointments"
+msgstr "ټاکنې"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1002
+msgid "Location:"
+msgstr ":ځای"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze _time:"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
+msgid "_Edit"
+msgstr "سمون_"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "_Snooze"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+msgid "location of appointment"
+msgstr "د ټاکنی ځای"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+msgid "No summary available."
+msgstr ".لنډيز نه شته"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+msgid "No description available."
+msgstr ".سپړاوی نشته"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+msgid "No location information available."
+msgstr ".د ځای خبرتياوې نشته"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#, c-format
+msgid "You have %d alarms"
+msgstr "خبرونې لرﺉ ‎%d ‎‎تاسو"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
+msgid "Warning"
+msgstr "خبرتيا"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
+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/alarm-notify/alarm-queue.c:1711
+#, 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/alarm-notify/alarm-queue.c:1725
+msgid "Do not ask me about this program again."
+msgstr ".د دې کړنلار په اړه بيا نه پوښتل"
+
+#: ../calendar/gui/alarm-notify/notify-main.c:138
+msgid "Could not initialize Bonobo"
+msgstr "بونوبو نه شي پېلولی"
+
+#: ../calendar/gui/alarm-notify/notify-main.c:151
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/util.c:41
+msgid "invalid time"
+msgstr "ناسم مهال"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:113
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "ګېنټه %d"
+msgstr[1] "ګېنټې %d"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:119
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "مېنټ %d"
+msgstr[1] "مېنټه %d"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:123
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "سېکېنډ %d"
+msgstr[1] "سېکېنډه %d"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "خبرونې کړنلارې"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr "د توکيو د ړنګولو پر مهال د باورييلو لپاره پوښتل"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+msgid "Calendars to run alarms for"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+msgid "Compress weekends in month view"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+msgid "Confirm expunge"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+msgid "Default appointment reminder"
+msgstr "تلواله ټاکنې رايادوونکی"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Default reminder units"
+msgstr "تلواله رايادوونکي يوونونه"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+msgid "Default reminder value"
+msgstr "تلواله رايادوونکي ارزښت"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+msgid "Directory for saving alarm audio files"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Event Gradient"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+msgid "Event Transparency"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+msgid "Free/busy server URLs"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+msgid "Free/busy template URL"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+msgid "Gradient of the events in calendar views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+msgid "Hide completed tasks"
+msgstr "بشپړې شوې دندې پټول"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide task units"
+msgstr "دنده يوونونه پټول"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task value"
+msgstr "دنده ارزښت پټول"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+msgid "Horizontal pane position"
+msgstr "د پروت چوکاټ ځای"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+msgid "Last alarm time"
+msgstr "د وروستۍ خبرونې مهال"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+msgid "List of server URLs for free/busy publishing."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+msgid "Marcus Bains Line"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+msgid "Minute the workday ends on, 0 to 59."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+msgid "Minute the workday starts on, 0 to 59."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+msgid "Month view horizontal pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid "Month view vertical pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Number of units for determining a default reminder."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+msgid "Number of units for determining when to hide tasks."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+msgid "Overdue tasks color"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+msgid "Programs that are allowed to be run by alarms."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Save directory for alarm audio"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+msgid "Show appointment end times in week and month views"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Show display alarms in notification tray"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Show the \"Preview\" pane"
+msgstr "چوکاټ ښودل \"Preview\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show the \"Preview\" pane."
+msgstr ".چوکاټ ښودل \"Preview\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+msgid "Show week numbers in date navigator"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+msgid "Tasks due today color"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Tasks vertical pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Time divisions"
+msgstr "مهال وېشنې"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid "Time the last alarm ran, in time_t."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
+msgid "Timezone"
+msgstr "مهالسېمه"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "Week start"
+msgstr "د اونۍ پېل"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Whether to set a default reminder for appointments."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid "Whether to show week numbers in the date navigator."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Whether to use daylight savings time while displaying events."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Work days"
+msgstr "دنده ورځې"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Workday end hour"
+msgstr "د دندې ورځې وروستۍ ګېنټه"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+msgid "Workday end minute"
+msgstr "د دندې ورځې وروستی مېنټ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+msgid "Workday start hour"
+msgstr "د دندې ورځې پېل ګېنټه"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+msgid "Workday start minute"
+msgstr "د دندې ورځې پېل مېنټ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid "daylight savings time"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:72
+msgid "Summary contains"
+msgstr "لنډيز لري"
+
+#: ../calendar/gui/cal-search-bar.c:73
+msgid "Description contains"
+msgstr "سپړاوی لري"
+
+#: ../calendar/gui/cal-search-bar.c:74
+msgid "Category is"
+msgstr "ټولۍ ده"
+
+#: ../calendar/gui/cal-search-bar.c:75
+msgid "Comment contains"
+msgstr "څرګندون لري"
+
+#: ../calendar/gui/cal-search-bar.c:76
+msgid "Location contains"
+msgstr "ځای لري"
+
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
+msgid "Unmatched"
+msgstr "بېساری"
+
+#: ../calendar/gui/cal-search-bar.c:630
+msgid "Next 7 Days' Tasks"
+msgstr "د راتلونکو ۷ ورځو دندې"
+
+#: ../calendar/gui/cal-search-bar.c:634
+msgid "Active Tasks"
+msgstr "چارنده دندې"
+
+#: ../calendar/gui/cal-search-bar.c:638
+msgid "Overdue Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:642
+msgid "Completed Tasks"
+msgstr "بشپړې شوې دندې"
+
+#: ../calendar/gui/cal-search-bar.c:646
+msgid "Tasks with Attachments"
+msgstr "دندې د نښلنونو سره"
+
+#: ../calendar/gui/cal-search-bar.c:692
+msgid "Active Appointments"
+msgstr "چارندې ټاکنې"
+
+#: ../calendar/gui/cal-search-bar.c:696
+msgid "Next 7 Days' Appointments"
+msgstr "د راتلونکو ۷ ورځو ټاکنې"
+
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "چاپول"
+
+#: ../calendar/gui/calendar-commands.c:317
+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:323
+msgid "Purge events older than"
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:281
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:403
+#: ../widgets/misc/e-send-options.glade.h:39
+msgid "days"
+msgstr "ورځې"
+
+#. Create the On the web source group
+#. Create the LDAP source group
+#. Create the Webcal source group
+#. Create the LDAP source group
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
+msgid "On The Web"
+msgstr "په ګورت کې"
+
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+msgid "Birthdays & Anniversaries"
+msgstr "زوکړې او کليزې"
+
+#. Create the weather group
+#: ../calendar/gui/calendar-component.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "هوا"
+
+#: ../calendar/gui/calendar-component.c:616
+msgid "_New Calendar"
+msgstr "نوی کليز_"
+
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2090
+msgid "_Copy..."
+msgstr "...لمېسل_"
+
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "ځانتياوې_"
+
+#: ../calendar/gui/calendar-component.c:950
+msgid "Failed upgrading calendars."
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1249
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1265
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1378
+msgid "Calendar Source Selector"
+msgstr "کليز سرچينه ټاکوونکی"
+
+#: ../calendar/gui/calendar-component.c:1596
+msgid "New appointment"
+msgstr "نوې ټاکنه"
+
+#: ../calendar/gui/calendar-component.c:1597
+msgid "_Appointment"
+msgstr "ټاکنه_"
+
+#: ../calendar/gui/calendar-component.c:1598
+msgid "Create a new appointment"
+msgstr "نوې ټاکنه جوړول"
+
+#: ../calendar/gui/calendar-component.c:1604
+msgid "New meeting"
+msgstr "نوې کتنه"
+
+#: ../calendar/gui/calendar-component.c:1605
+msgid "M_eeting"
+msgstr "ک_تنه"
+
+#: ../calendar/gui/calendar-component.c:1606
+msgid "Create a new meeting request"
+msgstr "نوې کتل غوښتنه جوړول"
+
+#: ../calendar/gui/calendar-component.c:1612
+msgid "New all day appointment"
+msgstr "نوې ټوله ورځ ټاکنه"
+
+#: ../calendar/gui/calendar-component.c:1613
+msgid "All Day A_ppointment"
+msgstr "ټوله ورځ ټ_اکنه"
+
+#: ../calendar/gui/calendar-component.c:1614
+msgid "Create a new all-day appointment"
+msgstr "نوې ټوله-ورځ ټاکنه جوړول"
+
+#: ../calendar/gui/calendar-component.c:1620
+msgid "New calendar"
+msgstr "نوی کليز"
+
+#: ../calendar/gui/calendar-component.c:1621
+msgid "Cale_ndar"
+msgstr "کل_يز"
+
+#: ../calendar/gui/calendar-component.c:1622
+msgid "Create a new calendar"
+msgstr "نوی کليز جوړول"
+
+#: ../calendar/gui/calendar-view-factory.c:109
+msgid "Day View"
+msgstr "ورځ ليد"
+
+#: ../calendar/gui/calendar-view-factory.c:112
+msgid "Work Week View"
+msgstr "دنده اونۍ ليد"
+
+#: ../calendar/gui/calendar-view-factory.c:115
+msgid "Week View"
+msgstr "اونۍ ليد"
+
+#: ../calendar/gui/calendar-view-factory.c:118
+msgid "Month View"
+msgstr "مياشت ليد"
+
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "هر ډګر"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "نښلنونه"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "ګډونوال"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "سوداګري"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "ټولۍ"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "ډلونه"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "سيالي"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "پټ"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "سپړاوی"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
+msgid "Description Contains"
+msgstr "سپړاوی لري"
+
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "شتون نه لري"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "شتون لري"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "خواپوري"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "سوغات"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "موخې"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "چوټي"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "چوټي کارډونه"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "نړېوال"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "کيلۍ پېرودونکی"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "ګډوډ"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "راتلونکې ۷ ورځې"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "ټيليفوني اړيکې"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "وګړيز"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "خپور"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "بياپېښېدنه"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "انکړ"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "لنډيز"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
+msgid "Summary Contains"
+msgstr "لنډيز لري"
+
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "تمه کيږي"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "لري"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "نه لري"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "دی"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "نه دی"
+
+#: ../calendar/gui/comp-editor-factory.c:405
+msgid "Error while opening the calendar"
+msgstr "د کليز د پرانيستلو پر مهال تېروتنه"
+
+#: ../calendar/gui/comp-editor-factory.c:411
+msgid "Method not supported when opening the calendar"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:417
+msgid "Permission denied to open the calendar"
+msgstr "د کليز د پرانيستلو پرېښله ونه منل شوه"
+
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+msgid "Unknown error"
+msgstr "ناپېژندلې تېروتنه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
+msgid "Edit Alarm"
+msgstr "خبرونه سمول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
+msgid "<b>Alarm</b>"
+msgstr "<b>خبرونه</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
+msgid "<b>Options</b>"
+msgstr "<b>غوراوي</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
+msgid "<b>Repeat</b>"
+msgstr "<b>بياځلي</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+msgid "Add Alarm"
+msgstr "خبرونه زياتول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+msgid "Custom _message"
+msgstr "دوديزه _استوزه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+msgid "Custom alarm sound"
+msgstr "دوديز خبرونې غږ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Mes_sage:"
+msgstr ":است_وزه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:442
+msgid "Play a sound"
+msgstr "غږ غږول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:446
+msgid "Pop up an alert"
+msgstr "خبروونی بړبوکول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:454
+msgid "Run a program"
+msgstr "کړنلار ځغلول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "يوه دوتنه وټاکئ"
+
+#: ../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:450
+msgid "Send an email"
+msgstr "برېښليک لېږل"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid "_Arguments:"
+msgstr ":ارزښتمنۍ_"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+msgid "_Program:"
+msgstr ":کړنلار_"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
+msgstr "خبرونه د سرول_"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid "_Sound:"
+msgstr ":غږ_"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+msgid "after"
+msgstr "وروسته"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+msgid "before"
+msgstr "مخکې"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "day(s)"
+msgstr "ورځ(ې)"
+
+#: ../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/dialogs/alarm-dialog.glade.h:24
+msgid "hour(s)"
+msgstr "ګېنټه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
+msgid "minute(s)"
+msgstr "مېنټه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "start of appointment"
+msgstr "د ټاکنې پېل"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+msgid "Alarms"
+msgstr "خبرونې"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
+msgid "_Suggest automatic display of attachment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+msgid "Attach file(s)"
+msgstr "دوتنې نښلول"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+msgid "Selected Calendars for Alarms"
+msgstr "د خبرونو لپاره ټاکل شوي کليزونه"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"مېنټه ‎۶۰\n"
+"مېنټه ‎۳۰\n"
+"مېنټه ‎۱۵\n"
+"مېنټه ‎۱۰\n"
+"مېنټه ‎۰۵"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">خبرونې</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">تلواله وزګار/بوخت پالنګر</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">ټولګړي</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">دنده لړ</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">مهال</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">دنده اونۍ</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Day _ends:"
+msgstr ":ورځ _پايږي"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display"
+msgstr "ښوون"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
+msgid "Friday"
+msgstr "جومه"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"مېنټه\n"
+"ګېنټې\n"
+"ورځې"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
+msgid "Monday"
+msgstr "دوه نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"دوه نۍ\n"
+"درې نۍ\n"
+"منځنۍ\n"
+"پينځه نۍ\n"
+"جومه\n"
+"نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../mail/mail-config.glade.h:112
+msgid "Pick a color"
+msgstr "يو رنګ وټاکئ"
+
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "S_un"
+msgstr "ي_وه نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
+msgid "Saturday"
+msgstr "نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Select the calendars for alarm notification"
+msgstr "د خبرونې يادښتونو لپاره کليزونه وټاکئ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sh_ow a reminder"
+msgstr "رايادوونی ښو_دل"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Show week _numbers in date navigator"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
+msgid "Sunday"
+msgstr "يوه نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "T_asks due today:"
+msgstr ""
+
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "T_hu"
+msgstr "پ_ينځه نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Template:"
+msgstr ":کونده"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
+msgid "Thursday"
+msgstr "درې نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+msgid "Time _zone:"
+msgstr ":مهال _سيمه"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Time format:"
+msgstr ":مهال بڼه"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
+msgid "Tuesday"
+msgstr "درې نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
+msgid "Wednesday"
+msgstr "منځنۍ"
+
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Wee_k starts on:"
+msgstr ":اون_ۍ پېليږي په"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Work days:"
+msgstr ":دنده ورځې"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+msgid "_12 hour (AM/PM)"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "_24 hour"
+msgstr "ګېنټې‎ ۲۴_"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "_Compress weekends in month view"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "_Day begins:"
+msgstr ":ورځ پېليږي_"
+
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "_Fri"
+msgstr "جومه_"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+msgid "_Hide completed tasks after"
+msgstr "بشپړې شوې دندې پټول وروسته له_"
+
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "_Mon"
+msgstr "دوه نۍ_"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+msgid "_Overdue tasks:"
+msgstr ""
+
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+msgid "_Sat"
+msgstr "نۍ_"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+msgid "_Time divisions:"
+msgstr ""
+
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+msgid "_Tue"
+msgstr "درې نۍ"
+
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+msgid "_Wed"
+msgstr "منځنۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+msgid "before every appointment"
+msgstr "د هرې ټاکنې نه مخکې"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:269
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:271
+msgid "Cop_y task list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:273
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr ":رن_ګ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+msgid "Task List"
+msgstr "دنده لړ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+msgid "Memo List"
+msgstr "ميمو لړ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:474
+msgid "Calendar Properties"
+msgstr "د کليز ځانتياوې"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:474
+msgid "New Calendar"
+msgstr "نوی کليز"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "Task List Properties"
+msgstr "د دنده لړ ځانتياوې"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "نوی دنده لړ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "د ميمو لړ ځانتياوې"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "New Memo List"
+msgstr "نوی ميمو لړ"
+
+#: ../calendar/gui/dialogs/changed-comp.c:58
+msgid "This event has been deleted."
+msgstr ".دا پېښه وړنګول شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:62
+msgid "This task has been deleted."
+msgstr ".دا دنده وړنګول شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:66
+msgid "This memo has been deleted."
+msgstr ".دا ميمو وړنګول شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:75
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:82
+msgid "This event has been changed."
+msgstr ".دا پېښه بدله شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:86
+msgid "This task has been changed."
+msgstr ".دا دنده بدله شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:90
+msgid "This memo has been changed."
+msgstr ".دا ميمو بدله شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:99
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
+msgid " to "
+msgstr "ته"
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
+msgid " (Completed "
+msgstr "بشپړ شوی) "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
+msgid "Completed "
+msgstr "بشپړ شوی"
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
+msgid " (Due "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
+msgid "Due "
+msgstr "کول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:231
+#, c-format
+msgid "Attached message - %s"
+msgstr "%s - ‎نښتې استوزه"
+
+#. translators, this count will always be >1
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "نښتې استوزه"
+msgstr[1] "نښتې استوزې ‎%d"
+
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
+msgid "_Move"
+msgstr "خوځول_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2049
+msgid "Cancel _Drag"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
+msgid "attachment"
+msgstr "نښلن"
+
+#: ../calendar/gui/dialogs/comp-editor.c:841
+msgid "Could not update object"
+msgstr "څيز نه شي اوسمهالولی"
+
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "ټاکنه سمول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "%s - کتنه"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "%s - ټاکنه"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "%s - ټاکل شوې دنده"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr " %s - دنده"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr " %s - ميمو"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "هېڅ لنډيز"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "د اوسنۍ کړکۍ بندولو لپاره دلته کېکاږﺉ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "ټاکل شوې ليکنه ټوټه دړې ته لمېسل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "ټاکل شوې ليکنه ټوټه دړې ته سکڼل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "د شته مرستې د کتلو لپاره دلته کېکاږﺉ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "له ټوټه دړې ليکنه سرېښل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "ټوله ليکنه ټاکل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "دوتنه_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "مرسته_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "ورننويستل_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "غوراوي_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2082
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "ليد_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "...نښلن_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "د دوتنې د نښلولو لپاره دلته کېکاږﺉ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "ټولۍ_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "مهال _سيمه"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "ټو_ليز"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "لکه ټوليز ډلول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "وګړيز_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "لکه وګړيز ډلول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "پټ_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "لکه پټ ډلول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "انکړ ډګر_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "ډول ډګر_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "اوسني لاسو_ندونه"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "نښلول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
+#, c-format
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1911
+msgid "Hide Attachment _Bar"
+msgstr "نښلن _پټه پټول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
+msgid "Show Attachment _Bar"
+msgstr "نښلن _پټه ښودل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "ړنګول_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "...نښلن زياتول_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
+msgid "Show Attachments"
+msgstr "نښلنونه ښودل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+msgid "Press space key to toggle attachment bar"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:3315
+msgid "Unable to use current version!"
+msgstr "اوسنۍ نسخه نه شي کارولی"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+msgid "Could not open source"
+msgstr "سرچينه نه شي پرانيستلی"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+msgid "Could not open destination"
+msgstr "موخه نه شي پرانيستلی"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+msgid "Destination is read only"
+msgstr "موخه يواز-لوستې ده"
+
+#: ../calendar/gui/dialogs/delete-comp.c:202
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:53
+msgid "The event could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:56
+msgid "The task could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:59
+msgid "The memo could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:62
+msgid "The item could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:69
+msgid "The event could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:72
+msgid "The task could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:75
+msgid "The memo could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:78
+msgid "The item could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:85
+msgid "The event could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:88
+msgid "The task could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:91
+msgid "The memo could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:94
+msgid "The item could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Contacts..."
+msgstr "اړيکلوري"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-delegates.c:415
+msgid "Delegate To:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "خبرونې_"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "بياپېښېدنه_"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "د لېږلو غوراوي"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "وزګار/بوخت_"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:295
+msgid "Appoint_ment"
+msgstr "ټاک_نه"
+
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
+msgid "This event has alarms"
+msgstr "دا پېښه خبرونې لري"
+
+#: ../calendar/gui/dialogs/event-page.c:795
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+msgid "Or_ganizer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:841
+msgid "_Delegatees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:843
+msgid "Atte_ndees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1027
+msgid "Event with no start date"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1030
+msgid "Event with no end date"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
+msgid "Start date is wrong"
+msgstr "پېل نېټه ناسمه ده"
+
+#: ../calendar/gui/dialogs/event-page.c:1209
+msgid "End date is wrong"
+msgstr "پای نېټه ناسمه ده"
+
+#: ../calendar/gui/dialogs/event-page.c:1232
+msgid "Start time is wrong"
+msgstr "پېل مهال ناسم دی"
+
+#: ../calendar/gui/dialogs/event-page.c:1239
+msgid "End time is wrong"
+msgstr "پای مهال ناسم دی"
+
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
+msgid "An organizer is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
+msgid "At least one attendee is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
+msgid "_Add "
+msgstr "زياتول_"
+
+#: ../calendar/gui/dialogs/event-page.c:2591
+#, c-format
+msgid "Unable to open the calendar '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2915
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/event-page.c:2921
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/event-page.c:2927
+#, c-format
+msgid "%d minute before appointment"
+msgid_plural "%d minutes before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/event-page.c:2940
+msgid "Customize"
+msgstr "دوديزول"
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
+msgid "None"
+msgstr "هېڅ"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "د ټاکنې نه ۱ ورځ مخکې"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 hour before appointment"
+msgstr "د ټاکنې نه ۱ ګېنټه مخکې"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
+msgid "15 minutes before appointment"
+msgstr "د ټاکنې نه ۱۵ مېنټه مخکې"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+msgid "Attendee_s..."
+msgstr "...ګډونوا_ل"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+msgid "Custom Alarm:"
+msgstr ":دوديز خبرونی"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "D_escription:"
+msgstr ":سپړاوی_"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:10
+msgid "Event Description"
+msgstr "د پېښې سپړاوی"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+msgid "Su_mmary:"
+msgstr ":لن_ډيز"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+msgid "_Alarm"
+msgstr "خبروونی_"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr ":مهال_"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
+msgstr "لپاره د"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
+msgstr "تر"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+msgid "<b>Att_endees</b>"
+msgstr "<b>ګډ_ونوالان</b>"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
+msgid "C_hange Organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "Co_ntacts..."
+msgstr "...اړ_يکلوري"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
+msgid "Memo"
+msgstr "ميمو"
+
+#: ../calendar/gui/dialogs/memo-page.c:847
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+msgid "To"
+msgstr "ته"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr ":پې_ل نېټه"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+msgid "T_o:"
+msgstr ":ت_ه"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+msgid "_Description:"
+msgstr ":سپړاوی_"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr ":ډله_"
+
+#: ../calendar/gui/dialogs/recur-comp.c:50
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:85
+msgid "This Instance Only"
+msgstr "يوازې دا بېلګه"
+
+#: ../calendar/gui/dialogs/recur-comp.c:89
+msgid "This and Prior Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:95
+msgid "This and Future Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:100
+msgid "All Instances"
+msgstr "ټولې بېلګې"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:560
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:890
+msgid "Recurrence date is invalid"
+msgstr "د بياپېښېدنې نېټه سمه نه ده"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:928
+msgid "on"
+msgstr "په"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:992
+msgid "first"
+msgstr "لومړی"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+msgid "second"
+msgstr "دوېم"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
+msgid "third"
+msgstr "درېم"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
+msgid "fourth"
+msgstr "څلورم"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
+msgid "last"
+msgstr "وروستی"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "Other Date"
+msgstr "بله نېټه"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+msgid "1st to 10th"
+msgstr "نه تر ۱۰م ‎۱"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+msgid "11th to 20th"
+msgstr "۱۱م نه تر ۲۰م"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
+msgid "21st to 31st"
+msgstr "۲۱م نه تر ۳۱م"
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
+msgid "day"
+msgstr "ورځ"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
+msgid "on the"
+msgstr "په"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
+msgid "occurrences"
+msgstr "پېښېدنې"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
+msgid "Add exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
+msgid "Modify exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
+msgid "Could not get a selection to delete."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
+msgid "Date/Time"
+msgstr "نېټه/مهال"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "<b>Exceptions</b>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
+msgid "<b>Preview</b>"
+msgstr "<b>مخليد</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "<b>Recurrence</b>"
+msgstr "<b>بياپېښېدنه</b>"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr "هر"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "This appointment rec_urs"
+msgstr "دا ټاکنه بيا_پېښيږي"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "forever"
+msgstr "تل"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
+msgid "month(s)"
+msgstr "مياشت(ې)"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
+msgid "week(s)"
+msgstr "اوونۍ"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+msgid "year(s)"
+msgstr "کال(ه)"
+
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
+msgid "Completed date is wrong"
+msgstr "د بشپړېدو نېټه ناسمه ده"
+
+#: ../calendar/gui/dialogs/task-details-page.c:478
+msgid "Web Page"
+msgstr "ګورت پاڼه"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\">ګډوډ</span>"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
+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:253
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
+msgid "Completed"
+msgstr "بشپړ شوی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "لوړ"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:356
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-cal-model-tasks.c:750
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
+msgid "In Progress"
+msgstr "په پرمختګ کې"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "ټيټ"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "لېوی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-model-tasks.c:354
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
+msgid "Not Started"
+msgstr "نه دی پېل شوی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+msgid "P_ercent complete:"
+msgstr ":س_لنه بشپړ شوی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Stat_us:"
+msgstr ":انک_ړ"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
+msgid "Undefined"
+msgstr "ناپېژندلی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+msgid "_Date completed:"
+msgstr ":د بشپړېدو نېټه_"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:34
+msgid "_Priority:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Web Page:"
+msgstr ":ګورت پاڼه_"
+
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "انکړ خبرتياوې_"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "د لېږلو غوراوي_"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
+msgid "_Task"
+msgstr "دنده_"
+
+#: ../calendar/gui/dialogs/task-editor.c:320
+msgid "Task Details"
+msgstr "د دندې خبرتياوې"
+
+#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:781
+msgid "Due date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:1750
+#, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "...ګډو_نوالان"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "...ټول_ۍ"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "De_scription:"
+msgstr ":سپ_ړاوی"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr ":مهال سيمه"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Due date:"
+msgstr ":د کولو نېټه_"
+
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:392
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "ورځ %d"
+msgstr[1] "ورځې %d"
+
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:398
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "اونۍ %d"
+msgstr[1] "اونۍ %d"
+
+#: ../calendar/gui/e-alarm-list.c:460
+msgid "Unknown action to be performed"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:474
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:479
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:486
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:497
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:502
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:509
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:533
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:541
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
+#, c-format
+msgid "Click to open %s"
+msgstr "پرانيستلو لپاره کېکاږﺉ %s د"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
+msgid "Untitled"
+msgstr "بېسرليکه"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
+msgid "Start Date:"
+msgstr "پېل نېټه:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr ":سپړاوی"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
+msgid "Web Page:"
+msgstr "ګورت پاڼه:"
+
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Summary:"
+msgstr "لنډيز:"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+msgid "Due Date:"
+msgstr "د کولو نېټه:"
+
+#. write status
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/itip-formatter/itip-view.c:1027
+msgid "Status:"
+msgstr ":انکړ"
+
+#: ../calendar/gui/e-cal-component-preview.c:270
+msgid "Priority:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "پای نېټه"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Start Date"
+msgstr "پېل نېټه"
+
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:611
+msgid "Free"
+msgstr "پاتې"
+
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Busy"
+msgstr "بوخت"
+
+#: ../calendar/gui/e-cal-model-tasks.c:623
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+msgid "Yes"
+msgstr "هو"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "No"
+msgstr "نه"
+
+#. This is the default filename used for temporary file creation
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
+msgid "Unknown"
+msgstr "ناپېژندلی"
+
+#: ../calendar/gui/e-cal-model.c:968
+msgid "Recurring"
+msgstr "بياپېښيږي"
+
+#: ../calendar/gui/e-cal-model.c:970
+msgid "Assigned"
+msgstr "ټاکل شوی"
+
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+msgid "Save As..."
+msgstr "...ساتل په"
+
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+msgid "Select folder to save selected attachments..."
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#, c-format
+msgid "untitled_image.%s"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+msgid "_Save As..."
+msgstr "...ساتل په_"
+
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
+msgid "Set as _Background"
+msgstr "لکه _شاليد ټاکل"
+
+#: ../calendar/gui/e-cal-popup.c:287
+msgid "_Save Selected"
+msgstr "ټاکل شوی ساتل_"
+
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#, c-format
+msgid "Open in %s..."
+msgstr "پرانيستل... %s په"
+
+#: ../calendar/gui/e-calendar-table.c:330
+#, fuzzy
+msgid "* No Summary *"
+msgstr "هېڅ لنډيز"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr ""
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:400
+#, fuzzy
+msgid "Start: "
+msgstr "پېلول"
+
+#: ../calendar/gui/e-calendar-table.c:412
+#, fuzzy
+msgid "Due: "
+msgstr "کول"
+
+#: ../calendar/gui/e-calendar-table.c:581
+msgid "0%"
+msgstr "۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:582
+msgid "10%"
+msgstr "۱۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:583
+msgid "20%"
+msgstr "۲۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:584
+msgid "30%"
+msgstr "۳۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:585
+msgid "40%"
+msgstr "۴۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:586
+msgid "50%"
+msgstr "۵۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:587
+msgid "60%"
+msgstr "۶۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:588
+msgid "70%"
+msgstr "۷۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:589
+msgid "80%"
+msgstr "۸۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:590
+msgid "90%"
+msgstr "۹۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:591
+msgid "100%"
+msgstr "۱۰۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+msgid "Deleting selected objects"
+msgstr "ټاکل شوي څيزونه ړنګول کيږي"
+
+#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+msgid "Updating objects"
+msgstr "څيزونه اوسمهالول کيږي"
+
+#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
+msgid "Save as..."
+msgstr "...ساتل په"
+
+#: ../calendar/gui/e-calendar-table.c:1563
+#: ../calendar/gui/e-calendar-view.c:1663
+msgid "New _Task"
+msgstr "نوې _دنده"
+
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
+msgid "Open _Web Page"
+msgstr "ګورت _پاڼه پرانيستل"
+
+#: ../calendar/gui/e-calendar-table.c:1569
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+msgid "P_rint..."
+msgstr "چاپول..._"
+
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "س_کڼل"
+
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+msgid "_Paste"
+msgstr "سرېښل_"
+
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
+msgid "_Assign Task"
+msgstr "دنده ټاکل_"
+
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
+#: ../ui/evolution-tasks.xml.h:26
+msgid "_Forward as iCalendar"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1581
+msgid "_Mark as Complete"
+msgstr "لکه بشپړ نښول_"
+
+#: ../calendar/gui/e-calendar-table.c:1582
+msgid "_Mark Selected Tasks as Complete"
+msgstr "ټاکل شوې دنده لکه بشپړه نښول_"
+
+#: ../calendar/gui/e-calendar-table.c:1583
+msgid "_Mark as Incomplete"
+msgstr "لکه نابشپړ نښول_"
+
+#: ../calendar/gui/e-calendar-table.c:1584
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "ټاکل شوې دنده لکه نابشپړه نښول_"
+
+#: ../calendar/gui/e-calendar-table.c:1589
+msgid "_Delete Selected Tasks"
+msgstr "ټاکل شوې دنده ړنګول_"
+
+#: ../calendar/gui/e-calendar-table.c:1826
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "د دندې زياتولو لپاره کېکاږﺉ"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+msgid "Complete"
+msgstr "بشپړ"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr "د بشپړېدو نېټه"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+msgid "Due date"
+msgstr "د کولو نېټه"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "Priority"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+msgid "Start date"
+msgstr "پېل نېټه"
+
+#: ../calendar/gui/e-calendar-view.c:1349
+msgid "Moving items"
+msgstr "توکي خوځيږي"
+
+#: ../calendar/gui/e-calendar-view.c:1351
+msgid "Copying items"
+msgstr "توکي لمېسل کيږي"
+
+#: ../calendar/gui/e-calendar-view.c:1660
+msgid "New _Appointment..."
+msgstr "...نوې _ټاکنه"
+
+#: ../calendar/gui/e-calendar-view.c:1661
+msgid "New All Day _Event"
+msgstr "نوې ټوله ورځ _پېښه"
+
+#: ../calendar/gui/e-calendar-view.c:1662
+msgid "New _Meeting"
+msgstr "نوې _کتنه"
+
+#. FIXME: hook in this somehow
+#: ../calendar/gui/e-calendar-view.c:1673
+msgid "_Current View"
+msgstr "اوسنی ليد_"
+
+#: ../calendar/gui/e-calendar-view.c:1675
+msgid "Select T_oday"
+msgstr "ن_ن ټاکل"
+
+#: ../calendar/gui/e-calendar-view.c:1676
+msgid "_Select Date..."
+msgstr "...نېټه ټاکل_"
+
+#: ../calendar/gui/e-calendar-view.c:1682
+msgid "Pri_nt..."
+msgstr "...چاپ_ول"
+
+#: ../calendar/gui/e-calendar-view.c:1692
+msgid "Cop_y to Calendar..."
+msgstr "...کليز ته لمېس_ل"
+
+#: ../calendar/gui/e-calendar-view.c:1693
+msgid "Mo_ve to Calendar..."
+msgstr "...کليز ته خو_ځول"
+
+#: ../calendar/gui/e-calendar-view.c:1694
+msgid "_Delegate Meeting..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1695
+msgid "_Schedule Meeting..."
+msgstr "...مهالوېش کتنه_"
+
+#: ../calendar/gui/e-calendar-view.c:1696
+msgid "_Forward as iCalendar..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1697
+msgid "_Reply"
+msgstr "ځوابول_"
+
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "ټول ځوابول_"
+
+#: ../calendar/gui/e-calendar-view.c:1703
+msgid "Make this Occurrence _Movable"
+msgstr "دا پېښېدنه _خوځېدونکې کول"
+
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+msgid "Delete this _Occurrence"
+msgstr "دا _پېښېدنه ړنګول"
+
+#: ../calendar/gui/e-calendar-view.c:1705
+msgid "Delete _All Occurrences"
+msgstr "ټولې _پېښېدنې ړنګول"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
+#, c-format
+msgid "Location: %s"
+msgstr "%s ‎:ځای"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2278
+#, c-format
+msgid "Time: %s %s"
+msgstr "%s %s ‎:مهال"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:116
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:119
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: ../calendar/gui/e-cell-date-edit-text.c:127
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:589
+#, 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.
+#. 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:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. String to use in 12-hour time format for times in the morning.
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:813
+msgid "am"
+msgstr "غ.م"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:815
+msgid "pm"
+msgstr "غ.و"
+
+#: ../calendar/gui/e-itip-control.c:765
+msgid "Yes. (Complex Recurrence)"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:782
+#, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] "هره ورځ"
+msgstr[1] "ورځې %d هر"
+
+#: ../calendar/gui/e-itip-control.c:795
+#, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] "هره اونۍ"
+msgstr[1] "اونۍ %d هر"
+
+#: ../calendar/gui/e-itip-control.c:802
+#, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] "هره اونۍ په"
+msgstr[1] "اونۍ په %d هر"
+
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:813
+msgid " and "
+msgstr "او"
+
+#: ../calendar/gui/e-itip-control.c:822
+#, c-format
+msgid "The %s day of "
+msgstr "ورځ د %s د"
+
+#: ../calendar/gui/e-itip-control.c:838
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:849
+#, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] "هره مياشت"
+msgstr[1] "مياشتې %d هر"
+
+#: ../calendar/gui/e-itip-control.c:861
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] "هر کال"
+msgstr[1] "کاله %d هر"
+
+#: ../calendar/gui/e-itip-control.c:874
+#, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
+
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:885
+msgid ", ending on "
+msgstr ""
+
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:907
+msgid "Starts"
+msgstr "پېليږي"
+
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:921
+msgid "Ends"
+msgstr "پايږي"
+
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
+msgid "Due"
+msgstr "کول"
+
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+msgid "iCalendar Information"
+msgstr "خبرتياوې iکليزې"
+
+#. Title
+#: ../calendar/gui/e-itip-control.c:1020
+msgid "iCalendar Error"
+msgstr "تېروتنه iکليزې"
+
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
+msgid "An unknown person"
+msgstr "ناپېژندلی وګړی"
+
+#. Describe what the user can do
+#: ../calendar/gui/e-itip-control.c:1143
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
+msgid "Accepted"
+msgstr "منل شوی"
+
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
+msgid "Declined"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1283
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1285
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1363
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1364
+msgid "Meeting Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1370
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1372
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1373
+msgid "Meeting Proposal"
+msgstr ""
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1379
+#, c-format
+msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1380
+msgid "Meeting Update"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1384
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1385
+msgid "Meeting Update Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1392
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1393
+msgid "Meeting Reply"
+msgstr "د کتنې ځواب"
+
+#: ../calendar/gui/e-itip-control.c:1400
+#, c-format
+msgid "<b>%s</b> has canceled a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1401
+msgid "Meeting Cancelation"
+msgstr "د کتنې بندونه"
+
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1412
+msgid "Bad Meeting Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1439
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1440
+msgid "Task Information"
+msgstr "دنده خبرتياوې"
+
+#: ../calendar/gui/e-itip-control.c:1447
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1449
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1450
+msgid "Task Proposal"
+msgstr ""
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1456
+#, c-format
+msgid "<b>%s</b> wishes to be added to an existing task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1457
+msgid "Task Update"
+msgstr "دنده اوسمهال"
+
+#: ../calendar/gui/e-itip-control.c:1461
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1462
+msgid "Task Update Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1469
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1470
+msgid "Task Reply"
+msgstr "د دندې ځواب"
+
+#: ../calendar/gui/e-itip-control.c:1477
+#, c-format
+msgid "<b>%s</b> has canceled a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1478
+msgid "Task Cancelation"
+msgstr "د دندې بندونه"
+
+#: ../calendar/gui/e-itip-control.c:1489
+msgid "Bad Task Message"
+msgstr "ناسم دنده استوزه"
+
+#: ../calendar/gui/e-itip-control.c:1513
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1514
+msgid "Free/Busy Information"
+msgstr "وزګار/بوخت خبرتياوې"
+
+#: ../calendar/gui/e-itip-control.c:1518
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1519
+msgid "Free/Busy Request"
+msgstr "وزګار/بوخت غوښتنه"
+
+#: ../calendar/gui/e-itip-control.c:1523
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1524
+msgid "Free/Busy Reply"
+msgstr "وزګار/بوخت ځواب"
+
+#: ../calendar/gui/e-itip-control.c:1529
+msgid "Bad Free/Busy Message"
+msgstr "ناسمه وزګار/بوخت استوزه"
+
+#: ../calendar/gui/e-itip-control.c:1605
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1664
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1697
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1735
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1980
+msgid "Update complete\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2014
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2031
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2049
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2073
+msgid "Attendee status updated\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1254
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+msgid "Item sent!\n"
+msgstr "!توکی ولېږل شو\n"
+
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+msgid "The item could not be sent!\n"
+msgstr "توکی نه شي لېږلی!\n"
+
+#: ../calendar/gui/e-itip-control.c:2256
+msgid "Choose an action:"
+msgstr ":چار وټاکئ"
+
+#: ../calendar/gui/e-itip-control.c:2327
+msgid "Update"
+msgstr "اوسمهالول"
+
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:48
+msgid "Accept"
+msgstr "منل"
+
+#: ../calendar/gui/e-itip-control.c:2356
+msgid "Tentatively accept"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:50
+msgid "Decline"
+msgstr "نه منل"
+
+#: ../calendar/gui/e-itip-control.c:2386
+msgid "Send Free/Busy Information"
+msgstr "وزګار/بوخت خبرتياوې لېږل"
+
+#: ../calendar/gui/e-itip-control.c:2414
+msgid "Update respondent status"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2442
+msgid "Send Latest Information"
+msgstr "نوې خبرتياوې لېږل"
+
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
+#: ../ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "بندول"
+
+#: ../calendar/gui/e-itip-control.glade.h:1
+msgid "--to--"
+msgstr "--ته--"
+
+#: ../calendar/gui/e-itip-control.glade.h:2
+msgid "Calendar Message"
+msgstr "کليز استوزه"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
+msgid "Date:"
+msgstr ":نېټه"
+
+#: ../calendar/gui/e-itip-control.glade.h:5
+msgid "Loading Calendar"
+msgstr "کليز لېښل کيږي"
+
+#: ../calendar/gui/e-itip-control.glade.h:6
+msgid "Loading calendar..."
+msgstr "...کليز لېښل کيږي"
+
+#: ../calendar/gui/e-itip-control.glade.h:8
+msgid "Server Message:"
+msgstr ":پالنګر استوزه"
+
+#: ../calendar/gui/e-meeting-list-view.c:68
+msgid "Chair Persons"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:69
+msgid "Required Participants"
+msgstr "اړين ګډونوالان"
+
+#: ../calendar/gui/e-meeting-list-view.c:70
+msgid "Optional Participants"
+msgstr "غوراويز ګډونوالان"
+
+#: ../calendar/gui/e-meeting-list-view.c:71
+msgid "Resources"
+msgstr "سرچينې"
+
+#: ../calendar/gui/e-meeting-list-view.c:152
+msgid "Attendees"
+msgstr "ګډونوال"
+
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
+msgid "Individual"
+msgstr "وګړی"
+
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+msgid "Group"
+msgstr "ډله"
+
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:967
+msgid "Resource"
+msgstr "سرچينه"
+
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:968
+msgid "Room"
+msgstr "خونه"
+
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:982
+msgid "Chair"
+msgstr "څوکۍ"
+
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
+msgid "Required Participant"
+msgstr "اړين ګډونوال"
+
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:984
+msgid "Optional Participant"
+msgstr "غوراويز ګډونوال"
+
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:985
+msgid "Non-Participant"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
+msgid "Needs Action"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
+msgid "Tentative"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
+msgid "Delegated"
+msgstr ""
+
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:491
+msgid "Attendee                          "
+msgstr "ګډونوال"
+
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:533
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+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:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
+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.
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
+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:481
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:399
+msgid "Out of Office"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:400
+msgid "No Information"
+msgstr "هېڅ خبرتياوې"
+
+#: ../calendar/gui/e-meeting-time-sel.c:415
+msgid "A_ttendees..."
+msgstr "...ګ_ډونوالان"
+
+#: ../calendar/gui/e-meeting-time-sel.c:436
+msgid "O_ptions"
+msgstr "غ_وراوي"
+
+#: ../calendar/gui/e-meeting-time-sel.c:453
+msgid "Show _only working hours"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:463
+msgid "Show _zoomed out"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:478
+msgid "_Update free/busy"
+msgstr "وزګار/بوخت اوسمهالول_"
+
+#: ../calendar/gui/e-meeting-time-sel.c:493
+msgid "_<<"
+msgstr "_<<"
+
+#: ../calendar/gui/e-meeting-time-sel.c:511
+msgid "_Autopick"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:526
+msgid ">_>"
+msgstr ">_>"
+
+#: ../calendar/gui/e-meeting-time-sel.c:543
+msgid "_All people and resources"
+msgstr "ټول وګړي او سرچينې_"
+
+#: ../calendar/gui/e-meeting-time-sel.c:552
+msgid "All _people and one resource"
+msgstr "ټول _وګړي او يوه سرچينه"
+
+#: ../calendar/gui/e-meeting-time-sel.c:561
+msgid "_Required people"
+msgstr "اړين وګړي_"
+
+#: ../calendar/gui/e-meeting-time-sel.c:570
+msgid "Required people and _one resource"
+msgstr "اړين وګړي او _يوه سرچينه"
+
+#: ../calendar/gui/e-meeting-time-sel.c:606
+msgid "_Start time:"
+msgstr ":پېل مهال_"
+
+#: ../calendar/gui/e-meeting-time-sel.c:633
+msgid "_End time:"
+msgstr ":پای مهال_"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "د ګډونوال زياتولو لپاره دلته کېکاږﺉ"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "ټولګړی نوم"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "ژبه"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "غړی"
+
+#: ../calendar/gui/e-memo-table.c:942
+msgid "_Delete Selected Memos"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "د ميمو زياتولو لپاره کېکاږﺉ"
+
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:809
+msgid "Loading memos"
+msgstr "ميموګانې لېښل کيږي"
+
+#: ../calendar/gui/e-memos.c:890
+#, c-format
+msgid "Opening memos at %s"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+msgid "Deleting selected objects..."
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:963
+msgid "Loading tasks"
+msgstr "دندې لېښل کيږي"
+
+#: ../calendar/gui/e-tasks.c:1053
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:1298
+msgid "Completing tasks..."
+msgstr "...دندې بشپړول کيږي"
+
+#: ../calendar/gui/e-tasks.c:1348
+msgid "Expunging"
+msgstr ""
+
+#: ../calendar/gui/e-timezone-entry.c:130
+msgid "Select Timezone"
+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/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+msgid "%d %B"
+msgstr "%d %B"
+
+#: ../calendar/gui/gnome-cal.c:830
+msgid "Updating query"
+msgstr "پوښتن اوسمهالول کيږي"
+
+#: ../calendar/gui/gnome-cal.c:2501
+msgid "_Custom View"
+msgstr "دوديز ليد_"
+
+#: ../calendar/gui/gnome-cal.c:2502
+msgid "_Save Custom View"
+msgstr "دوديز ليد ساتل_"
+
+#: ../calendar/gui/gnome-cal.c:2507
+msgid "_Define Views..."
+msgstr "...ليدنې پېژندل_"
+
+#: ../calendar/gui/gnome-cal.c:2688
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2707
+#, c-format
+msgid "Loading tasks at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2716
+#, c-format
+msgid "Loading memos at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2823
+#, c-format
+msgid "Opening %s"
+msgstr "پرانيستل کيږي %s"
+
+#: ../calendar/gui/gnome-cal.c:3779
+msgid "Purging"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr "اپرېل"
+
+#: ../calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr "اګېسټ"
+
+#: ../calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr "ډېسمبر"
+
+#: ../calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr "فېبروري"
+
+#: ../calendar/gui/goto-dialog.glade.h:5
+msgid "January"
+msgstr "جنوري"
+
+#: ../calendar/gui/goto-dialog.glade.h:6
+msgid "July"
+msgstr "جولای"
+
+#: ../calendar/gui/goto-dialog.glade.h:7
+msgid "June"
+msgstr "جون"
+
+#: ../calendar/gui/goto-dialog.glade.h:8
+msgid "March"
+msgstr "مارچ"
+
+#: ../calendar/gui/goto-dialog.glade.h:9
+msgid "May"
+msgstr "می"
+
+#: ../calendar/gui/goto-dialog.glade.h:10
+msgid "November"
+msgstr "نوېمبر"
+
+#: ../calendar/gui/goto-dialog.glade.h:11
+msgid "October"
+msgstr "اکټوبر"
+
+#: ../calendar/gui/goto-dialog.glade.h:12
+msgid "Select Date"
+msgstr "نېټه ټاکل"
+
+#: ../calendar/gui/goto-dialog.glade.h:13
+msgid "September"
+msgstr "سېپټمبر"
+
+#: ../calendar/gui/goto-dialog.glade.h:14
+msgid "_Select Today"
+msgstr "نن ټاکل_"
+
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
+msgid "An organizer must be set."
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:448
+msgid "At least one attendee is necessary"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+msgid "Event information"
+msgstr "پېښه خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+msgid "Task information"
+msgstr "دنده خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+msgid "Memo information"
+msgstr "ميمو خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+msgid "Free/Busy information"
+msgstr "وزګار/بوخت خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:634
+msgid "Calendar information"
+msgstr "کليز خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:683
+msgid "Updated"
+msgstr "اوسمهالېدلی"
+
+#: ../calendar/gui/itip-utils.c:691
+msgid "Refresh"
+msgstr "تاندول"
+
+#: ../calendar/gui/itip-utils.c:695
+msgid "Counter-proposal"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:762
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:770
+msgid "iCalendar information"
+msgstr "خبرتياوې iکليز د"
+
+#: ../calendar/gui/itip-utils.c:941
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:465
+msgid "_New Memo List"
+msgstr "نوی ميمو لړ_"
+
+#: ../calendar/gui/memos-component.c:545
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "ميمو %d"
+msgstr[1] "ميموګانې %d"
+
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "ټاکل شوی ‎%d ‎،"
+msgstr[1] "ټاکل شوي ‎%d ‎،"
+
+#: ../calendar/gui/memos-component.c:594
+msgid "Failed upgrading memos."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:954
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:967
+msgid "There is no calendar available for creating memos"
+msgstr "د ميموګانو د جوړولو لپاره کوم کليز شتون نه لري"
+
+#: ../calendar/gui/memos-component.c:1077
+msgid "Memo Source Selector"
+msgstr "د ميمو سرچينه ټاکوونکی"
+
+#: ../calendar/gui/memos-component.c:1260
+msgid "New memo"
+msgstr "نوې ميمو"
+
+#: ../calendar/gui/memos-component.c:1261
+msgid "Mem_o"
+msgstr "ميم_و"
+
+#: ../calendar/gui/memos-component.c:1262
+msgid "Create a new memo"
+msgstr "نوې ميمو جوړول"
+
+#: ../calendar/gui/memos-component.c:1268
+msgid "New shared memo"
+msgstr "نوې ونډول شوې ميمو"
+
+#: ../calendar/gui/memos-component.c:1269
+msgid "_Shared memo"
+msgstr "ونډول شوې ميمو_"
+
+#: ../calendar/gui/memos-component.c:1270
+msgid "Create a shared new memo"
+msgstr "نوې ونډول شوې ميمو جوړول"
+
+#: ../calendar/gui/memos-component.c:1276
+msgid "New memo list"
+msgstr "نوی ميمو لړ"
+
+#: ../calendar/gui/memos-component.c:1277
+msgid "Memo li_st"
+msgstr "ميمو ل_ړ"
+
+#: ../calendar/gui/memos-component.c:1278
+msgid "Create a new memo list"
+msgstr "نوی ميمو لړ جوړول"
+
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+msgid "Print Memos"
+msgstr "ميموګانې چاپول"
+
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days'"
+msgstr "راتلونکې ۷ ورځې"
+
+#: ../calendar/gui/migration.c:157
+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:161
+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 ""
+
+#. FIXME: set proper domain/code
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:804
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:972
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+
+#: ../calendar/gui/migration.c:1227
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+msgid "Notes"
+msgstr "يادښتونه"
+
+#: ../calendar/gui/print.c:515
+msgid "1st"
+msgstr "۱م"
+
+#: ../calendar/gui/print.c:515
+msgid "2nd"
+msgstr "۲م"
+
+#: ../calendar/gui/print.c:515
+msgid "3rd"
+msgstr "۳م"
+
+#: ../calendar/gui/print.c:515
+msgid "4th"
+msgstr "۴م"
+
+#: ../calendar/gui/print.c:515
+msgid "5th"
+msgstr "۵م"
+
+#: ../calendar/gui/print.c:516
+msgid "6th"
+msgstr "۶م"
+
+#: ../calendar/gui/print.c:516
+msgid "7th"
+msgstr "۷م"
+
+#: ../calendar/gui/print.c:516
+msgid "8th"
+msgstr "۸م"
+
+#: ../calendar/gui/print.c:516
+msgid "9th"
+msgstr "۹م"
+
+#: ../calendar/gui/print.c:516
+msgid "10th"
+msgstr "۱۰م"
+
+#: ../calendar/gui/print.c:517
+msgid "11th"
+msgstr "۱۱م"
+
+#: ../calendar/gui/print.c:517
+msgid "12th"
+msgstr "۱۲م"
+
+#: ../calendar/gui/print.c:517
+msgid "13th"
+msgstr "۱۳م"
+
+#: ../calendar/gui/print.c:517
+msgid "14th"
+msgstr "۱۴م"
+
+#: ../calendar/gui/print.c:517
+msgid "15th"
+msgstr "۱۵م"
+
+#: ../calendar/gui/print.c:518
+msgid "16th"
+msgstr "۱۶م"
+
+#: ../calendar/gui/print.c:518
+msgid "17th"
+msgstr "۱۷م"
+
+#: ../calendar/gui/print.c:518
+msgid "18th"
+msgstr "۱۸م"
+
+#: ../calendar/gui/print.c:518
+msgid "19th"
+msgstr "۱۹م"
+
+#: ../calendar/gui/print.c:518
+msgid "20th"
+msgstr "۲۰م"
+
+#: ../calendar/gui/print.c:519
+msgid "21st"
+msgstr "۲۱م"
+
+#: ../calendar/gui/print.c:519
+msgid "22nd"
+msgstr "۲۲م"
+
+#: ../calendar/gui/print.c:519
+msgid "23rd"
+msgstr "۲۳م"
+
+#: ../calendar/gui/print.c:519
+msgid "24th"
+msgstr "۲۴م"
+
+#: ../calendar/gui/print.c:519
+msgid "25th"
+msgstr "۲۵م"
+
+#: ../calendar/gui/print.c:520
+msgid "26th"
+msgstr "۲۶م"
+
+#: ../calendar/gui/print.c:520
+msgid "27th"
+msgstr "۲۷م"
+
+#: ../calendar/gui/print.c:520
+msgid "28th"
+msgstr "۲۸م"
+
+#: ../calendar/gui/print.c:520
+msgid "29th"
+msgstr "۲۹م"
+
+#: ../calendar/gui/print.c:520
+msgid "30th"
+msgstr "۳۰م"
+
+#: ../calendar/gui/print.c:521
+msgid "31st"
+msgstr "۳۱م"
+
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
+msgid "Su"
+msgstr "يوه نۍ"
+
+#: ../calendar/gui/print.c:596
+msgid "Mo"
+msgstr "دوه نۍ"
+
+#: ../calendar/gui/print.c:596
+msgid "Tu"
+msgstr "درې نۍ"
+
+#: ../calendar/gui/print.c:596
+msgid "We"
+msgstr "منځنۍ"
+
+#: ../calendar/gui/print.c:597
+msgid "Th"
+msgstr "پينځه نۍ"
+
+#: ../calendar/gui/print.c:597
+msgid "Fr"
+msgstr "جومه"
+
+#: ../calendar/gui/print.c:597
+msgid "Sa"
+msgstr "نۍ"
+
+#: ../calendar/gui/print.c:2444
+msgid "Appointment"
+msgstr "ټاکنه"
+
+#: ../calendar/gui/print.c:2446
+msgid "Task"
+msgstr "دنده"
+
+#: ../calendar/gui/print.c:2468
+#, c-format
+msgid "Summary: %s"
+msgstr "%s ‎:لڼديز"
+
+#: ../calendar/gui/print.c:2490
+msgid "Attendees: "
+msgstr ":ګډونوالان"
+
+#: ../calendar/gui/print.c:2530
+#, c-format
+msgid "Status: %s"
+msgstr "%s ‎:انکړ"
+
+#: ../calendar/gui/print.c:2547
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: ../calendar/gui/print.c:2559
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "%i :سلنه بشپړ"
+
+#: ../calendar/gui/print.c:2571
+#, c-format
+msgid "URL: %s"
+msgstr "%s ‎:URL"
+
+#: ../calendar/gui/print.c:2584
+#, c-format
+msgid "Categories: %s"
+msgstr "%s :ټولۍ"
+
+#: ../calendar/gui/print.c:2595
+msgid "Contacts: "
+msgstr ":اړيکلوري"
+
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2697
+msgid "Upcoming Appointments"
+msgstr "راتلونکې ټاکنې"
+
+#: ../calendar/gui/tasks-component.c:456
+msgid "_New Task List"
+msgstr "نوی دنده لړ_"
+
+#: ../calendar/gui/tasks-component.c:536
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "دنده %d"
+msgstr[1] "دندې %d"
+
+#: ../calendar/gui/tasks-component.c:585
+msgid "Failed upgrading tasks."
+msgstr ".د دندو پورجګونه پاتې راغله"
+
+#: ../calendar/gui/tasks-component.c:942
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:955
+msgid "There is no calendar available for creating tasks"
+msgstr "د دندو جوړولو لپاره کومه کليزه شتون نه لري"
+
+#: ../calendar/gui/tasks-component.c:1066
+msgid "Task Source Selector"
+msgstr "د دندې سرچينه ټاکونکی"
+
+#: ../calendar/gui/tasks-component.c:1325
+msgid "New task"
+msgstr "نوې دنده"
+
+#: ../calendar/gui/tasks-component.c:1327
+msgid "Create a new task"
+msgstr "نوې دنده جوړول"
+
+#: ../calendar/gui/tasks-component.c:1333
+msgid "New assigned task"
+msgstr "نوې ټاکلې دنده"
+
+#: ../calendar/gui/tasks-component.c:1334
+msgid "Assigne_d Task"
+msgstr "ټاکل_ې دنده"
+
+#: ../calendar/gui/tasks-component.c:1335
+msgid "Create a new assigned task"
+msgstr "نوې ټاکل شوې دنده جوړول"
+
+#: ../calendar/gui/tasks-component.c:1341
+msgid "New task list"
+msgstr "نوی دنده لړ"
+
+#: ../calendar/gui/tasks-component.c:1342
+msgid "Tas_k list"
+msgstr "دند_ه لړ"
+
+#: ../calendar/gui/tasks-component.c:1343
+msgid "Create a new task list"
+msgstr "نوی دنده لړ جوړول"
+
+#: ../calendar/gui/tasks-control.c:452
+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:455 ../mail/em-folder-view.c:1133
+msgid "Do not ask me again."
+msgstr ".ما نه بيا مه پوښته"
+
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+msgid "Print Tasks"
+msgstr "چاپ دندې"
+
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "بشپړ %"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "بند شوی"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "په پرمختګ کې"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "لوی د له"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "کوچنی دی له"
+
+#: ../calendar/importers/icalendar-importer.c:73
+msgid "Appointments and Meetings"
+msgstr "ټاکنې او کتنې"
+
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
+msgid "Opening calendar"
+msgstr "کليز پرانيستل کيږي"
+
+#: ../calendar/importers/icalendar-importer.c:438
+msgid "iCalendar files (.ics)"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:439
+msgid "Evolution iCalendar importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:515
+msgid "Reminder!"
+msgstr "!رايادوونی"
+
+#: ../calendar/importers/icalendar-importer.c:567
+msgid "vCalendar files (.vcf)"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:568
+msgid "Evolution vCalendar importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:730
+msgid "Calendar Events"
+msgstr "کليز پېښې"
+
+#: ../calendar/importers/icalendar-importer.c:767
+msgid "Evolution Calendar intelligent importer"
+msgstr ""
+
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:7
+msgid "Africa/Abidjan"
+msgstr "افريکا/ابېډجان"
+
+#: ../calendar/zones.h:8
+msgid "Africa/Accra"
+msgstr "افريکا/اکرا"
+
+#: ../calendar/zones.h:9
+msgid "Africa/Addis_Ababa"
+msgstr "افريکا/اډېس_ابابا"
+
+#: ../calendar/zones.h:10
+msgid "Africa/Algiers"
+msgstr "افريکا/الجيرز"
+
+#: ../calendar/zones.h:11
+msgid "Africa/Asmera"
+msgstr "افريکا/اسمېرا"
+
+#: ../calendar/zones.h:12
+msgid "Africa/Bamako"
+msgstr "افريکا/بماکو"
+
+#: ../calendar/zones.h:13
+msgid "Africa/Bangui"
+msgstr "افريکا/بنګوي"
+
+#: ../calendar/zones.h:14
+msgid "Africa/Banjul"
+msgstr "افريکا/بنجول"
+
+#: ../calendar/zones.h:15
+msgid "Africa/Bissau"
+msgstr "افريکا/بېساو"
+
+#: ../calendar/zones.h:16
+msgid "Africa/Blantyre"
+msgstr "افريکا/بلانټيري"
+
+#: ../calendar/zones.h:17
+msgid "Africa/Brazzaville"
+msgstr "افريکا/برېزاويلي"
+
+#: ../calendar/zones.h:18
+msgid "Africa/Bujumbura"
+msgstr "افريکا/بوجومبورا"
+
+#: ../calendar/zones.h:19
+msgid "Africa/Cairo"
+msgstr "افريکا/کاېره"
+
+#: ../calendar/zones.h:20
+msgid "Africa/Casablanca"
+msgstr "افريکا/کسبلنکا"
+
+#: ../calendar/zones.h:21
+msgid "Africa/Ceuta"
+msgstr "افريکا/سيوټا"
+
+#: ../calendar/zones.h:22
+msgid "Africa/Conakry"
+msgstr "افريکا/کوناکري"
+
+#: ../calendar/zones.h:23
+msgid "Africa/Dakar"
+msgstr "افريکا/ډاکر"
+
+#: ../calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr "افريکا/دار_السلام"
+
+#: ../calendar/zones.h:25
+msgid "Africa/Djibouti"
+msgstr "افريکا/ډجيبوټي"
+
+#: ../calendar/zones.h:26
+msgid "Africa/Douala"
+msgstr "افريکا/ډوالا"
+
+#: ../calendar/zones.h:27
+msgid "Africa/El_Aaiun"
+msgstr "افريکا/ال_ايون"
+
+#: ../calendar/zones.h:28
+msgid "Africa/Freetown"
+msgstr "افريکا/فريټاون"
+
+#: ../calendar/zones.h:29
+msgid "Africa/Gaborone"
+msgstr "افريکا/ګبوروني"
+
+#: ../calendar/zones.h:30
+msgid "Africa/Harare"
+msgstr "افريکا/هراري"
+
+#: ../calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr "افريکا/جوهنېسبرګ"
+
+#: ../calendar/zones.h:32
+msgid "Africa/Kampala"
+msgstr "افريکا/کمپالا"
+
+#: ../calendar/zones.h:33
+msgid "Africa/Khartoum"
+msgstr "افريکا/خرطوم"
+
+#: ../calendar/zones.h:34
+msgid "Africa/Kigali"
+msgstr "افريکا/کېګالي"
+
+#: ../calendar/zones.h:35
+msgid "Africa/Kinshasa"
+msgstr "افريکا/کېنشاسا"
+
+#: ../calendar/zones.h:36
+msgid "Africa/Lagos"
+msgstr "افريکا/لاګوس"
+
+#: ../calendar/zones.h:37
+msgid "Africa/Libreville"
+msgstr "افريکا/لېبرويلي"
+
+#: ../calendar/zones.h:38
+msgid "Africa/Lome"
+msgstr "افريکا/لومي"
+
+#: ../calendar/zones.h:39
+msgid "Africa/Luanda"
+msgstr "افريکا/لوانډا"
+
+#: ../calendar/zones.h:40
+msgid "Africa/Lubumbashi"
+msgstr "افريکا/لوبومبشي"
+
+#: ../calendar/zones.h:41
+msgid "Africa/Lusaka"
+msgstr "افريکا/لوساکا"
+
+#: ../calendar/zones.h:42
+msgid "Africa/Malabo"
+msgstr "افريکا/ملابو"
+
+#: ../calendar/zones.h:43
+msgid "Africa/Maputo"
+msgstr "افريکا/مپوټو"
+
+#: ../calendar/zones.h:44
+msgid "Africa/Maseru"
+msgstr "افريکا/مسيرو"
+
+#: ../calendar/zones.h:45
+msgid "Africa/Mbabane"
+msgstr "افريکا/مبباني"
+
+#: ../calendar/zones.h:46
+msgid "Africa/Mogadishu"
+msgstr "افريکا/موګاډېشو"
+
+#: ../calendar/zones.h:47
+msgid "Africa/Monrovia"
+msgstr "افريکا/مونرويا"
+
+#: ../calendar/zones.h:48
+msgid "Africa/Nairobi"
+msgstr "افريکا/نېروبي"
+
+#: ../calendar/zones.h:49
+msgid "Africa/Ndjamena"
+msgstr "افريکا/نجامينا"
+
+#: ../calendar/zones.h:50
+msgid "Africa/Niamey"
+msgstr "افريکا/نيامي"
+
+#: ../calendar/zones.h:51
+msgid "Africa/Nouakchott"
+msgstr "افريکا/نوېکچوټ"
+
+#: ../calendar/zones.h:52
+msgid "Africa/Ouagadougou"
+msgstr ""
+
+#: ../calendar/zones.h:53
+msgid "Africa/Porto-Novo"
+msgstr "افريکا/پورټو-نوو"
+
+#: ../calendar/zones.h:54
+msgid "Africa/Sao_Tome"
+msgstr "افريکا/ساو_ټومي"
+
+#: ../calendar/zones.h:55
+msgid "Africa/Timbuktu"
+msgstr "افريکا/ټېمبوکټو"
+
+#: ../calendar/zones.h:56
+msgid "Africa/Tripoli"
+msgstr "افريکا/ټريپولي"
+
+#: ../calendar/zones.h:57
+msgid "Africa/Tunis"
+msgstr "افريکا/ټونېس"
+
+#: ../calendar/zones.h:58
+msgid "Africa/Windhoek"
+msgstr "افريکا/وېنډهاک"
+
+#: ../calendar/zones.h:59
+msgid "America/Adak"
+msgstr "افريکا/اډېک"
+
+#: ../calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: ../calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr "امريکا/انګوېلا"
+
+#: ../calendar/zones.h:62
+msgid "America/Antigua"
+msgstr "امريکا/انټېګوا"
+
+#: ../calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr "امريکا/اراګوينا"
+
+#: ../calendar/zones.h:64
+msgid "America/Aruba"
+msgstr "امريکا/اروبا"
+
+#: ../calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr "امريکا/اسنشين"
+
+#: ../calendar/zones.h:66
+msgid "America/Barbados"
+msgstr "امريکا/برباډوس"
+
+#: ../calendar/zones.h:67
+msgid "America/Belem"
+msgstr "امريکا/بېلېم"
+
+#: ../calendar/zones.h:68
+msgid "America/Belize"
+msgstr "امريکا/بېلاېز"
+
+#: ../calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr "امريکا/بوا_وېسټا"
+
+#: ../calendar/zones.h:70
+msgid "America/Bogota"
+msgstr "امريکا/بوګوټا"
+
+#: ../calendar/zones.h:71
+msgid "America/Boise"
+msgstr "امريکا/بويس"
+
+#: ../calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr "امريکا/بوېنوس_ايرز"
+
+#: ../calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr "امريکا/کېمبرېج_بی"
+
+#: ../calendar/zones.h:74
+msgid "America/Cancun"
+msgstr "امريکا/کېنکن"
+
+#: ../calendar/zones.h:75
+msgid "America/Caracas"
+msgstr "امريکا/کراکس"
+
+#: ../calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr "امريکا/کېټېمرکا"
+
+#: ../calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr "امريکا/کايني"
+
+#: ../calendar/zones.h:78
+msgid "America/Cayman"
+msgstr "امريکا/کېمېن"
+
+#: ../calendar/zones.h:79
+msgid "America/Chicago"
+msgstr "امريکا/شېکاګو"
+
+#: ../calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr "امريکا/چېهواهوا"
+
+#: ../calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr "امريکا/کورډوبا"
+
+#: ../calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr "امريکا/کوسټا_ريکا"
+
+#: ../calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr "امريکا/کويابا"
+
+#: ../calendar/zones.h:84
+msgid "America/Curacao"
+msgstr "امريکا/کورېکاو"
+
+#: ../calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr "امريکا/ډنمارکشاون"
+
+#: ../calendar/zones.h:86
+msgid "America/Dawson"
+msgstr "امريکا/ډاوسن"
+
+#: ../calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr "امريکا/ډاوسن_کريک"
+
+#: ../calendar/zones.h:88
+msgid "America/Denver"
+msgstr "امريکا/ډېنوير"
+
+#: ../calendar/zones.h:89
+msgid "America/Detroit"
+msgstr "امريکا/ډېټروېټ"
+
+#: ../calendar/zones.h:90
+msgid "America/Dominica"
+msgstr "امريکا/ډومېنېکا"
+
+#: ../calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr "امريکا/اېډمونټن"
+
+#: ../calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: ../calendar/zones.h:93
+msgid "America/El_Salvador"
+msgstr "امريکا/ال_سلوېډر"
+
+#: ../calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr "امريکا/فورټاليزا"
+
+#: ../calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr "امريکا/ګلېس_بی"
+
+#: ../calendar/zones.h:96
+msgid "America/Godthab"
+msgstr ""
+
+#: ../calendar/zones.h:97
+msgid "America/Goose_Bay"
+msgstr "امريکا/ګوس_بی"
+
+#: ../calendar/zones.h:98
+msgid "America/Grand_Turk"
+msgstr "امريکا/ګرېنډ_ټرک"
+
+#: ../calendar/zones.h:99
+msgid "America/Grenada"
+msgstr "امريکا/ګرينېډا"
+
+#: ../calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: ../calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr "امريکا/ګواټيمالا"
+
+#: ../calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr "امريکا/ګواياکېل"
+
+#: ../calendar/zones.h:103
+msgid "America/Guyana"
+msgstr "امريکا/ګويانا"
+
+#: ../calendar/zones.h:104
+msgid "America/Halifax"
+msgstr "امريکا/هلېفېکس"
+
+#: ../calendar/zones.h:105
+msgid "America/Havana"
+msgstr "امريکا/هوانا"
+
+#: ../calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr "امريکا/هرموسېلو"
+
+#: ../calendar/zones.h:107
+msgid "America/Indiana/Indianapolis"
+msgstr "امريکا/انډيانا/انډياناپولېس"
+
+#: ../calendar/zones.h:108
+msgid "America/Indiana/Knox"
+msgstr "امريکا/انډيانا/ناکس"
+
+#: ../calendar/zones.h:109
+msgid "America/Indiana/Marengo"
+msgstr "امريکا/انډيانا/مېرېنګو"
+
+#: ../calendar/zones.h:110
+msgid "America/Indiana/Vevay"
+msgstr "امريکا/انډيانا/وېوی"
+
+#: ../calendar/zones.h:111
+msgid "America/Indianapolis"
+msgstr "امريکا/انډياناپولېس"
+
+#: ../calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr "امريکا/اېنوېک"
+
+#: ../calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr ""
+
+#: ../calendar/zones.h:114
+msgid "America/Jamaica"
+msgstr "امريکا/جماېکا"
+
+#: ../calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr "امريکا/جوجوي"
+
+#: ../calendar/zones.h:116
+msgid "America/Juneau"
+msgstr ""
+
+#: ../calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr ""
+
+#: ../calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr ""
+
+#: ../calendar/zones.h:119
+msgid "America/La_Paz"
+msgstr "امريکا/لې_پز"
+
+#: ../calendar/zones.h:120
+msgid "America/Lima"
+msgstr "امريکا/ليما"
+
+#: ../calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr "امريکا/لاس_انجېلس"
+
+#: ../calendar/zones.h:122
+msgid "America/Louisville"
+msgstr ""
+
+#: ../calendar/zones.h:123
+msgid "America/Maceio"
+msgstr "امريکا/مېشيو"
+
+#: ../calendar/zones.h:124
+msgid "America/Managua"
+msgstr "امريکا/مناګوا"
+
+#: ../calendar/zones.h:125
+msgid "America/Manaus"
+msgstr "امريکا/مناوس"
+
+#: ../calendar/zones.h:126
+msgid "America/Martinique"
+msgstr "امريکا/مارټېنېک"
+
+#: ../calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr "امريکا/مزېټلېن"
+
+#: ../calendar/zones.h:128
+msgid "America/Mendoza"
+msgstr "امريکا/مېنډوزا"
+
+#: ../calendar/zones.h:129
+msgid "America/Menominee"
+msgstr ""
+
+#: ../calendar/zones.h:130
+msgid "America/Merida"
+msgstr "امريکا/مېرېډا"
+
+#: ../calendar/zones.h:131
+msgid "America/Mexico_City"
+msgstr "امريکا/مېکسيکا_ښار"
+
+#: ../calendar/zones.h:132
+msgid "America/Miquelon"
+msgstr "امريکا/مېکوېلېن"
+
+#: ../calendar/zones.h:133
+msgid "America/Monterrey"
+msgstr "امريکا/مونټيري"
+
+#: ../calendar/zones.h:134
+msgid "America/Montevideo"
+msgstr ""
+
+#: ../calendar/zones.h:135
+msgid "America/Montreal"
+msgstr "امريکا/مونټريل"
+
+#: ../calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr "امريکا/مونټسېرټ"
+
+#: ../calendar/zones.h:137
+msgid "America/Nassau"
+msgstr "امريکا/ناساو"
+
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "America/New_York"
+msgstr "امريکا/نيو_يارک"
+
+#: ../calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr "امريکا/نېپېګن"
+
+#: ../calendar/zones.h:140
+msgid "America/Nome"
+msgstr "امريکا/نومي"
+
+#: ../calendar/zones.h:141
+msgid "America/Noronha"
+msgstr "امريکا/نورونها"
+
+#: ../calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: ../calendar/zones.h:143
+msgid "America/Panama"
+msgstr "امريکا/پېناما"
+
+#: ../calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: ../calendar/zones.h:145
+msgid "America/Paramaribo"
+msgstr "امريکا/پېراماريبو"
+
+#: ../calendar/zones.h:146
+msgid "America/Phoenix"
+msgstr "امريکا/فوېنېکس"
+
+#: ../calendar/zones.h:147
+msgid "America/Port-au-Prince"
+msgstr ""
+
+#: ../calendar/zones.h:148
+msgid "America/Port_of_Spain"
+msgstr ""
+
+#: ../calendar/zones.h:149
+msgid "America/Porto_Velho"
+msgstr ""
+
+#: ../calendar/zones.h:150
+msgid "America/Puerto_Rico"
+msgstr ""
+
+#: ../calendar/zones.h:151
+msgid "America/Rainy_River"
+msgstr ""
+
+#: ../calendar/zones.h:152
+msgid "America/Rankin_Inlet"
+msgstr ""
+
+#: ../calendar/zones.h:153
+msgid "America/Recife"
+msgstr "امريکا/ريساېف"
+
+#: ../calendar/zones.h:154
+msgid "America/Regina"
+msgstr "امريکا/رېجينا"
+
+#: ../calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr "امريکا/ريو_برېنکو"
+
+#: ../calendar/zones.h:156
+msgid "America/Rosario"
+msgstr "امريکا/روسېريو"
+
+#: ../calendar/zones.h:157
+msgid "America/Santiago"
+msgstr "امريکا/سنټياګو"
+
+#: ../calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: ../calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr "امريکا/ساو_پاولو"
+
+#: ../calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: ../calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr "امريکا/شېپراک"
+
+#: ../calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr "امريکا/سېنټ_جونز"
+
+#: ../calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr "امريکا/سېنټ_کېټس"
+
+#: ../calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr "امريکا/سېنټ_لشيا"
+
+#: ../calendar/zones.h:165
+msgid "America/St_Thomas"
+msgstr "امريکا/سېنټ_ټامس"
+
+#: ../calendar/zones.h:166
+msgid "America/St_Vincent"
+msgstr "امريکا/سېنټ_وېنسېنټ"
+
+#: ../calendar/zones.h:167
+msgid "America/Swift_Current"
+msgstr "امريکا/سوېفټ_کرېنټ"
+
+#: ../calendar/zones.h:168
+msgid "America/Tegucigalpa"
+msgstr ""
+
+#: ../calendar/zones.h:169
+msgid "America/Thule"
+msgstr "امريکا/ټولي"
+
+#: ../calendar/zones.h:170
+msgid "America/Thunder_Bay"
+msgstr "امريکا/ټنډر_بی"
+
+#: ../calendar/zones.h:171
+msgid "America/Tijuana"
+msgstr "امريکا/ټېجوانا"
+
+#: ../calendar/zones.h:172
+msgid "America/Tortola"
+msgstr "امريکا/ټورټولا"
+
+#: ../calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr ""
+
+#: ../calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr "امريکا/واېټهارس"
+
+#: ../calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr "امريکا/وېنېپېګ"
+
+#: ../calendar/zones.h:176
+msgid "America/Yakutat"
+msgstr "امريکا/ياکوټېټ"
+
+#: ../calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: ../calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: ../calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: ../calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: ../calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: ../calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: ../calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: ../calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: ../calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: ../calendar/zones.h:186
+msgid "Antarctica/Vostok"
+msgstr ""
+
+#: ../calendar/zones.h:187
+msgid "Arctic/Longyearbyen"
+msgstr ""
+
+#: ../calendar/zones.h:188
+msgid "Asia/Aden"
+msgstr "اېشيا/اډېن"
+
+#: ../calendar/zones.h:189
+msgid "Asia/Almaty"
+msgstr "اېشيا/المټي"
+
+#: ../calendar/zones.h:190
+msgid "Asia/Amman"
+msgstr "اېشيا/امن"
+
+#: ../calendar/zones.h:191
+msgid "Asia/Anadyr"
+msgstr "اېشيا/اناډېر"
+
+#: ../calendar/zones.h:192
+msgid "Asia/Aqtau"
+msgstr "اېشيا/اکټاو"
+
+#: ../calendar/zones.h:193
+msgid "Asia/Aqtobe"
+msgstr "اېشيا/اکټوبي"
+
+#: ../calendar/zones.h:194
+msgid "Asia/Ashgabat"
+msgstr "اېشيا/اشګبت"
+
+#: ../calendar/zones.h:195
+msgid "Asia/Baghdad"
+msgstr "اېشيا/بغداد"
+
+#: ../calendar/zones.h:196
+msgid "Asia/Bahrain"
+msgstr "اېشيا/بحرېن"
+
+#: ../calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr "اېشيا/باکو"
+
+#: ../calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr "اېشيا/بېنګکاک"
+
+#: ../calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr "اېشيا/بيروت"
+
+#: ../calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr "اېشيا/بېشکېک"
+
+#: ../calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr "اېشيا/بروني"
+
+#: ../calendar/zones.h:202
+msgid "Asia/Calcutta"
+msgstr "اېشيا/کولکته"
+
+#: ../calendar/zones.h:203
+msgid "Asia/Choibalsan"
+msgstr "اېشيا/چوېبلسن"
+
+#: ../calendar/zones.h:204
+msgid "Asia/Chongqing"
+msgstr "اېشيا/چونګکېنګ"
+
+#: ../calendar/zones.h:205
+msgid "Asia/Colombo"
+msgstr "اېشيا/کولمبو"
+
+#: ../calendar/zones.h:206
+msgid "Asia/Damascus"
+msgstr "اېشيا/ډماسکس"
+
+#: ../calendar/zones.h:207
+msgid "Asia/Dhaka"
+msgstr "اېشيا/ډهاکه"
+
+#: ../calendar/zones.h:208
+msgid "Asia/Dili"
+msgstr "اېشيا/ډيلي"
+
+#: ../calendar/zones.h:209
+msgid "Asia/Dubai"
+msgstr "اېشيا/دوبۍ"
+
+#: ../calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr "اېشيا/دوشنبې"
+
+#: ../calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr "اېشيا/غزا"
+
+#: ../calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr "اېشيا/هربېن"
+
+#: ../calendar/zones.h:213
+msgid "Asia/Hong_Kong"
+msgstr "اېشيا/هانګ_کانګ"
+
+#: ../calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr "اېشيا/هووډ"
+
+#: ../calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr "اېشيا/اېرکوټسک"
+
+#: ../calendar/zones.h:216
+msgid "Asia/Istanbul"
+msgstr "اېشيا/استانبول"
+
+#: ../calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr "اېشيا/جکرتا"
+
+#: ../calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr "اېشيا/جېاپوره"
+
+#: ../calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr "اېشيا/جېروسلم"
+
+#: ../calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr "اېشيا/کابل"
+
+#: ../calendar/zones.h:221
+msgid "Asia/Kamchatka"
+msgstr "اېشيا/کمچټکا"
+
+#: ../calendar/zones.h:222
+msgid "Asia/Karachi"
+msgstr "اېشيا/کراچۍ"
+
+#: ../calendar/zones.h:223
+msgid "Asia/Kashgar"
+msgstr "اېشيا/کشګر"
+
+#: ../calendar/zones.h:224
+msgid "Asia/Katmandu"
+msgstr "اېشا/کېټمانډو"
+
+#: ../calendar/zones.h:225
+msgid "Asia/Krasnoyarsk"
+msgstr ""
+
+#: ../calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr "اېشيا/کوالا_لمپور"
+
+#: ../calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr "اېشيا/کوچينګ"
+
+#: ../calendar/zones.h:228
+msgid "Asia/Kuwait"
+msgstr "اېشيا/کوېټ"
+
+#: ../calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr "اېشيا/مکاو"
+
+#: ../calendar/zones.h:230
+msgid "Asia/Macau"
+msgstr "اېشيا/مکاو"
+
+#: ../calendar/zones.h:231
+msgid "Asia/Magadan"
+msgstr "اېشيا/مګډن"
+
+#: ../calendar/zones.h:232
+msgid "Asia/Makassar"
+msgstr "اېشيا/مکسسر"
+
+#: ../calendar/zones.h:233
+msgid "Asia/Manila"
+msgstr "اېشيا/منيلا"
+
+#: ../calendar/zones.h:234
+msgid "Asia/Muscat"
+msgstr "اېشيا/موسکټ"
+
+#: ../calendar/zones.h:235
+msgid "Asia/Nicosia"
+msgstr "اېشيا/نېکوشيا"
+
+#: ../calendar/zones.h:236
+msgid "Asia/Novosibirsk"
+msgstr "اېشيا/نووسېبرسک"
+
+#: ../calendar/zones.h:237
+msgid "Asia/Omsk"
+msgstr "اېشيا/ومسک"
+
+#: ../calendar/zones.h:238
+msgid "Asia/Oral"
+msgstr "اېشيا/اورال"
+
+#: ../calendar/zones.h:239
+msgid "Asia/Phnom_Penh"
+msgstr "اېشيا/پهنوم_پېنه"
+
+#: ../calendar/zones.h:240
+msgid "Asia/Pontianak"
+msgstr "اېشيا/پونټيانک"
+
+#: ../calendar/zones.h:241
+msgid "Asia/Pyongyang"
+msgstr "اېشيا/پيانګيانګ"
+
+#: ../calendar/zones.h:242
+msgid "Asia/Qatar"
+msgstr "اېشيا/قطر"
+
+#: ../calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../calendar/zones.h:244
+msgid "Asia/Rangoon"
+msgstr "اېشيا/رنګون"
+
+#: ../calendar/zones.h:245
+msgid "Asia/Riyadh"
+msgstr "اېشيا/رياض"
+
+#: ../calendar/zones.h:246
+msgid "Asia/Saigon"
+msgstr "اېشيا/ساېګون"
+
+#: ../calendar/zones.h:247
+msgid "Asia/Sakhalin"
+msgstr "اېشيا/سکالين"
+
+#: ../calendar/zones.h:248
+msgid "Asia/Samarkand"
+msgstr "اېشيا/سمرکند"
+
+#: ../calendar/zones.h:249
+msgid "Asia/Seoul"
+msgstr "اېشيا/سېول"
+
+#: ../calendar/zones.h:250
+msgid "Asia/Shanghai"
+msgstr "اېشيا/شنګهای"
+
+#: ../calendar/zones.h:251
+msgid "Asia/Singapore"
+msgstr "اېشيا/سنګاپور"
+
+#: ../calendar/zones.h:252
+msgid "Asia/Taipei"
+msgstr "اېشيا/ټاېپي"
+
+#: ../calendar/zones.h:253
+msgid "Asia/Tashkent"
+msgstr "اېشيا/ټاشکنټ"
+
+#: ../calendar/zones.h:254
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: ../calendar/zones.h:255
+msgid "Asia/Tehran"
+msgstr "اېشيا/تهران"
+
+#: ../calendar/zones.h:256
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: ../calendar/zones.h:257
+msgid "Asia/Tokyo"
+msgstr "اېشيا/ټوکيو"
+
+#: ../calendar/zones.h:258
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: ../calendar/zones.h:259
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: ../calendar/zones.h:260
+msgid "Asia/Urumqi"
+msgstr "اېشيا/اورمچي"
+
+#: ../calendar/zones.h:261
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: ../calendar/zones.h:262
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: ../calendar/zones.h:263
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: ../calendar/zones.h:264
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: ../calendar/zones.h:265
+msgid "Asia/Yerevan"
+msgstr "اېشيا/اېرېوان"
+
+#: ../calendar/zones.h:266
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: ../calendar/zones.h:267
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: ../calendar/zones.h:268
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: ../calendar/zones.h:269
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: ../calendar/zones.h:270
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: ../calendar/zones.h:271
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: ../calendar/zones.h:272
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: ../calendar/zones.h:273
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: ../calendar/zones.h:274
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: ../calendar/zones.h:275
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: ../calendar/zones.h:276
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: ../calendar/zones.h:277
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: ../calendar/zones.h:278
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: ../calendar/zones.h:279
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: ../calendar/zones.h:280
+msgid "Australia/Darwin"
+msgstr ""
+
+#: ../calendar/zones.h:281
+msgid "Australia/Hobart"
+msgstr ""
+
+#: ../calendar/zones.h:282
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: ../calendar/zones.h:283
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: ../calendar/zones.h:284
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: ../calendar/zones.h:285
+msgid "Australia/Perth"
+msgstr "اسټريليا/پېرټ"
+
+#: ../calendar/zones.h:286
+msgid "Australia/Sydney"
+msgstr "اسټريليا/سېډني"
+
+#: ../calendar/zones.h:287
+msgid "Europe/Amsterdam"
+msgstr "يورپ/اېمسټرډېم"
+
+#: ../calendar/zones.h:288
+msgid "Europe/Andorra"
+msgstr "يورپ/انډورا"
+
+#: ../calendar/zones.h:289
+msgid "Europe/Athens"
+msgstr "يورپ/اتېنز"
+
+#: ../calendar/zones.h:290
+msgid "Europe/Belfast"
+msgstr "يورپ/بېلفاسټ"
+
+#: ../calendar/zones.h:291
+msgid "Europe/Belgrade"
+msgstr "يورپ/بېلګرېډ"
+
+#: ../calendar/zones.h:292
+msgid "Europe/Berlin"
+msgstr "يورپ/برلېن"
+
+#: ../calendar/zones.h:293
+msgid "Europe/Bratislava"
+msgstr "يورپ/برېټسلېوا"
+
+#: ../calendar/zones.h:294
+msgid "Europe/Brussels"
+msgstr "يورپ/بروسېلز"
+
+#: ../calendar/zones.h:295
+msgid "Europe/Bucharest"
+msgstr "يورپ/بکارسټ"
+
+#: ../calendar/zones.h:296
+msgid "Europe/Budapest"
+msgstr "يورپ/بوډېپېسټ"
+
+#: ../calendar/zones.h:297
+msgid "Europe/Chisinau"
+msgstr "يورپ/چېسېناو"
+
+#: ../calendar/zones.h:298
+msgid "Europe/Copenhagen"
+msgstr "يورپ/کوپېنهېګن"
+
+#: ../calendar/zones.h:299
+msgid "Europe/Dublin"
+msgstr "يورپ/ډبلېن"
+
+#: ../calendar/zones.h:300
+msgid "Europe/Gibraltar"
+msgstr "يورپ/جېبرلټر"
+
+#: ../calendar/zones.h:301
+msgid "Europe/Helsinki"
+msgstr "يورپ/هېلسينکي"
+
+#: ../calendar/zones.h:302
+msgid "Europe/Istanbul"
+msgstr "يورپ/استانبول"
+
+#: ../calendar/zones.h:303
+msgid "Europe/Kaliningrad"
+msgstr "يورپ/کېلېنېنګرېډ"
+
+#: ../calendar/zones.h:304
+msgid "Europe/Kiev"
+msgstr "يورپ/کيو"
+
+#: ../calendar/zones.h:305
+msgid "Europe/Lisbon"
+msgstr "يورپ/لېسبن"
+
+#: ../calendar/zones.h:306
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: ../calendar/zones.h:307
+msgid "Europe/London"
+msgstr "يورپ/لڼدن"
+
+#: ../calendar/zones.h:308
+msgid "Europe/Luxembourg"
+msgstr "يورپ/لګسېمبرګ"
+
+#: ../calendar/zones.h:309
+msgid "Europe/Madrid"
+msgstr "يورپ/مېډرېډ"
+
+#: ../calendar/zones.h:310
+msgid "Europe/Malta"
+msgstr "يورپ/مالټا"
+
+#: ../calendar/zones.h:311
+msgid "Europe/Minsk"
+msgstr "يورپ/مېنسک"
+
+#: ../calendar/zones.h:312
+msgid "Europe/Monaco"
+msgstr "يورپ/موناکو"
+
+#: ../calendar/zones.h:313
+msgid "Europe/Moscow"
+msgstr "يورپ/مسکاو"
+
+#: ../calendar/zones.h:314
+msgid "Europe/Nicosia"
+msgstr "يورپ/نېکوشيا"
+
+#: ../calendar/zones.h:315
+msgid "Europe/Oslo"
+msgstr "يورپ/وسلو"
+
+#: ../calendar/zones.h:316
+msgid "Europe/Paris"
+msgstr "يورپ/پاريس"
+
+#: ../calendar/zones.h:317
+msgid "Europe/Prague"
+msgstr "يورپ/پراګ"
+
+#: ../calendar/zones.h:318
+msgid "Europe/Riga"
+msgstr "يورپ/رېګا"
+
+#: ../calendar/zones.h:319
+msgid "Europe/Rome"
+msgstr "يورپ/روم"
+
+#: ../calendar/zones.h:320
+msgid "Europe/Samara"
+msgstr "يورپ/سمارا"
+
+#: ../calendar/zones.h:321
+msgid "Europe/San_Marino"
+msgstr "يورپ/سن_مارينو"
+
+#: ../calendar/zones.h:322
+msgid "Europe/Sarajevo"
+msgstr "يورپ/سراجيوو"
+
+#: ../calendar/zones.h:323
+msgid "Europe/Simferopol"
+msgstr "يورپ/سېمفېروپول"
+
+#: ../calendar/zones.h:324
+msgid "Europe/Skopje"
+msgstr "يورپ/سکوپجي"
+
+#: ../calendar/zones.h:325
+msgid "Europe/Sofia"
+msgstr "يورپ/سوفيه"
+
+#: ../calendar/zones.h:326
+msgid "Europe/Stockholm"
+msgstr "يورپ/سټاکهولم"
+
+#: ../calendar/zones.h:327
+msgid "Europe/Tallinn"
+msgstr "يورپ/ټېلېن"
+
+#: ../calendar/zones.h:328
+msgid "Europe/Tirane"
+msgstr "يورپ/ټېراني"
+
+#: ../calendar/zones.h:329
+msgid "Europe/Uzhgorod"
+msgstr "يورپ/وزګورود"
+
+#: ../calendar/zones.h:330
+msgid "Europe/Vaduz"
+msgstr "يورپ/وېډوز"
+
+#: ../calendar/zones.h:331
+msgid "Europe/Vatican"
+msgstr "يورپ/وېټېکن"
+
+#: ../calendar/zones.h:332
+msgid "Europe/Vienna"
+msgstr "يورپ/وينا"
+
+#: ../calendar/zones.h:333
+msgid "Europe/Vilnius"
+msgstr "يورپ/وېلنيس"
+
+#: ../calendar/zones.h:334
+msgid "Europe/Warsaw"
+msgstr "يورپ/وارسا"
+
+#: ../calendar/zones.h:335
+msgid "Europe/Zagreb"
+msgstr "يورپ/زېګرېب"
+
+#: ../calendar/zones.h:336
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: ../calendar/zones.h:337
+msgid "Europe/Zurich"
+msgstr ""
+
+#: ../calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: ../calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr "هندي/چاګوس"
+
+#: ../calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr "هندي/کرېسمېس"
+
+#: ../calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr "هندي/کوکوس"
+
+#: ../calendar/zones.h:342
+msgid "Indian/Comoro"
+msgstr "هندي/کومورو"
+
+#: ../calendar/zones.h:343
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: ../calendar/zones.h:344
+msgid "Indian/Mahe"
+msgstr "هندي/ماهي"
+
+#: ../calendar/zones.h:345
+msgid "Indian/Maldives"
+msgstr "هندي/مالديوز"
+
+#: ../calendar/zones.h:346
+msgid "Indian/Mauritius"
+msgstr "هندي/موريشيز"
+
+#: ../calendar/zones.h:347
+msgid "Indian/Mayotte"
+msgstr "هندي/ميوټي"
+
+#: ../calendar/zones.h:348
+msgid "Indian/Reunion"
+msgstr ""
+
+#: ../calendar/zones.h:349
+msgid "Pacific/Apia"
+msgstr ""
+
+#: ../calendar/zones.h:350
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: ../calendar/zones.h:351
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: ../calendar/zones.h:352
+msgid "Pacific/Easter"
+msgstr ""
+
+#: ../calendar/zones.h:353
+msgid "Pacific/Efate"
+msgstr ""
+
+#: ../calendar/zones.h:354
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: ../calendar/zones.h:355
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: ../calendar/zones.h:356
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: ../calendar/zones.h:357
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: ../calendar/zones.h:358
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: ../calendar/zones.h:359
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: ../calendar/zones.h:360
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: ../calendar/zones.h:361
+msgid "Pacific/Guam"
+msgstr ""
+
+#: ../calendar/zones.h:362
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: ../calendar/zones.h:363
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: ../calendar/zones.h:364
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: ../calendar/zones.h:365
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: ../calendar/zones.h:366
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: ../calendar/zones.h:367
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Midway"
+msgstr ""
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Niue"
+msgstr ""
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Palau"
+msgstr ""
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Truk"
+msgstr ""
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Wake"
+msgstr ""
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Yap"
+msgstr ""
+
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "خپلساتل شوې دوتنه نه شي پرانيستلی"
+
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "د سمونګر نه استوزه نه شي راوستلی"
+
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "نښلن ورننويستل"
+
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "ن_ښلول"
+
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "بېسرليکه استوزه"
+
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "دوتنه نښلول"
+
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "بندول_"
+
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "اوسنۍ دوتنه بندول"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "...چاپول_"
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "چاپ مخ_ليد"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "اوسنۍ دوتنه ساتل"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "...ساتل _په"
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "اوسنۍ دوتنه په بل نوم ساتل"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "ګارليک _ساتل"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "لکه ګارليک ساتل"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "ل_ېږل"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "دا استوزه لېږل"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "د لېږلو غوراوي ورننويستل"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "نوې _استوزه"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "د نوې استوزې کړکۍ پرانيستل"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "لوښه _کوډييزونه"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "خونديتوب_"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "_کوډه کښل PGP"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "نښه_ PGP"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "پ.ل ډګر_"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "څ.ل ډګر_"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "له ډګر_"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "ته-لېږل ډګر_"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "ته-ځواب ډګر_"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "سرليک ډګر_"
+
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "ته ډګر_"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:71
+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-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr ":ل_ه"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr ":ته-ځواب_"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr ":ته_"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr ":څ.ل_"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr ":پ.ل_"
+
+#: ../composer/e-composer-header-table.c:673
+msgid "_Post To:"
+msgstr ":ته لېږل_"
+
+#: ../composer/e-composer-header-table.c:677
+msgid "S_ubject:"
+msgstr ":سرليک_"
+
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr ":لاس_ليک"
+
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "د پته کتاب لپاره دلته کېکاږﺉ"
+
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "د لېږلو موخه"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr ".هغه پوښۍ چې استوزه ورته لېږل غواړﺉ وټاکئ"
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr ""
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "اوسني _لاسوندونه"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "نښلن _پټه ښودل"
+
+#: ../composer/e-msg-composer.c:873
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:880
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "نښلن"
+msgstr[1] "نښلنونه"
+
+#: ../composer/e-msg-composer.c:1557
+msgid "Hide _Attachment Bar"
+msgstr "نښلن _پټه پټول"
+
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+msgid "Compose Message"
+msgstr "استوزه ليکل"
+
+#: ../composer/e-msg-composer.c:4056
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "ټول ګڼونونه وړنګول شول"
+
+#: ../composer/mail-composer.error.xml.h:3
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "Because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:6
+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.error.xml.h:7
+msgid "Could not create composer window."
+msgstr ".ليکونکې کړکۍ نه شي جوړولی"
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Could not create message."
+msgstr ".استوزه نه شي جوړولی"
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr ".استوزو سره پوښۍ نه شي نښلېدلی"
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "رالېښنه پرمختګ کې ده. ليک لېږل غواړﺉ؟"
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.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."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:17
+msgid ""
+"Send options available only for Novell Groupwise and Microsoft Exchange "
+"accounts."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Send options not available."
+msgstr ".د لېږلو غوراوي شتون نه لري"
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:20
+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 ""
+
+#: ../composer/mail-composer.error.xml.h:21
+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 ""
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "Unfinished messages found"
+msgstr "نابشپړې استوزې وموندل شوې"
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Warning: Modified Message"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:27
+msgid "You cannot attach the file `{0}' to this message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:28
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Do not Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+msgid "_Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save Message"
+msgstr "استوزه ساتل_"
+
+#: ../data/evolution.desktop.in.in.h:1
+msgid "Evolution Mail and Calendar"
+msgstr "اېوليوشن ليک او کليز"
+
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+msgid "Groupware Suite"
+msgstr ""
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Manage your email, contacts and schedule"
+msgstr "خپل برېښليکونه، اړيکلوري او مهالوېش سمبال کړﺉ"
+
+#: ../data/evolution.keys.in.in.h:1
+msgid "address card"
+msgstr "پته کارډ"
+
+#: ../data/evolution.keys.in.in.h:2
+msgid "calendar information"
+msgstr "کليز خبرتياوې"
+
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+msgid "Evolution Error"
+msgstr "د اېوليوشن تېروتنه"
+
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+msgid "Evolution Warning"
+msgstr "د اېوليوشن خبرتيا"
+
+#: ../e-util/e-error.c:117
+msgid "Evolution Information"
+msgstr "د اېوليوشن خبرتياوې"
+
+#: ../e-util/e-error.c:119
+msgid "Evolution Query"
+msgstr "د اېوليوشن پوښتن"
+
+#. setup a dummy error
+#: ../e-util/e-error.c:449
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr ""
+
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "رغتوکی"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "توانول شوي"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr ""
+
+#: ../e-util/e-print.c:158
+msgid "An error occurred while printing"
+msgstr ""
+
+#: ../e-util/e-print.c:165
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:171
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file \"{0}\"."
+msgstr ".دوتنه نه شي پرانيستلی ‎\"{0}\""
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "غواړﺉ چې ځاېناستی يې کړﺉ؟"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "دوتنه ځاېناستول غواړﺉ؟"
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+msgid "_Overwrite"
+msgstr "ځاېناستول_"
+
+#: ../e-util/e-util-labels.c:37
+msgid "I_mportant"
+msgstr "ا_ړين"
+
+#. red
+#: ../e-util/e-util-labels.c:38
+msgid "_Work"
+msgstr "دنده_"
+
+#. orange
+#: ../e-util/e-util-labels.c:39
+msgid "_Personal"
+msgstr "وګړيز"
+
+#. green
+#: ../e-util/e-util-labels.c:40
+msgid "_To Do"
+msgstr "کول_"
+
+#. blue
+#: ../e-util/e-util-labels.c:41
+msgid "_Later"
+msgstr "وروسته_"
+
+#: ../e-util/e-util-labels.c:309
+msgid "Label _Name:"
+msgstr ":د نښکې _نوم"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Edit Label"
+msgstr "نښکه سمول"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Add Label"
+msgstr "نښکه زياتول"
+
+#: ../e-util/e-util-labels.c:351
+msgid "Label name cannot be empty."
+msgstr ".د نښکې نوم نه شي تشېدی"
+
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "%s :تېروتنه GConf"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr ".ټولې نورې تېروتنې يوازې په پايالي کې ښودل کيږي"
+
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "۱ سېکېنډ مخکې"
+msgstr[1] "سېکېنډه مخکې %d"
+
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "۱ سېکېنډ وروسته"
+msgstr[1] "سېکېنډه وروسته %d"
+
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "۱ مېنټ مخکې"
+msgstr[1] "مېنټه مخکې %d"
+
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "۱ مېنټ وروسته"
+msgstr[1] "مېنټه وروسته %d"
+
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "۱ ګېنټه مخکې"
+msgstr[1] "ګېنټې مخکې %d"
+
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "۱ ګېنټه وروسته"
+msgstr[1] "ګېنټې وروسته %d"
+
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "۱ ورځ مخکې"
+msgstr[1] "ورځ مخکې %d"
+
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "۱ ورځ وروسته"
+msgstr[1] "ورځې وروسته %d"
+
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "۱ اونۍ مخکې"
+msgstr[1] "اونۍ مخکې %d"
+
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "۱ اونۍ وروسته"
+msgstr[1] "اونۍ وروسته %d"
+
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "۱ مياشت مخکې"
+msgstr[1] "مياشتې مخکې %d"
+
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "۱ مياشت وروسته"
+msgstr[1] "مياشتې وروسته %d"
+
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "۱ کال مخکې"
+msgstr[1] "کاله مخکې %d"
+
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "۱ کال وروسته"
+msgstr[1] "کاله وروسته %d"
+
+#: ../filter/filter-datespec.c:287
+msgid "<click here to select a date>"
+msgstr "<د نېټې ټاکلو لپاره دلته کېکاږﺉ>"
+
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
+msgid "now"
+msgstr "اوس"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/filter-datespec.c:297
+msgid "%d-%b-%Y"
+msgstr "%d-%b-%Y"
+
+#: ../filter/filter-datespec.c:451
+msgid "Select a time to compare against"
+msgstr ""
+
+#: ../filter/filter-file.c:284
+msgid "Choose a file"
+msgstr "يوه دوتنه وټاکئ"
+
+#: ../filter/filter-part.c:532
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "ازموېل"
+
+#: ../filter/filter-rule.c:851
+msgid "R_ule name:"
+msgstr ":د د_وی نوم"
+
+#: ../filter/filter-rule.c:879
+msgid "Find items that meet the following criteria"
+msgstr ""
+
+#: ../filter/filter-rule.c:913
+msgid "A_dd Filter Criteria"
+msgstr ""
+
+#: ../filter/filter-rule.c:919
+msgid "If all criteria are met"
+msgstr ""
+
+#: ../filter/filter-rule.c:919
+msgid "If any criteria are met"
+msgstr ""
+
+#: ../filter/filter-rule.c:921
+msgid "_Find items:"
+msgstr ":توکي لټول_"
+
+#: ../filter/filter-rule.c:943
+msgid "All related"
+msgstr "ټول تړلي"
+
+#: ../filter/filter-rule.c:943
+msgid "Replies"
+msgstr "ځوابونه"
+
+#: ../filter/filter-rule.c:943
+msgid "Replies and parents"
+msgstr "ځوابونه او پلرين"
+
+#: ../filter/filter-rule.c:943
+msgid "No reply or parent"
+msgstr "هېڅ ځواب يا پلرين"
+
+#: ../filter/filter-rule.c:945
+msgid "I_nclude threads"
+msgstr "مزي ن_نويستل"
+
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
+msgid "Incoming"
+msgstr "راتلونکی"
+
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
+msgid "Outgoing"
+msgstr "تلونکی"
+
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+msgid "Missing name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr ".لورينه وکړﺉ بل نوم وټاکئ"
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+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:4
+msgid "Show filters for mail:"
+msgstr ":د ليک لپاره چاڼونه ښودل"
+
+#: ../filter/filter.glade.h:5
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: ../filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.glade.h:12
+msgid "a time relative to the current time"
+msgstr ""
+
+#: ../filter/filter.glade.h:13
+msgid "ago"
+msgstr "مخکې"
+
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr "په راتلونکي کې"
+
+#: ../filter/filter.glade.h:18
+msgid "months"
+msgstr "مياشتې"
+
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+msgid "seconds"
+msgstr "سېکېنډه"
+
+#: ../filter/filter.glade.h:20
+msgid "the current time"
+msgstr "اوسنی مهال"
+
+#: ../filter/filter.glade.h:21
+msgid "the time you specify"
+msgstr "کوم مهال چې تاسو ټاکئ"
+
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:404
+msgid "weeks"
+msgstr "اونۍ"
+
+#: ../filter/filter.glade.h:23
+msgid "years"
+msgstr "کاله"
+
+#: ../filter/rule-editor.c:380
+msgid "Add Rule"
+msgstr "دوی زياتول"
+
+#: ../filter/rule-editor.c:459
+msgid "Edit Rule"
+msgstr "دوی سمول"
+
+#: ../filter/rule-editor.c:786
+msgid "Rule name"
+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 "Configure your network connection settings 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/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
+msgid "Evolution Network configuration control"
+msgstr "د اېوليوشن ځال سازونې مهار"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "ليک"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
+msgid "Mail Accounts"
+msgstr "ليک ګڼونونه"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
+msgid "Mail Preferences"
+msgstr "ليک غوراوي"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "ځال غوراوي"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+msgid "_Mail"
+msgstr "ليک_"
+
+#: ../mail/em-account-editor.c:387
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: ../mail/em-account-editor.c:394
+#, 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/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:512
+msgid "Select Folder"
+msgstr "پوښۍ ټاکل"
+
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
+msgid "Autogenerated"
+msgstr ""
+
+#: ../mail/em-account-editor.c:762
+msgid "Ask for each message"
+msgstr "د هرې استوزې لپاره پوښتل"
+
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+msgid "Identity"
+msgstr "پیژندنه"
+
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+msgid "Receiving Email"
+msgstr "برېښليک راوستل کيږي"
+
+#: ../mail/em-account-editor.c:2041
+msgid "Check for _new messages every"
+msgstr "د _نوېو استوزو لپاره کتل هر"
+
+#: ../mail/em-account-editor.c:2049
+msgid "minu_tes"
+msgstr "مېن_ټه"
+
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+msgid "Sending Email"
+msgstr "برېښليک لېږل کيږي"
+
+#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+msgid "Defaults"
+msgstr "تلوالې"
+
+#. Security settings
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
+msgid "Security"
+msgstr "خونديتوب"
+
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+msgid "Receiving Options"
+msgstr "د نيوونې غوراوي"
+
+#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+msgid "Checking for New Messages"
+msgstr "د نوېو استوزو لپاره کتل کيږي"
+
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "ګڼون سمونګر"
+
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+msgid "Evolution Account Assistant"
+msgstr "اېوليوشن ګڼون مرستيال"
+
+#. translators: default account indicator
+#: ../mail/em-account-prefs.c:429
+msgid "[Default]"
+msgstr "[تلواله]"
+
+#: ../mail/em-account-prefs.c:488
+msgid "Account name"
+msgstr "ګڼون نوم"
+
+#: ../mail/em-account-prefs.c:490
+msgid "Protocol"
+msgstr "باندره"
+
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+msgid "Unnamed"
+msgstr "بېنومه"
+
+#: ../mail/em-composer-prefs.c:992
+msgid "Language(s)"
+msgstr "ژبه"
+
+#: ../mail/em-composer-prefs.c:1041
+msgid "Add signature script"
+msgstr "لاسليک سکرېپټ زياتول"
+
+#: ../mail/em-composer-prefs.c:1083
+msgid "Signature(s)"
+msgstr "لاسليک(ونه)"
+
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+msgid "-------- Forwarded Message --------"
+msgstr "-------- مخکې شوې استوزه --------"
+
+#: ../mail/em-composer-utils.c:1960
+msgid "an unknown sender"
+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:2007
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2150
+msgid "-----Original Message-----"
+msgstr "-----اره استوزه-----"
+
+#: ../mail/em-filter-editor.c:156
+msgid "_Filter Rules"
+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:6
+msgid "BCC"
+msgstr "پ.ل"
+
+#: ../mail/em-filter-i18n.h:7
+msgid "Beep"
+msgstr "بيپ"
+
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "څ.ل"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "بشپړ شوی په"
+
+#: ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "پوښۍ ته لمېسل"
+
+#: ../mail/em-filter-i18n.h:12
+msgid "Date received"
+msgstr "د رسېدلو نېټه"
+
+#: ../mail/em-filter-i18n.h:13
+msgid "Date sent"
+msgstr "د لېږلو نېټه"
+
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:767
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "ړنګول"
+
+#: ../mail/em-filter-i18n.h:15
+msgid "Deleted"
+msgstr "ړنګېدلی"
+
+#: ../mail/em-filter-i18n.h:17
+msgid "does not end with"
+msgstr "نه پايږي په"
+
+#: ../mail/em-filter-i18n.h:18
+msgid "does not exist"
+msgstr "شتون نه لري"
+
+#: ../mail/em-filter-i18n.h:19
+msgid "does not return"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:20
+msgid "does not sound like"
+msgstr "داسې نه ښکاري لکه"
+
+#: ../mail/em-filter-i18n.h:21
+msgid "does not start with"
+msgstr "نه پېليږي په"
+
+#: ../mail/em-filter-i18n.h:23
+msgid "Draft"
+msgstr "ګارلیک"
+
+#: ../mail/em-filter-i18n.h:24
+msgid "ends with"
+msgstr "پايږي په"
+
+#: ../mail/em-filter-i18n.h:26
+msgid "exists"
+msgstr "شته دی"
+
+#: ../mail/em-filter-i18n.h:27
+msgid "Expression"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:28
+msgid "Follow Up"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+msgid "Important"
+msgstr "اړين"
+
+#: ../mail/em-filter-i18n.h:31
+msgid "is after"
+msgstr "وروسته دی له"
+
+#: ../mail/em-filter-i18n.h:32
+msgid "is before"
+msgstr "مخکی دی له"
+
+#: ../mail/em-filter-i18n.h:33
+msgid "is Flagged"
+msgstr "جنډول شوی"
+
+#: ../mail/em-filter-i18n.h:37
+msgid "is not Flagged"
+msgstr "نه دی جنډول شوی"
+
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "نه دی ټاکل شوی"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "ټاکل شوی"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../ui/evolution-mail-message.xml.h:48
+msgid "Junk"
+msgstr "سرکودن"
+
+#: ../mail/em-filter-i18n.h:41
+msgid "Junk Test"
+msgstr "سرکودن ازموېنه"
+
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+msgid "Label"
+msgstr "نښکه"
+
+#: ../mail/em-filter-i18n.h:43
+msgid "Mailing list"
+msgstr "ليک لړ"
+
+#: ../mail/em-filter-i18n.h:44
+msgid "Match All"
+msgstr "ټول سارول"
+
+#: ../mail/em-filter-i18n.h:45
+msgid "Message Body"
+msgstr "د استوزې تنه"
+
+#: ../mail/em-filter-i18n.h:46
+msgid "Message Header"
+msgstr "د استوزې سريز"
+
+#: ../mail/em-filter-i18n.h:47
+msgid "Message is Junk"
+msgstr "استوزه سرکودنه ده"
+
+#: ../mail/em-filter-i18n.h:48
+msgid "Message is not Junk"
+msgstr "استوزه سرکودنه نه ده"
+
+#: ../mail/em-filter-i18n.h:49
+msgid "Move to Folder"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:50
+msgid "Pipe to Program"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:51
+msgid "Play Sound"
+msgstr "غږ غږول"
+
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "لوستل"
+
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+msgid "Recipients"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:55
+msgid "Regex Match"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:56
+msgid "Replied to"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:57
+msgid "returns"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:58
+msgid "returns greater than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:59
+msgid "returns less than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:60
+msgid "Run Program"
+msgstr "کړنلار ځغلول"
+
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+msgid "Score"
+msgstr "شمېره"
+
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+msgid "Sender"
+msgstr "استوونی"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "نښکه ټاکل"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "Set Status"
+msgstr "انکړ ټاکل"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "Size (kB)"
+msgstr "(kB) کچ "
+
+#: ../mail/em-filter-i18n.h:66
+msgid "sounds like"
+msgstr "ښکاري لکه"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "Source Account"
+msgstr "سرچينه ګڼون"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "Specific header"
+msgstr "ځانګړی سريز"
+
+#: ../mail/em-filter-i18n.h:69
+msgid "starts with"
+msgstr "پېليږي په"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "Stop Processing"
+msgstr "بهيرونه تمول"
+
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1132
+msgid "Subject"
+msgstr "سرليک"
+
+#: ../mail/em-filter-i18n.h:73
+msgid "Unset Status"
+msgstr "ناټاکلی انکړ"
+
+#. and now for the action area
+#: ../mail/em-filter-rule.c:521
+msgid "Then"
+msgstr "بيا"
+
+#: ../mail/em-filter-rule.c:549
+msgid "Add Ac_tion"
+msgstr "چرار زياتول"
+
+#: ../mail/em-folder-browser.c:189
+msgid "C_reate Search Folder From Search..."
+msgstr ""
+
+#: ../mail/em-folder-browser.c:214
+msgid "All Messages"
+msgstr "ټولې استوزې"
+
+#: ../mail/em-folder-browser.c:215
+msgid "Unread Messages"
+msgstr "نالوستې استوزې"
+
+#: ../mail/em-folder-browser.c:217
+msgid "No Label"
+msgstr "هېڅ نښکه"
+
+#: ../mail/em-folder-browser.c:224
+msgid "Read Messages"
+msgstr "لوستې استوزې"
+
+#: ../mail/em-folder-browser.c:225
+msgid "Recent Messages"
+msgstr "اوسنۍ استوزې"
+
+#: ../mail/em-folder-browser.c:226
+msgid "Last 5 Days' Messages"
+msgstr "د تېرو ۵ ورځو استوزې"
+
+#: ../mail/em-folder-browser.c:227
+msgid "Messages with Attachments"
+msgstr "استوزې د نښلنونو سره"
+
+#: ../mail/em-folder-browser.c:228
+msgid "Important Messages"
+msgstr "اړينې استوزې"
+
+#: ../mail/em-folder-browser.c:229
+msgid "Messages Not Junk"
+msgstr "استوزه سرکودن نه ده"
+
+#: ../mail/em-folder-browser.c:1153
+msgid "Account Search"
+msgstr "ګڼون لټون"
+
+#: ../mail/em-folder-browser.c:1206
+msgid "All Account Search"
+msgstr "ټول ګڼون لټون"
+
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:173
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] ":نالوستي استوزې"
+msgstr[1] ":نالوستي استوزې"
+
+#. TODO: can this be done in a loop?
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:177
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] ":ټولې استوزې"
+msgstr[1] ":ټولې استوزې"
+
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:385
+#: ../plugins/groupwise-features/properties.glade.h:4
+msgid "Folder Properties"
+msgstr "پوښۍ ځانتياوې"
+
+#: ../mail/em-folder-selection-button.c:120
+msgid "<click here to select a folder>"
+msgstr "<د پوښۍ ټاکلو لپاره دلته کېکاږﺉ>"
+
+#: ../mail/em-folder-selector.c:254
+msgid "C_reate"
+msgstr "ج_وړول"
+
+#: ../mail/em-folder-selector.c:258
+msgid "Folder _name:"
+msgstr ":د پوښۍ نوم_"
+
+#. load store to mail component at the end, when everything is loaded
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+msgid "Search Folders"
+msgstr "پوښۍ پلټل"
+
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+msgid "UNMATCHED"
+msgstr ""
+
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+msgid "Drafts"
+msgstr "ګارليک"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
+#: ../mail/mail-component.c:160
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "دننبکس"
+
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+msgid "Outbox"
+msgstr "بهربکس"
+
+#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+msgid "Sent"
+msgstr "لېږلي"
+
+#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+msgid "Loading..."
+msgstr "...لېښل کيږي"
+
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:371
+#, c-format
+msgid "folder-display|%s (%u)"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:732
+msgid "Mail Folder Tree"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:891
+#, c-format
+msgid "Moving folder %s"
+msgstr "پوښۍ خوځول کيږي %s"
+
+#: ../mail/em-folder-tree.c:893
+#, c-format
+msgid "Copying folder %s"
+msgstr "پوښۍ لمېسل کيږي %s"
+
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1955
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1957
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:917
+msgid "Cannot drop message(s) into toplevel store"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+msgid "_Copy to Folder"
+msgstr "پوښۍ لمېسل_"
+
+#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+msgid "_Move to Folder"
+msgstr "پوښۍ ته خوځول_"
+
+#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr ""
+
+#: ../mail/em-folder-tree.c:2083
+msgid "Open in _New Window"
+msgstr "په نوې _کړکۍ کې پرانيستل"
+
+#. FIXME: need to disable for nochildren folders
+#: ../mail/em-folder-tree.c:2088
+msgid "_New Folder..."
+msgstr "...نوې پوښۍ_"
+
+#: ../mail/em-folder-tree.c:2091
+msgid "_Move..."
+msgstr "...خوځول_"
+
+#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "...بيانومول_"
+
+#: ../mail/em-folder-tree.c:2099
+msgid "Re_fresh"
+msgstr "تا_ندول"
+
+#: ../mail/em-folder-tree.c:2100
+msgid "Fl_ush Outbox"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
+msgstr "خځلنۍ تشول_"
+
+#: ../mail/em-folder-utils.c:103
+#, c-format
+msgid "Copying `%s' to `%s'"
+msgstr ""
+
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
+msgid "Select folder"
+msgstr "پوښۍ ټاکل"
+
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+msgid "C_opy"
+msgstr "ل_مېسل"
+
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "پوښۍ جوړول کيږي `%s'"
+
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
+msgid "Create folder"
+msgstr "پوښۍ جوړول"
+
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr "د ليک ړنګېدنه پاتې راغله"
+
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+msgid "_Reply to Sender"
+msgstr "استوونکی ځوابول_"
+
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../ui/evolution-mail-message.xml.h:110
+msgid "_Forward"
+msgstr "مخکې_"
+
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
+msgid "_Edit as New Message..."
+msgstr "...لکه نوې استوزه سمول_"
+
+#: ../mail/em-folder-view.c:1348
+msgid "U_ndelete"
+msgstr "ن_اړنګول"
+
+#: ../mail/em-folder-view.c:1349
+msgid "_Move to Folder..."
+msgstr "...پوښۍ ته خوځول_"
+
+#: ../mail/em-folder-view.c:1350
+msgid "_Copy to Folder..."
+msgstr "...پوښۍ ته لمېسل_"
+
+#: ../mail/em-folder-view.c:1353
+msgid "Mar_k as Read"
+msgstr "لکه لوستی نښو_ل"
+
+#: ../mail/em-folder-view.c:1354
+msgid "Mark as _Unread"
+msgstr "لکه _نالوستی نښول"
+
+#: ../mail/em-folder-view.c:1355
+msgid "Mark as _Important"
+msgstr "لکه _اړين نښول"
+
+#: ../mail/em-folder-view.c:1356
+msgid "Mark as Un_important"
+msgstr "لکه _نااړين نښودل"
+
+#: ../mail/em-folder-view.c:1357
+msgid "Mark as _Junk"
+msgstr "لکه _سرکودن نښول"
+
+#: ../mail/em-folder-view.c:1358
+msgid "Mark as _Not Junk"
+msgstr "لکه سرکودن _نه نښودل"
+
+#: ../mail/em-folder-view.c:1359
+msgid "Mark for Follo_w Up..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1361
+msgid "_Label"
+msgstr "نښکه_"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
+msgid "_None"
+msgstr "هېڅ_"
+
+#: ../mail/em-folder-view.c:1365
+msgid "_New Label"
+msgstr "نوې نښکه"
+
+#: ../mail/em-folder-view.c:1369
+msgid "Fla_g Completed"
+msgstr "جن_ډه بشپړه شوه"
+
+#: ../mail/em-folder-view.c:1370
+msgid "Cl_ear Flag"
+msgstr "جنډه پا_کول"
+
+#: ../mail/em-folder-view.c:1373
+msgid "Crea_te Rule From Message"
+msgstr ""
+
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1375
+msgid "Search Folder based on _Subject"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1376
+msgid "Search Folder based on Se_nder"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1377
+msgid "Search Folder based on _Recipients"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1378
+msgid "Search Folder based on Mailing _List"
+msgstr ""
+
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1383
+msgid "Filter based on Sub_ject"
+msgstr "چاڼ د سر_ليک پر بنسټ"
+
+#: ../mail/em-folder-view.c:1384
+msgid "Filter based on Sen_der"
+msgstr "چاڼ د است_ووني پر بنسټ"
+
+#: ../mail/em-folder-view.c:1385
+msgid "Filter based on Re_cipients"
+msgstr "چاڼ د ني_وونی پر بنسټ"
+
+#: ../mail/em-folder-view.c:1386
+msgid "Filter based on _Mailing List"
+msgstr "چاڼ د _ليک لړ پر بنسټ"
+
+#. default charset used in mail view
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+msgid "Default"
+msgstr "تلواله"
+
+#: ../mail/em-folder-view.c:2531
+msgid "Unable to retrieve message"
+msgstr "استوزه نه شي راوستلی"
+
+#: ../mail/em-folder-view.c:2550
+msgid "Retrieving Message..."
+msgstr "استوزه راوستل کيږي..."
+
+#: ../mail/em-folder-view.c:2809
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2812
+msgid "Create _Search Folder"
+msgstr "پلټون _پوښۍ جوړول"
+
+#: ../mail/em-folder-view.c:2813
+msgid "_From this Address"
+msgstr "له دې پتې_"
+
+#: ../mail/em-folder-view.c:2814
+msgid "_To this Address"
+msgstr "دې پتې ته_"
+
+#: ../mail/em-folder-view.c:3311
+#, c-format
+msgid "Click to mail %s"
+msgstr ""
+
+#: ../mail/em-folder-view.c:3323
+#, c-format
+msgid "Click to call %s"
+msgstr ""
+
+#: ../mail/em-folder-view.c:3328
+msgid "Click to hide/unhide addresses"
+msgstr "د پتو پټولو/ښودلو لپاره کېکاږﺉ"
+
+#. message-search popup match count string
+#: ../mail/em-format-html-display.c:472
+#, c-format
+msgid "Matches: %d"
+msgstr "%d :ساري"
+
+#: ../mail/em-format-html-display.c:616
+msgid "Fin_d:"
+msgstr "لټو_ل:"
+
+#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
+#: ../mail/em-format-html-display.c:640
+msgid "_Previous"
+msgstr "مخکنی_"
+
+#: ../mail/em-format-html-display.c:645
+msgid "_Next"
+msgstr "راتلوکی_"
+
+#: ../mail/em-format-html-display.c:650
+msgid "M_atch case"
+msgstr "کېس س_ارول"
+
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+msgid "Unsigned"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:949
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+msgid "Valid signature"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:950
+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:951 ../mail/em-format-html.c:652
+msgid "Invalid signature"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:951
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+msgid "Valid signature, but cannot verify sender"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:952
+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:953 ../mail/em-format-html.c:654
+msgid "Signature exists, but need public key"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:953
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+msgid "Unencrypted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:960
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+msgid "Encrypted, weak"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:961
+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:962 ../mail/em-format-html.c:662
+msgid "Encrypted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:962
+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:963 ../mail/em-format-html.c:663
+msgid "Encrypted, strong"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:963
+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:1064 ../smime/gui/smime-ui.glade.h:48
+msgid "_View Certificate"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1079
+msgid "This certificate is not viewable"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1372
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1380
+msgid "Overdue:"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1383
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p ‎په"
+
+#: ../mail/em-format-html-display.c:1461
+msgid "_View Inline"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1462
+msgid "_Hide"
+msgstr "پټول_"
+
+#: ../mail/em-format-html-display.c:1463
+msgid "_Fit to Width"
+msgstr "پلنوالي سره برابرول_"
+
+#: ../mail/em-format-html-display.c:1464
+msgid "Show _Original Size"
+msgstr "ار _کچ ښودل"
+
+#: ../mail/em-format-html-display.c:1984
+msgid "Save attachment as"
+msgstr "نښلن ساتل لکه"
+
+#: ../mail/em-format-html-display.c:1988
+msgid "Select folder to save all attachments"
+msgstr "د ټولو نښلنونو ساتلو لپاره پوښۍ وټاکئ"
+
+#: ../mail/em-format-html-display.c:2039
+msgid "_Save Selected..."
+msgstr "...ټاکل شوی ساتل_"
+
+#. Cant i put in the number of attachments here ?
+#: ../mail/em-format-html-display.c:2106
+#, c-format
+msgid "%d at_tachment"
+msgid_plural "%d at_tachments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+msgid "S_ave"
+msgstr "س_اتل"
+
+#: ../mail/em-format-html-display.c:2124
+msgid "S_ave All"
+msgstr "ټول س_اتل"
+
+#: ../mail/em-format-html-display.c:2198
+msgid "No Attachment"
+msgstr "هېڅ نښلنونه"
+
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+msgid "View _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2341
+msgid "Hide _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2396
+msgid "O_pen With"
+msgstr "سره پ_رانيستل"
+
+#: ../mail/em-format-html-display.c:2467
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+
+#: ../mail/em-format-html-print.c:156
+#, c-format
+msgid "Page %d of %d"
+msgstr "مخ %d له %d"
+
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#, c-format
+msgid "Retrieving `%s'"
+msgstr ""
+
+#: ../mail/em-format-html.c:925
+msgid "Unknown external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:933
+msgid "Malformed external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:963
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:974
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: ../mail/em-format-html.c:976
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:997
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:1008
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: ../mail/em-format-html.c:1236
+msgid "Formatting message"
+msgstr "استوزه بڼول کيږي"
+
+#: ../mail/em-format-html.c:1410
+msgid "Formatting Message..."
+msgstr "...استوزه بڼول کيږي"
+
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
+msgid "Cc"
+msgstr "څ.ل"
+
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
+msgid "Bcc"
+msgstr "پ.ل"
+
+#. pseudo-header
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
+msgid "Mailer"
+msgstr "استوونکی"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: ../mail/em-format-html.c:1771
+msgid " (%a, %R %Z)"
+msgstr " (%a, %R %Z)"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: ../mail/em-format-html.c:1776
+msgid " (%R %Z)"
+msgstr " (%R %Z)"
+
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:1907
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
+msgid "From"
+msgstr "له"
+
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
+msgid "Reply-To"
+msgstr ""
+
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "نېټه"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr ""
+
+#: ../mail/em-format.c:1157
+#, c-format
+msgid "%s attachment"
+msgstr "نښلن %s"
+
+#: ../mail/em-format.c:1198
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: ../mail/em-format.c:1343
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: ../mail/em-format.c:1353
+msgid "Could not parse PGP/MIME message"
+msgstr ""
+
+#: ../mail/em-format.c:1353
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr ""
+
+#: ../mail/em-format.c:1510
+msgid "Unsupported signature format"
+msgstr ""
+
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
+msgid "Error verifying signature"
+msgstr ""
+
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
+msgid "Unknown error verifying signature"
+msgstr ""
+
+#: ../mail/em-format.c:1661
+msgid "Could not parse PGP message"
+msgstr ""
+
+#: ../mail/em-format.c:1661
+msgid "Could not parse PGP message: Unknown error"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:93
+msgid "Every time"
+msgstr "هر مهال"
+
+#: ../mail/em-mailer-prefs.c:94
+msgid "Once per day"
+msgstr "د ورځې يو ځل"
+
+#: ../mail/em-mailer-prefs.c:95
+msgid "Once per week"
+msgstr "د اونۍ يو ځل"
+
+#: ../mail/em-mailer-prefs.c:96
+msgid "Once per month"
+msgstr "د مياشتې يو ځل"
+
+#: ../mail/em-mailer-prefs.c:326
+msgid "Add Custom Junk Header"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:330
+msgid "Header Name:"
+msgstr ":د سريز نوم"
+
+#: ../mail/em-mailer-prefs.c:331
+msgid "Header Value Contains:"
+msgstr ":د سريز ارزښت لري"
+
+#: ../mail/em-mailer-prefs.c:436
+msgid "Contains Value"
+msgstr "ارزښت لري"
+
+#: ../mail/em-mailer-prefs.c:458
+msgid "Color"
+msgstr "رنګ"
+
+#: ../mail/em-mailer-prefs.c:461
+msgid "Tag"
+msgstr "بچوۍ"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:1107
+msgid "No Junk plugin available"
+msgstr ""
+
+#. green
+#: ../mail/em-migrate.c:1059
+msgid "To Do"
+msgstr "کول"
+
+#. blue
+#: ../mail/em-migrate.c:1060
+msgid "Later"
+msgstr "وروسته"
+
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr ":لېږدول کيږي `%s'"
+
+#: ../mail/em-migrate.c:1652
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1678
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1863
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:2069
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2083
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2112
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:2963
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2982
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+msgid "_Reply to sender"
+msgstr "استوونکی ځوابول_"
+
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../ui/evolution-mail-message.xml.h:83
+msgid "Reply to _List"
+msgstr "لړ _ځوابول"
+
+#. make it first item
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+msgid "_Add to Address Book"
+msgstr "پته کتاب کې زياتول_"
+
+#: ../mail/em-subscribe-editor.c:583
+msgid "This store does not support subscriptions, or they are not enabled."
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:616
+msgid "Subscribed"
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:620
+msgid "Folder"
+msgstr "پوښۍ"
+
+#. FIXME: This is just to get the shadow, is there a better way?
+#: ../mail/em-subscribe-editor.c:822
+msgid "Please select a server."
+msgstr "لورينه وکړﺉ يو پالنګر وټاکئ"
+
+#: ../mail/em-subscribe-editor.c:843
+msgid "No server has been selected"
+msgstr "کوم پالنګر نه دی ټاکل شوی"
+
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
+msgid "_Do not show this message again."
+msgstr ""
+
+#: ../mail/em-utils.c:316
+msgid "Message Filters"
+msgstr "استوزه چاڼونه"
+
+#: ../mail/em-utils.c:369
+msgid "message"
+msgstr "استوزه"
+
+#: ../mail/em-utils.c:653
+msgid "Save Message..."
+msgstr "...استوزه ساتل"
+
+#: ../mail/em-utils.c:703
+msgid "Add address"
+msgstr "پته زياتول"
+
+#. Drop filename for messages from a mailbox
+#: ../mail/em-utils.c:1224
+#, c-format
+msgid "Messages from %s"
+msgstr ""
+
+#: ../mail/em-vfolder-editor.c:112
+msgid "Search _Folders"
+msgstr "پلټون _پوښۍ"
+
+#: ../mail/em-vfolder-rule.c:592
+msgid "Search Folder source"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Allows evolution to display text part of limited size"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Always request read receipt"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "Automatic emoticon recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Automatic link recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid "Citation highlight color"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Citation highlight color."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid "Composer Window default height"
+msgstr "د ليکونکې کړکۍ تلواله اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Composer Window default width"
+msgstr "د ليکونکې کړکۍ تلواله پلنوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:14
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Default forward style"
+msgstr "د مخکې کولو تلواله ډول"
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default height of the Composer Window."
+msgstr ".د ليکونکې کړکۍ تلواله اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default height of the message window."
+msgstr ".د استوزې کړکۍ تلواله اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default height of the subscribe dialog."
+msgstr "د ګډون کړکۍ تلواله اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Default reply style"
+msgstr "د ځوابولو تلواله ډول"
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid "Default value for thread expand state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Default width of the Composer Window."
+msgstr ".د ليکونکې کړکۍ تلواله پلنوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Default width of the message window."
+msgstr ".د استوزه کړکۍ تلواله پلنوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Default width of the subscribe dialog."
+msgstr ".د ګډون کړکۍ تلواله پلنوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid ""
+"Determines whether to loopup the sender email in addressbook. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote addressbooks (like ldap) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Directory for loading/attaching files to composer."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Directory for saving mail component files."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Empty Junk folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Enable or disable magic space bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable search folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid ""
+"Enable side bar search feature so that you can start interactive searching "
+"by typing in the text. Use is that you can easily find a folder in that side "
+"bar by just typing the folder name and the selection jumps automatically to "
+"that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Enable to render message text part of limited size."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Height of the message-list pane"
+msgstr "د استوزه-لړ چوکاټ اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Height of the message-list pane."
+msgstr ".د استوزه-لړ چوکاټ اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:60
+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.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Last time empty junk was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "List of Labels and their associated colors"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "List of accepted licenses"
+msgstr "د منل شويو منښليکونو لړ"
+
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "List of accounts"
+msgstr "د ګڼونونو لړ"
+
+#: ../mail/evolution-mail.schemas.in.h:73
+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.h:74
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
+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.h:77
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net. 1 - Load images in messages from contacts. 2 - "
+"Always load images off the net."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Log filter actions"
+msgstr "د چاڼ چارونه خبرالول"
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:83
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid "Message Window default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Message Window default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Prompt when deleting messages in search folder"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Prompt while marking multiple messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "Recognize emoticons in text and replace them with images."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "Run junk test on incoming mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Save directory"
+msgstr "پوښۍ ساتل"
+
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Search for the sender photo in local addressbooks"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Send HTML mail by default"
+msgstr "ليک لېږل HTML په تلواله توګه"
+
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Send HTML mail by default."
+msgstr ".ليک لېږل HTML په تلواله توګه"
+
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Show Animations"
+msgstr "سېلنونه ښودل"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Show animated images as animations."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "Show photo of the sender"
+msgstr "د استوونکي انځور ښودل"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Spell check inline"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Spell checking color"
+msgstr "د ليکدود کتنې رنګ"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell checking languages"
+msgstr "د ليکدود کتنې ژبه"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Subscribe dialog default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Terminal font"
+msgstr "پايالي ليکبڼه"
+
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Text message part limit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "The terminal font for mail display."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "The variable width font for mail display."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"This decides the max size of the text part that can be formatted under "
+"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid ""
+"This key is read only once and reset to false after read. This unselects the "
+"mail in the list and removes the preview for that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+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.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Thread the message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Thread the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Time interval, in seconds, how often upload store changes to server."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Time interval, in seconds, how often upload store changes to server. The "
+"actual value cannot be less than 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Timeout for marking message as seen"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Timeout for marking message as seen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "UID string of the default account."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Use SpamAssassin daemon and client"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Use custom fonts"
+msgstr "دوديزې ليکبڼې کارول"
+
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Use custom fonts for displaying mail."
+msgstr ".د ليک ښودلو لپاره دوديزې ليکبڼې کارول"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Use only local spam tests."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Use side-by-side or wide layout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid "Variable width font"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:177
+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.h:178
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Width of the message-list pane"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid "Width of the message-list pane."
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:182
+msgid "Importing Elm data"
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:367
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:368
+msgid "Import mail from Elm."
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:80
+msgid "Destination folder:"
+msgstr ":موخه پوښۍ"
+
+#: ../mail/importers/evolution-mbox-importer.c:83
+msgid "Select folder to import into"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:220
+msgid "Berkeley Mailbox (mbox)"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:221
+msgid "Importer Berkeley Mailbox format folders"
+msgstr ""
+
+#: ../mail/importers/mail-importer.c:148
+msgid "Importing mailbox"
+msgstr ""
+
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#, c-format
+msgid "Importing `%s'"
+msgstr "دننول کيږي `%s'"
+
+#: ../mail/importers/mail-importer.c:372
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: ../mail/importers/pine-importer.c:227
+msgid "Importing Pine data"
+msgstr "پاېن اومتوک دننول کيږي"
+
+#: ../mail/importers/pine-importer.c:426
+msgid "Evolution Pine importer"
+msgstr "اېوليوشن پاېن دننونکی"
+
+#: ../mail/importers/pine-importer.c:427
+msgid "Import mail from Pine."
+msgstr ".د پاېن نه ليک دننول"
+
+#: ../mail/mail-autofilter.c:79
+#, c-format
+msgid "Mail to %s"
+msgstr "ته ليکل %s"
+
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#, c-format
+msgid "Mail from %s"
+msgstr "%s ليک له"
+
+#: ../mail/mail-autofilter.c:266
+#, c-format
+msgid "Subject is %s"
+msgstr ""
+
+#: ../mail/mail-autofilter.c:301
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: ../mail/mail-autofilter.c:372
+msgid "Add Filter Rule"
+msgstr "چاڼ دوی زياتول"
+
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr ":کونده"
+
+#: ../mail/mail-component.c:548
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "،ټاکل شوی %d"
+msgstr[1] "،ټاکل شوي %d"
+
+#: ../mail/mail-component.c:552
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "ړنګول شوی %d"
+msgstr[1] "ړنګول شوي %d"
+
+#: ../mail/mail-component.c:559
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "سرکودن %d"
+msgstr[1] "سرکودن %d"
+
+#: ../mail/mail-component.c:562
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "ګارليک %d"
+msgstr[1] "ګارليکونه %d"
+
+#: ../mail/mail-component.c:564
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "لېږل شوی %d"
+msgstr[1] "لېږل شوي %d"
+
+#: ../mail/mail-component.c:566
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "نالېږل شوی %d"
+msgstr[1] "نالېږل شوي %d"
+
+#: ../mail/mail-component.c:572
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "،نالوستی %d"
+msgstr[1] "،نالوستي %d"
+
+#: ../mail/mail-component.c:573
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "ټول %d"
+msgstr[1] "ټول %d"
+
+#: ../mail/mail-component.c:914
+msgid "New Mail Message"
+msgstr "نوې ليک استوزه"
+
+#: ../mail/mail-component.c:915
+msgid "_Mail Message"
+msgstr "ليک استوزه_"
+
+#: ../mail/mail-component.c:916
+msgid "Compose a new mail message"
+msgstr "نوې ليک استوزه ليکل"
+
+#: ../mail/mail-component.c:922
+msgid "New Mail Folder"
+msgstr "نوې ليک پوښۍ"
+
+#: ../mail/mail-component.c:923
+msgid "Mail _Folder"
+msgstr "ليک _پوښۍ"
+
+#: ../mail/mail-component.c:924
+msgid "Create a new mail folder"
+msgstr "نوې ليک پوښۍ جوړول"
+
+#: ../mail/mail-component.c:1071
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: ../mail/mail-component.c:1584
+msgid "Error"
+msgstr "تېروتنه"
+
+#: ../mail/mail-component.c:1584
+msgid "Errors"
+msgstr "تېروتنې"
+
+#: ../mail/mail-component.c:1585
+msgid "Warnings and Errors"
+msgstr "خبرتياوې او تېروتنې"
+
+#: ../mail/mail-component.c:1586
+msgid "Debug"
+msgstr "کړاوتمبول"
+
+#: ../mail/mail-component.c:1586
+msgid "Error, Warnings and Debug messages"
+msgstr "تېروتنې، خبرتياوې او کړاوتمبونې استوزې"
+
+#: ../mail/mail-component.c:1713
+msgid "Debug Logs"
+msgstr "کړاوتمبونې خبرال"
+
+#: ../mail/mail-component.c:1727
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1743
+msgid "second(s)."
+msgstr "سېکېنډ(ه)"
+
+#: ../mail/mail-component.c:1749
+msgid "Log Messages:"
+msgstr ":خبرال استوزې"
+
+#: ../mail/mail-component.c:1790
+msgid "Log Level"
+msgstr "خبرال کچ"
+
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
+msgid "Time"
+msgstr "مهال"
+
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "استوزې"
+
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "دا کړکۍ بندول"
+
+#: ../mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
+msgstr "د منلو ډولونو لپاره ک_تل"
+
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
+msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>د استوونکي انځور</b>"
+
+#: ../mail/mail-config.glade.h:6
+msgid "<b>Sig_natures</b>"
+msgstr "<b>لاس_ليکونه</b>"
+
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
+msgid "<b>_Languages</b>"
+msgstr "<b>ژبې_</b>"
+
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr "<span weight=\"bold\">ګڼون خبرتياوې</span>"
+
+#: ../mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr "<span weight=\"bold\">کرونه</span>"
+
+#: ../mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr "<span weight=\"bold\">استوزې ليکل</span>"
+
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr "<span weight=\"bold\">سازونه</span>"
+
+#: ../mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr "<span weight=\"bold\">ليک ړنګول</span>"
+
+#: ../mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">ښکارېدلې استوزه _سريزې</span>"
+
+#: ../mail/mail-config.glade.h:18
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">نښکې</span>"
+
+#: ../mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr "<span weight=\"bold\">انځورونه لېښل کيږي</span>"
+
+#: ../mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "<span weight=\"bold\">د استوزې ښوون</span>"
+
+#: ../mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr "<span weight=\"bold\">استوزه ليکبڼې</span>"
+
+#: ../mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr "<span weight=\"bold\">غوراويزې خبرتياوې</span>"
+
+#: ../mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">غوراوي</span>"
+
+#: ../mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr "<span weight=\"bold\">چاپ شوې ليکبڼې</span>"
+
+#: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">د ګوډاګي امستنې</span>"
+
+#: ../mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr "<span weight=\"bold\">اړينې خبرتياوې</span>"
+
+#: ../mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr "<span weight=\"bold\">خونديتوب</span>"
+
+#: ../mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "<span weight=\"bold\">لېږل شوې او ګارليک استوزې</span>"
+
+#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr "<span weight=\"bold\">د پالنګر سازونه</span>"
+
+#: ../mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">د کرونې ډول_</span>"
+
+#: ../mail/mail-config.glade.h:35
+msgid "Account Management"
+msgstr "ګڼون سمبالونه"
+
+#: ../mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr "سکرېپټ _زياتول"
+
+#: ../mail/mail-config.glade.h:38
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:40
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:42
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:44
+msgid "Always request rea_d receipt"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:47
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:48
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:49
+msgid "C_haracter set:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:50
+msgid "Ch_eck for Supported Types "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:53
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:54
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:55
+msgid "Cle_ar"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:56
+msgid "Clea_r"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:57
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:58
+msgid "Confirm _when expunging a folder"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:59
+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 ""
+
+#: ../mail/mail-config.glade.h:65
+msgid "De_fault"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:66
+msgid "Default character e_ncoding:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:70
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:71
+msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:73
+msgid "Do not quote"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:74
+msgid "Done"
+msgstr "وشو"
+
+#: ../mail/mail-config.glade.h:75
+msgid "Drafts _Folder:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:76
+msgid "Email Accounts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:77
+msgid "Email _Address:"
+msgstr ":برېښليک _پته"
+
+#: ../mail/mail-config.glade.h:78
+msgid "Empty trash folders on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:81
+msgid "Encry_ption certificate:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:82
+msgid "Encrypt out_going messages (by default)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:84
+msgid "Fi_xed-width:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:86
+msgid "Font Properties"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:87
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:88
+msgid "Full Nam_e:"
+msgstr ":بشپړ نو_م"
+
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:92
+msgid "Headers"
+msgstr "سريزې"
+
+#: ../mail/mail-config.glade.h:93
+msgid "Highlight _quotations with"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:95
+msgid "Inline"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:98
+msgid "KB"
+msgstr "ک ب"
+
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "نښکې"
+
+#: ../mail/mail-config.glade.h:100
+msgid "Languages Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:101
+msgid "Mail Configuration"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:102
+msgid "Mail Headers Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:104
+msgid "Mailbox location"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:105
+msgid "Message Composer"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:108
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:109
+msgid "Or_ganization:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:110
+msgid "PGP/GPG _Key ID:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:111
+msgid "Pass_word:"
+msgstr ":تېرن_ويې"
+
+#: ../mail/mail-config.glade.h:113
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:115
+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.glade.h:116
+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.glade.h:117
+msgid "Please select among the following options"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:118
+msgid "Port:"
+msgstr ":درشل"
+
+#: ../mail/mail-config.glade.h:119
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:120
+msgid "Quoted"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:121
+msgid "Re_member password"
+msgstr "تېرنويې په ي_اد ساتل"
+
+#: ../mail/mail-config.glade.h:122
+msgid "Re_ply-To:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:124
+msgid "Remember _password"
+msgstr "تېرنويې په ياد _ساتل"
+
+#: ../mail/mail-config.glade.h:125
+msgid "S_OCKS Host:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:126
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_elect..."
+msgstr "...ټ_اکل"
+
+#: ../mail/mail-config.glade.h:128
+msgid "S_end message receipts:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:129
+msgid "S_tandard Font:"
+msgstr ":ا_ره ليکبڼه"
+
+#: ../mail/mail-config.glade.h:131
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:132
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:133
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:134
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:136
+msgid "Sending Mail"
+msgstr "ليک استول کيږي"
+
+#: ../mail/mail-config.glade.h:137
+msgid "Sent _Messages Folder:"
+msgstr ":د لېږل شوېو _استوزو پوښۍ"
+
+#: ../mail/mail-config.glade.h:138
+msgid "Ser_ver requires authentication"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:139
+msgid "Server _Type: "
+msgstr ":د پالنګر _ډول"
+
+#: ../mail/mail-config.glade.h:140
+msgid "Sig_ning certificate:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:141
+msgid "Signat_ure:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:142
+msgid "Signatures"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:143
+msgid "Signatures Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:144
+msgid "Spell Checking"
+msgstr "ليکدود کتنه"
+
+#: ../mail/mail-config.glade.h:145
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:146
+msgid "T_ype: "
+msgstr ":ډ_ول"
+
+#: ../mail/mail-config.glade.h:147
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:148
+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:151
+msgid ""
+"This option will be overridden if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:152
+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:154
+msgid "Us_ername:"
+msgstr ":کا_رننوم"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "کرو_نه کارول"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
+msgid "User_name:"
+msgstr ":کارن_نوم"
+
+#: ../mail/mail-config.glade.h:157
+msgid "V_ariable-width:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:158
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
+msgstr ""
+".د اېوليوشن ليک سازونې مرستيال ته ښه راغلاست\n"
+"\n"
+".کېکاږﺉ \"Forward\" د پېلولو لپاره"
+
+#: ../mail/mail-config.glade.h:161
+msgid "_Add Signature"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:162
+msgid "_Always load images from the Internet"
+msgstr "تل د اېنټرنېټ نه انځورونه لېښل_"
+
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:164
+msgid "_Default junk plugin:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "اېنټرنېټ سره سيده نښلېدنه_"
+
+#: ../mail/mail-config.glade.h:166
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:168
+msgid "_Forward style:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:169
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:170
+msgid "_Load images in messages from contacts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local addressbook only"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:172
+msgid "_Make this my default account"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
+msgid "_Mark messages as read after"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:176
+msgid "_Never load images from the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:177
+msgid "_Path:"
+msgstr ":يونلور_"
+
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:179
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:180
+msgid "_Reply style:"
+msgstr ":د ځواب ډول_"
+
+#: ../mail/mail-config.glade.h:181
+msgid "_Script:"
+msgstr ":سکرېپټ_"
+
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:183
+msgid "_Select..."
+msgstr "...ټاکل_"
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.glade.h:186
+msgid "_Show image animations"
+msgstr "انځور سېلنونه ښودل_"
+
+#: ../mail/mail-config.glade.h:187
+msgid "_Show the photograph of sender in the message preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:188
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:189
+msgid "_Use Secure Connection:"
+msgstr "خوندي نښلېدنه کارول_"
+
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "د غونډال تلوالې کارول_"
+
+#: ../mail/mail-config.glade.h:191
+msgid "_Use the same fonts as other applications"
+msgstr "د نورو کاريالونو غوندې هماغه ليکبڼې کارول_"
+
+#: ../mail/mail-config.glade.h:192
+msgid "addresses"
+msgstr "پتې"
+
+#: ../mail/mail-config.glade.h:193
+msgid "color"
+msgstr "رنګ"
+
+#: ../mail/mail-config.glade.h:194
+msgid "description"
+msgstr "سپړاوی"
+
+#: ../mail/mail-dialogs.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:3
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:4
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">کوډه کښنه</span>"
+
+#: ../mail/mail-dialogs.glade.h:5
+msgid "All active remote folders"
+msgstr "ټولې چارنده لرې پوښۍ"
+
+#: ../mail/mail-dialogs.glade.h:6
+msgid "All local and active remote folders"
+msgstr "ټولې ځاييزې او چارنده لرې پوښۍ"
+
+#: ../mail/mail-dialogs.glade.h:7
+msgid "All local folders"
+msgstr "ټولې ځاييزې پوښۍ"
+
+#: ../mail/mail-dialogs.glade.h:8
+msgid "Case _sensitive"
+msgstr "کېس _انګېره"
+
+#: ../mail/mail-dialogs.glade.h:9
+msgid "Co_mpleted"
+msgstr "بش_پړ شوی"
+
+#: ../mail/mail-dialogs.glade.h:11
+msgid "F_ind:"
+msgstr ":ل_ټول"
+
+#: ../mail/mail-dialogs.glade.h:12
+msgid "Find in Message"
+msgstr "په استوزه کې لټول"
+
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:14
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:15
+msgid "License Agreement"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:16
+msgid "None Selected"
+msgstr "هېڅ نه دي ټاکل شوي"
+
+#: ../mail/mail-dialogs.glade.h:17
+msgid "S_erver:"
+msgstr ":پ_النګر"
+
+#: ../mail/mail-dialogs.glade.h:18
+msgid "Security Information"
+msgstr "د خونديتوب خبرتياوې"
+
+#: ../mail/mail-dialogs.glade.h:19
+msgid "Specific folders"
+msgstr "ځانګړې پوښۍ"
+
+#: ../mail/mail-dialogs.glade.h:21
+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:23
+msgid "_Accept License"
+msgstr "منښتليک منل_"
+
+#: ../mail/mail-dialogs.glade.h:24
+msgid "_Due By:"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "_Flag:"
+msgstr ":جنډه_"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "_Tick this to accept the license agreement"
+msgstr ""
+
+#: ../mail/mail-folder-cache.c:832
+#, c-format
+msgid "Pinging %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:105
+msgid "Filtering Selected Messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:264
+msgid "Fetching Mail"
+msgstr ""
+
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:560
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: ../mail/mail-ops.c:618
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr "استوزه لېږل کيږي"
+
+#: ../mail/mail-ops.c:734
+#, c-format
+msgid "Sending message %d of %d"
+msgstr ""
+
+#: ../mail/mail-ops.c:761
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+msgid "Canceled."
+msgstr ".بند شو"
+
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+msgid "Complete."
+msgstr ".بشپړ"
+
+#: ../mail/mail-ops.c:869
+msgid "Saving message to folder"
+msgstr "پوښۍ کې استوزه ساتل کيږي"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Moving messages to %s"
+msgstr "ته استوزه خوځول کيږي %s"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Copying messages to %s"
+msgstr "ته استوزه لمېسل کيږي %s"
+
+#: ../mail/mail-ops.c:1164
+msgid "Forwarded messages"
+msgstr "استوزې مخکې کول کيږي"
+
+#: ../mail/mail-ops.c:1205
+#, c-format
+msgid "Opening folder %s"
+msgstr "پوښۍ پرانيستل کيږي %s"
+
+#: ../mail/mail-ops.c:1270
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1339
+#, c-format
+msgid "Opening store %s"
+msgstr "زېرمه پرانيستل کيږي %s"
+
+#: ../mail/mail-ops.c:1410
+#, c-format
+msgid "Removing folder %s"
+msgstr "پوښۍ ړنګول کيږي %s"
+
+#: ../mail/mail-ops.c:1499
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "پوښۍ زېرمل کيږي %s"
+
+#: ../mail/mail-ops.c:1562
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1563
+#, c-format
+msgid "Storing account '%s'"
+msgstr "ګڼون زېرمل کيږي '%s'"
+
+#: ../mail/mail-ops.c:1617
+msgid "Refreshing folder"
+msgstr "پوښۍ تاندول کيږي"
+
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+msgid "Expunging folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:1704
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1705
+msgid "Local Folders"
+msgstr "ځاييزې پوښۍ"
+
+#: ../mail/mail-ops.c:1786
+#, c-format
+msgid "Retrieving message %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1893
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-ops.c:1978
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-ops.c:2056
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2128
+msgid "Saving attachment"
+msgstr "نښلن ساتل کيږي"
+
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2169
+#, c-format
+msgid "Could not write data: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2315
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2315
+#, c-format
+msgid "Reconnecting to %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2411
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr ""
+
+#: ../mail/mail-ops.c:2497
+msgid "Checking Service"
+msgstr "پالنه کتل کيږي"
+
+#: ../mail/mail-send-recv.c:182
+msgid "Canceling..."
+msgstr "...بندول کيږي"
+
+#: ../mail/mail-send-recv.c:385
+msgid "Send & Receive Mail"
+msgstr "ليک لېږل او راوستل"
+
+#: ../mail/mail-send-recv.c:396
+msgid "Cancel _All"
+msgstr "ټول _بندول"
+
+#: ../mail/mail-send-recv.c:505
+msgid "Updating..."
+msgstr "...اوسمهالول کيږي"
+
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+msgid "Waiting..."
+msgstr "...تمه کيږي"
+
+#: ../mail/mail-send-recv.c:806
+#, c-format
+msgid "Checking for new mail"
+msgstr "د نوي ليک لپاره کتل کيږي"
+
+#: ../mail/mail-session.c:205
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr ""
+
+#: ../mail/mail-session.c:207
+msgid "Enter Passphrase"
+msgstr ""
+
+#: ../mail/mail-session.c:210
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#, c-format
+msgid "Enter Password for %s"
+msgstr ""
+
+#: ../mail/mail-session.c:212
+msgid "Enter Password"
+msgstr "تېرنويې وليکئ"
+
+#: ../mail/mail-session.c:254
+msgid "User canceled operation."
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "ساتل او بندول_"
+
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "لاسليک سمول"
+
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr ""
+
+#: ../mail/mail-tools.c:120
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:150
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr ""
+
+#: ../mail/mail-tools.c:256
+#, c-format
+msgid "Forwarded message - %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:258
+msgid "Forwarded message"
+msgstr ""
+
+#: ../mail/mail-tools.c:298
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:89
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:233
+#, c-format
+msgid "Updating Search Folders for '%s:%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:240
+#, c-format
+msgid "Updating Search Folders for '%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:1066
+msgid "Edit Search Folder"
+msgstr "پلټون پوښۍ سمول"
+
+#: ../mail/mail-vfolder.c:1155
+msgid "New Search Folder"
+msgstr "نوې پلټون پوښۍ"
+
+#: ../mail/mail.error.xml.h:1
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:2
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:3
+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."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:7
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:8
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:9
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:10
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:13
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:14
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:15
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message without a subject?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:18
+msgid "Because \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:20
+msgid "Because \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:21
+msgid "Blank Signature"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:22
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot create folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot create temporary save directory."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot delete system folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:30
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot open source \"{1}\""
+msgstr ""
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot open target \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:34
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:35
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:37
+msgid "Cannot save changes to account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:38
+msgid "Cannot save to directory \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:39
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:40
+msgid "Cannot set signature script \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:42
+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/mail.error.xml.h:43
+msgid "Could not save signature file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr "ړنګول غواړﺉ؟ ‎\"{0}\""
+
+#: ../mail/mail.error.xml.h:45
+msgid "Delete account?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:47
+msgid "Delete messages in Search Folder?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:48
+msgid "Discard changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:49
+msgid "Do not d_elete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:50
+msgid "Do not delete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:51
+msgid "Do not disable"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
+msgid "Do you want to mark all messages as read?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:54
+msgid "Do you wish to save your changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:55
+msgid "Enter password."
+msgstr ".تېرنويې وليکئ"
+
+#: ../mail/mail.error.xml.h:56
+msgid "Error loading filter definitions."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:57
+msgid "Error while performing operation."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:58
+msgid "Error while {0}."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:59
+msgid "File exists but cannot overwrite it."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:60
+msgid "File exists but is not a regular file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:61
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:62
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:63
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:64
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:66
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:67
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:68
+msgid "Ignore"
+msgstr "پرېښودل"
+
+#: ../mail/mail.error.xml.h:69
+msgid "Invalid authentication"
+msgstr "ناسمه کرونه"
+
+#: ../mail/mail.error.xml.h:71
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:72
+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/mail.error.xml.h:73
+msgid "Mark all messages as read"
+msgstr "ټولې استوزې لکه لوستې نښول"
+
+#: ../mail/mail.error.xml.h:74
+msgid "Missing folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:76
+msgid "No sources selected."
+msgstr ".کومې سرچينې نه دي ټاکل شوي"
+
+#: ../mail/mail.error.xml.h:77
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:78
+msgid "Please check your account settings and try again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:79
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:80
+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/mail.error.xml.h:81
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:83
+msgid "Please provide an unique name to identify this signature."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:84
+msgid "Please wait."
+msgstr ".لږه تمه وکړﺉ"
+
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:86
+msgid "Querying server"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:87
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:88
+msgid "Read receipt requested."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:92
+msgid "Search Folders automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:93
+msgid "Send Receipt"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:94
+msgid "Signature Already Exists"
+msgstr "لاسليک د مخکې نه شتون لري"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr "هممهالیزول"
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:97
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:98
+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/mail.error.xml.h:101
+msgid ""
+"The following Search Folder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:106
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:111
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:112
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:114
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:117
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:118
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:119
+msgid "Unable to connect to the GroupWise server."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:120
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:121
+msgid "Unable to read license file."
+msgstr ".منښتليک دوتنه نه شي لوستلی"
+
+#: ../mail/mail.error.xml.h:122
+msgid "Use _Default"
+msgstr "تلواله _کارول"
+
+#: ../mail/mail.error.xml.h:123
+msgid "Use default drafts folder?"
+msgstr "تلواله ګارليک پوښۍ کارول غواړﺉ؟"
+
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:127
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:128
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:129
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:130
+msgid "You must name this Search Folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:131
+msgid "You must specify a folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:132
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:134
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:135
+msgid "_Append"
+msgstr "پاېملون_"
+
+#: ../mail/mail.error.xml.h:136
+msgid "_Discard changes"
+msgstr "بدلونونه نه منل_"
+
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:139
+msgid "_Expunge"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Open Messages"
+msgstr "استوزې پرانيستل_"
+
+#: ../mail/message-list.c:1051
+msgid "Unseen"
+msgstr "ناکتلی"
+
+#: ../mail/message-list.c:1052
+msgid "Seen"
+msgstr "کتلی"
+
+#: ../mail/message-list.c:1053
+msgid "Answered"
+msgstr "ځواب شوي"
+
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "مخکې شوی"
+
+#: ../mail/message-list.c:1055
+msgid "Multiple Unseen Messages"
+msgstr "ګڼې ناکتلې استوزې"
+
+#: ../mail/message-list.c:1056
+msgid "Multiple Messages"
+msgstr "ګڼې استوزې"
+
+#: ../mail/message-list.c:1060
+msgid "Lowest"
+msgstr "ټولوټيټ"
+
+#: ../mail/message-list.c:1061
+msgid "Lower"
+msgstr "کوز"
+
+#: ../mail/message-list.c:1065
+msgid "Higher"
+msgstr "جګ"
+
+#: ../mail/message-list.c:1066
+msgid "Highest"
+msgstr "ټولوجګ"
+
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
+msgid "?"
+msgstr "؟"
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../widgets/table/e-cell-date.c:70
+msgid "Today %l:%M %p"
+msgstr "%l:%M %p نن"
+
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
+msgid "Yesterday %l:%M %p"
+msgstr "%l:%M %p پرون"
+
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
+msgid "%b %d %Y"
+msgstr "%b %d %Y"
+
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
+msgid "Generating message list"
+msgstr "استوزه لړ جوړول کيږي"
+
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4178
+msgid "There are no messages in this folder."
+msgstr ".په دې پوښۍ کې کومې استوزې نه شته"
+
+#: ../mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr "جنډه انکړ"
+
+#: ../mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr "جنډه شوی"
+
+#: ../mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:11
+msgid "Received"
+msgstr "ترلاسه شوي"
+
+#: ../mail/message-list.etspec.h:15
+msgid "Sent Messages"
+msgstr "لېږل شوې استوزې"
+
+#: ../mail/message-list.etspec.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+msgid "Size"
+msgstr "کچ"
+
+#: ../mail/message-tag-followup.c:56
+msgid "Call"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:57
+msgid "Do Not Forward"
+msgstr "نه مخکې کول"
+
+#: ../mail/message-tag-followup.c:58
+msgid "Follow-Up"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:59
+msgid "For Your Information"
+msgstr "ستاسو د خبرتياو لپاره"
+
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+msgid "Forward"
+msgstr "مخکې"
+
+#: ../mail/message-tag-followup.c:61
+msgid "No Response Necessary"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+msgid "Reply"
+msgstr "ځوابول"
+
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+msgid "Reply to All"
+msgstr "ټول ځوابول"
+
+#: ../mail/message-tag-followup.c:66
+msgid "Review"
+msgstr "بياليد"
+
+#: ../mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "تنه لري"
+
+#: ../mail/searchtypes.xml.h:2
+msgid "Message contains"
+msgstr "استوزه لري"
+
+#: ../mail/searchtypes.xml.h:3
+msgid "Recipients contain"
+msgstr "نيووني لري"
+
+#: ../mail/searchtypes.xml.h:4
+msgid "Sender contains"
+msgstr "استوونی لري"
+
+#: ../mail/searchtypes.xml.h:5
+msgid "Subject contains"
+msgstr "سرليک لري"
+
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Sender contains"
+msgstr "سرليک يا استوونی لري"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "ځاييز پته کتابونه\t"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr ""
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
+msgid "Keywords"
+msgstr "اروييونه"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Attachment Reminder"
+msgstr "نښلن رايادوونکی"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "Message has no attachments"
+msgstr "استوزه نښلنونه نه لري"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "استوزه سمول_"
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:107
+msgid "Select name of the Evolution backup file"
+msgstr "د اېوليوشن شاتړ دوتنې نوم وټاکئ"
+
+#: ../plugins/backup-restore/backup-restore.c:136
+msgid "_Restart Evolution after backup"
+msgstr "د شاتړ نه وروسته اېوليوشن بياپېلول_"
+
+#: ../plugins/backup-restore/backup-restore.c:159
+msgid "Select name of the Evolution backup file to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:183
+msgid "_Restart Evolution after restore"
+msgstr "د بيازېرملو نه وروسته اېوليوشن بياپېلول_"
+
+#: ../plugins/backup-restore/backup-restore.c:256
+msgid "Restore from backup"
+msgstr "له شاتړه بيازېرمل"
+
+#: ../plugins/backup-restore/backup-restore.c:258
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:264
+msgid "_Restore Evolution from the backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:271
+msgid "Please select an Evolution Archive to restore:"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:274
+msgid "Choose a file to restore"
+msgstr "د بيازېرملو لپاره يوه دوتنه وټاکئ"
+
+#: ../plugins/backup-restore/backup.c:46
+msgid "Backup Evolution directory"
+msgstr "د اېوليوشن پوښۍ شاتړول"
+
+#: ../plugins/backup-restore/backup.c:48
+msgid "Restore Evolution directory"
+msgstr "د اېوليوشن پوښۍ بيازېرمل"
+
+#: ../plugins/backup-restore/backup.c:50
+msgid "Check Evolution Backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:52
+msgid "Restart Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:54
+msgid "With Graphical User Interface"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
+msgid "Shutting down Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:112
+msgid "Backing Evolution accounts and settings"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:116
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:127
+msgid "Backup complete"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
+msgid "Restarting Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:242
+msgid "Backup current Evolution data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:247
+msgid "Extracting files from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:254
+msgid "Loading Evolution settings"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:258
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:440
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr ""
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:459
+msgid "Evolution Backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:459
+msgid "Evolution Restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+msgid "Backup and restore plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Invalid Evolution backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid "Please select a valid backup file to restore."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup and restore Evolution data and settings"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "_Backup Settings..."
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr ""
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:565
+msgid ""
+"_Automatically create entries in the addressbook when responding to messages"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:571
+msgid "Select Address book for Automatic Contacts"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:586
+msgid "Instant Messaging Contacts"
+msgstr ""
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:601
+msgid ""
+"Periodically synchronize contact information and images from Pidgin buddy "
+"list"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:607
+msgid "Select Address book for Pidgin buddy list"
+msgstr ""
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:618
+msgid "Synchronize with _buddy list now"
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid ""
+"Automatically fills your addressbook with names and email addresses as you "
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr ""
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+msgid "Convert message text to _Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filters junk messages using Bogofilter."
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:126
+msgid "_URL:"
+msgstr ":URL_"
+
+#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:357
+msgid "Use _SSL"
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Local Calendars"
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Provides core functionality for local calendars."
+msgstr ""
+
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:381
+msgid "Re_fresh:"
+msgstr ""
+
+#: ../plugins/calendar-http/calendar-http.c:332
+msgid "_Secure connection"
+msgstr ""
+
+#: ../plugins/calendar-http/calendar-http.c:397
+msgid "Userna_me:"
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "HTTP Calendars"
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Cloudy"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Fog"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:62
+msgid "Weather: Partly Cloudy"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:63
+msgid "Weather: Rain"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Snow"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Sunny"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Thunderstorms"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:267
+msgid "Select a location"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:652
+msgid "_Units:"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:659
+msgid "Metric (Celsius, cm, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:660
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+msgid "Copy tool"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+msgid "Checks whether Evolution is the default mail client on startup."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+msgid "Default Mail Client "
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+msgid "Do you want to make Evolution your default e-mail client?"
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:679
+msgid "Evolution"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:81
+msgid "Mark as _default address book"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionality for marking a calendar or an addressbook as the "
+"default one."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+#, fuzzy
+msgid "Key"
+msgstr "کينيا"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr ""
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "د بل کارن پوښۍ پرانيستل"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
+msgid "_Account:"
+msgstr ":ګڼون_"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr ":د پوښۍ نوم_"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
+msgid "_User:"
+msgstr ":کارن_"
+
+#. i18n: "Secure Password Authentication" is an Outlookism
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
+msgid "Secure Password"
+msgstr "خوندي تېرنويې"
+
+#. i18n: "NTLM" probably doesn't translate
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
+msgid "Plaintext Password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
+msgid "Out Of Office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
+msgid ""
+"The message specified below will be automatically sent to \n"
+"each person who sends mail to you while you are out of the office."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
+msgid "I am out of the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
+msgid "I am in the office"
+msgstr ""
+
+#. Change Password
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
+msgid "Change the password for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+msgid "Change Password"
+msgstr "تېرنويې بدلول"
+
+#. Delegation Assistant
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
+msgid "Manage the delegate settings for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
+msgid "Delegation Assistant"
+msgstr ""
+
+#. Miscelleneous settings
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
+msgid "Miscelleneous"
+msgstr ""
+
+#. Folder Size
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
+msgid "View the size of all Exchange folders"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
+msgid "Folders Size"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
+msgid "Exchange Settings"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:674
+msgid "_OWA URL:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:700
+msgid "A_uthenticate"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:721
+msgid "_Mailbox:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:922
+msgid "_Authentication Type"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
+msgid "Ch_eck for Supported Types"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1048
+#: ../plugins/exchange-operations/exchange-contacts.c:212
+#, c-format
+msgid "%s KB"
+msgstr "ک ب ‎%s"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
+msgid "0 KB"
+msgstr "‎‏۰ ک ب"
+
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:165
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+
+#. User entered a wrong existing
+#. * password. Prompt him again.
+#.
+#: ../plugins/exchange-operations/exchange-change-password.c:113
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.c:120
+msgid "The two passwords do not match. Please re-enter the passwords."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+msgid "Confirm Password:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+msgid "Current Password:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+msgid "New Password:"
+msgstr ":نوې تېرنويې"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+msgid "Your current password has expired. Please change your password now."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+msgid "Custom"
+msgstr "دوديز"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#, c-format
+msgid "Permissions for %s"
+msgstr ""
+
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
+msgstr ""
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+msgid "You have been given the following permissions on my folders:"
+msgstr ""
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+msgid "You are also permitted to see my private items."
+msgstr ""
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+msgid "However you are not permitted to see my private items."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:415
+msgid "Delegate To"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:580
+#, c-format
+msgid "Remove the delegate %s?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:698
+msgid "Could not access Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:710
+msgid "Could not find self in Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:723
+#, c-format
+msgid "Could not find delegate %s in Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:735
+#, c-format
+msgid "Could not remove delegate %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:795
+msgid "Could not update list of delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:813
+#, c-format
+msgid "Could not add delegate %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:981
+msgid "Error reading delegates list."
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+msgid "C_alendar:"
+msgstr ":ک_ليز"
+
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+msgid "Co_ntacts:"
+msgstr ":اړ_يکلوري"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid "Delegates"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+msgid "Permissions for"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+msgid ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+msgid "_Delegate can see private items"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
+msgid "_Inbox:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+msgid "_Tasks:"
+msgstr ":دندې_"
+
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
+msgid "Permissions..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+msgid "Folder Name"
+msgstr "د پوښۍ نوم"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+msgid "Folder Size"
+msgstr ""
+
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "کارن"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+msgid "Exchange Folder Tree"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
+msgid "Unsubscribe Folder..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
+#, c-format
+msgid "Really unsubscribe from folder \"%s\"?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.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 ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>انکړ</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.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 ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+msgid "(Permission denied.)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+msgid "Add User:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
+msgid "Add User"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+msgid "<b>Permissions</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+msgid "Cannot Delete"
+msgstr "نه شي ړنګولی"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+msgid "Cannot Edit"
+msgstr "نه شي سمولی"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+msgid "Create items"
+msgstr "توکي جوړول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+msgid "Create subfolders"
+msgstr "څېرمه پوښۍ جوړول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+msgid "Delete Any Items"
+msgstr "ټول توکي ړنګول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+msgid "Delete Own Items"
+msgstr "خپل توکي ړنګول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+msgid "Edit Any Items"
+msgstr "ټول توکي سمول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+msgid "Edit Own Items"
+msgstr "خپل توکي سمول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+msgid "Folder contact"
+msgstr "پوښۍ اړيکلوری"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+msgid "Folder owner"
+msgstr "د پوښۍ خاوند"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+msgid "Folder visible"
+msgstr "پوښۍ ښکاري"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+msgid "Read items"
+msgstr "توکي لوستل"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+msgid "Role: "
+msgstr ":رول"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+msgid "<b>Message Settings</b>"
+msgstr "<b>د استوزې امستنې</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+msgid "<b>Tracking Options</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+msgid "Exchange - Send Options"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+msgid "I_mportance: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
+msgid ""
+"Normal\n"
+"High\n"
+"Low"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
+msgid ""
+"Normal\n"
+"Personal\n"
+"Private\n"
+"Confidential"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
+msgid "Request a _delivery receipt for this message"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+msgid "Request a _read receipt for this message"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+msgid "_Sensitivity: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "کارن_"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr "تڼۍ-کارن"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+msgid "Select User"
+msgstr "کارن وټاکئ"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+msgid "Address Book..."
+msgstr "...پته کتاب"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+msgid "Subscribe to Other User's Contacts"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+msgid "Subscribe to Other User's Calendar"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that manages a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot display folders."
+msgstr ".پوښۍ نه شي ښودلی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+msgid "Cannot perform the operation."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid ""
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+msgid "Could not authenticate to server."
+msgstr ".د پالنګر سره نه شي کره کولی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+msgid "Could not change password."
+msgstr ".تېرنويې نه شي بدلولی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+msgid ""
+"Could not configure Exchange account because \n"
+"an unknown error occurred. Check the URL, \n"
+"username, and password, and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+msgid "Could not connect to Exchange server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+msgid "Could not connect to server {0}."
+msgstr ".{0} پالنګر سره نه شي نښلېدی‎"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+msgid "Could not determine folder permissions for delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+msgid "Could not find Exchange Web Storage System."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+msgid "Could not locate server {0}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+msgid "Could not make {0} a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+msgid "Could not read folder permissions"
+msgstr "د پوښۍ پرېښلې نه شي لوستلی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+msgid "Could not read folder permissions."
+msgstr ".د پوښۍ پرېښلې نه شي لوستلی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+msgid "Could not read out-of-office state"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+msgid "Could not update folder permissions."
+msgstr ".د پوښۍ پرېښلې نه شي اوسمهالولی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+msgid "Could not update out-of-office state"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+msgid "Exchange Account is offline."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+msgid ""
+"Exchange Connector requires access to certain\n"
+"functionality on the Exchange Server that appears\n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
+"need to enable this functionality in order for \n"
+"you to be able to use Evolution Exchange Connector.\n"
+"\n"
+"For information to provide to your Exchange \n"
+"administrator, please follow the link below:\n"
+"\n"
+"{0}\n"
+"  "
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+msgid "Failed to update delegates:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+msgid "Folder already exists"
+msgstr "پوښۍ د مخکې نه شتون لري"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+msgid "Folder does not exist"
+msgstr "پوښۍ شتون نه لري"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+msgid "Folder offline"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
+msgid "Generic error"
+msgstr "ټولګړې تېروتنه"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+msgid "Global Catalog Server is not reachable"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "Mailbox for {0} is not on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+msgid "Make sure the URL is correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+msgid "Make sure the server name is spelled correctly and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+msgid "Make sure the username and password are correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+msgid "No Global Catalog server configured for this account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+msgid "No mailbox for user {0} on {1}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "No such user {0}"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "Please make sure the Global Catalog Server name is correct."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "Please restart Evolution for changes to take effect"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid "Please select a user."
+msgstr ".يو کارن وټاکئ"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+msgid "Server rejected password because it is too weak."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+msgid "The Exchange account will be disabled when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+msgid "The Exchange account will be removed when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+msgid "The Exchange server is not compatible with Exchange Connector."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+msgid ""
+"The server is running Exchange 5.5. Exchange Connector \n"
+"supports Microsoft Exchange 2000 and 2003 only."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+msgid ""
+"This probably means that your server requires \n"
+"you to specify the Windows domain name \n"
+"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Or you might have just typed your password wrong."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+msgid "Try again with a different password."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+msgid "Unable to add user to access control list:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+msgid "Unable to edit delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+msgid "Unknown error looking up {0}"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+msgid "Unknown error."
+msgstr ".ناپېژندلې تېروتنه"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+msgid "Unknown type"
+msgstr ".ناپېژندلی ډول"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid "Unsupported operation"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid "You are nearing your quota available for storing mail on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "You cannot make yourself your own delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+msgid "You have exceeded your quota for storing mail on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+msgid "You may only configure a single Exchange account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+msgid ""
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+msgid "Your password has expired."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+msgid "{0} cannot be added to an access control list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+msgid "{0} is already a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+msgid "{0} is already in the list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+msgid "Subscribe to Other User's Tasks"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+msgid "Check folder permissions"
+msgstr "پوښۍ پرېښلې کتل"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "تلواله بهرنی سمبالګر"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+msgid "External Editor"
+msgstr "بهرنی سمبالګر"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "لنډمهاله دوتنه نه شي جوړولی"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+msgid "Compose in External Editor"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
+#: ../plugins/face/face.c:58
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr ""
+
+#: ../plugins/face/face.c:68
+msgid "PNG files"
+msgstr "دوتنې PNG"
+
+#: ../plugins/face/face.c:125
+msgid "_Face"
+msgstr "مخ_"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach Face header to outgoing messages. First time the user needs to "
+"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
+"faces This will be used in messages that are sent further."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "مخ"
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe Folders"
+msgstr "پوښۍ ناګډونول_"
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "ناګډونول_"
+
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
+msgid "Google"
+msgstr "ګوګل"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>غړي</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+#, fuzzy
+msgid "Username:"
+msgstr ":کا_رننوم"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+#, fuzzy
+msgid "Update every"
+msgstr "پوښتن اوسمهالول کيږي"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
+msgstr "د ګوګل کليز امستلو لپاره يو لګون"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr "ګوګل سرچينې"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+msgid "Checklist"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+msgid "A plugin to setup groupwise calendar and contacts sources."
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
+msgid "Groupwise Account Setup"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:219
+#, c-format
+msgid ""
+"The user '%s' has shared a folder with you\n"
+"\n"
+"Message from '%s'\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Click 'Forward' to install the shared folder\n"
+"\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:224
+msgid "Install the shared folder"
+msgstr "ونډول شوې پوښۍ لګول"
+
+#: ../plugins/groupwise-features/install-shared.c:226
+msgid "Shared Folder Installation"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
+msgid "Junk Settings"
+msgstr "سرکودن امستنې"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "د سرکودن ليک امستنې"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
+msgid "Junk Mail Settings..."
+msgstr "...د سرکودن ليک امستنې"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:1
+msgid "<b>Junk List:</b>"
+msgstr "<b>سرکودن لړ:</b>"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:2
+msgid "Email:"
+msgstr "برېښليک"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
+msgid "_Disable"
+msgstr "ناتوانول_"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:6
+msgid "_Enable"
+msgstr "توانول_"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:7
+msgid "_Junk List"
+msgstr "سرکودن لړ_"
+
+#: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
+msgid "Message retracted successfully"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:87
+msgid "Retract Mail"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+msgid "Add Send Options to groupwise messages"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "A plugin for the features in Groupwise accounts."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+msgid "Groupwise Features"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "ناسم کارن"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "کارن ټاکل"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "What would you like to {0}?"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/process-meeting.c:49
+msgid "Accept Tentatively"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:1
+msgid "<b>Users:</b>"
+msgstr "<b>کارنان</b>"
+
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr "ي_ادښت استوزه دوديزول"
+
+#: ../plugins/groupwise-features/properties.glade.h:3
+msgid "Con_tacts..."
+msgstr "...اړي_کلوري"
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
+msgid "Message"
+msgstr "استوزه"
+
+#: ../plugins/groupwise-features/properties.glade.h:6
+msgid "Shared Folder Notification"
+msgstr "د ونډول شوې پوښۍ يادښت"
+
+#: ../plugins/groupwise-features/properties.glade.h:8
+msgid "The participants will receive the following notification.\n"
+msgstr ".ګډونوال به لاندنی يادښت ترلاسه کړي\n"
+
+#: ../plugins/groupwise-features/properties.glade.h:12
+msgid "_Not Shared"
+msgstr "نه دی ونډول شوی_"
+
+#: ../plugins/groupwise-features/properties.glade.h:14
+msgid "_Shared With..."
+msgstr "...ونډول شوی سره د_"
+
+#: ../plugins/groupwise-features/properties.glade.h:15
+msgid "_Sharing"
+msgstr "ونډول کيږي_"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
+msgid "<b>Name</b>"
+msgstr "<b>نوم</b>"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+msgid "Access Rights"
+msgstr "لاسرس رښتې"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+msgid "Add/Edit"
+msgstr "زياتول/سمول"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+msgid "Con_tacts"
+msgstr "اړي_کلوري"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+msgid "Modify _folders/options/rules/"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+msgid "Read items marked _private"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+msgid "Reminder Notes"
+msgstr "رايادونې يادښت"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+msgid "Subscribe to my _alarms"
+msgstr "زما _خبرونو کې ګډون کول"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+msgid "Subscribe to my _notifications"
+msgstr "زما _يادښتونو کې ګډون کول"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+msgid "_Write"
+msgstr "ليکل_"
+
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+msgid "permission to read|_Read"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+msgid "Proxy"
+msgstr "ګوډاګی"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+msgid "<b>Account Name</b>"
+msgstr "<b>ګڼون نوم</b>"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+msgid "Proxy Login"
+msgstr "ګوډاګی ننوتون"
+
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
+#: ../plugins/groupwise-features/send-options.c:83
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
+#. * feature by which one person can send/read mails/appointments using another person's identity
+#. * without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login.c:509
+msgid "_Proxy Login..."
+msgstr "...ګوډاګی ننوتون_"
+
+#: ../plugins/groupwise-features/proxy.c:691
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy.c:696
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:750
+msgid "Users"
+msgstr "کارنان"
+
+#: ../plugins/groupwise-features/share-folder-common.c:320
+msgid "Enter the users and set permissions"
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:339
+msgid "New _Shared Folder..."
+msgstr "...نوې _ونډول شوې پوښۍ"
+
+#: ../plugins/groupwise-features/share-folder-common.c:447
+msgid "Sharing"
+msgstr "ونډول کيږي"
+
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "دوديز يادښت"
+
+#: ../plugins/groupwise-features/share-folder.c:755
+msgid "Add   "
+msgstr "زياتول"
+
+#: ../plugins/groupwise-features/share-folder.c:761
+msgid "Modify"
+msgstr "بدلول"
+
+#: ../plugins/groupwise-features/status-track.c:105
+msgid "Message Status"
+msgstr "استوزه انکړ"
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr ":سرليک"
+
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr ":له"
+
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr ":د جوړولو نېټه"
+
+#: ../plugins/groupwise-features/status-track.c:187
+msgid "Recipient: "
+msgstr ":نیوونی"
+
+#: ../plugins/groupwise-features/status-track.c:194
+msgid "Delivered: "
+msgstr ":استول شوي"
+
+#: ../plugins/groupwise-features/status-track.c:200
+msgid "Opened: "
+msgstr ":پرانيستل شوي"
+
+#: ../plugins/groupwise-features/status-track.c:205
+msgid "Accepted: "
+msgstr ":منل شوي"
+
+#: ../plugins/groupwise-features/status-track.c:210
+msgid "Deleted: "
+msgstr ":ړنګول شوي"
+
+#: ../plugins/groupwise-features/status-track.c:215
+msgid "Declined: "
+msgstr ":نامنل شوي"
+
+#: ../plugins/groupwise-features/status-track.c:220
+msgid "Completed: "
+msgstr ":بشپړ شوي"
+
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr ":نالېږل شوي"
+
+#: ../plugins/groupwise-features/status-track.c:249
+msgid "Track Message Status..."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Account Setup"
+msgstr "هولا ګڼون امسته"
+
+#: ../plugins/imap-features/imap-headers.c:320
+msgid "Custom Headers"
+msgstr "دوديزې سريزې"
+
+#: ../plugins/imap-features/imap-headers.c:333
+msgid "IMAP Headers"
+msgstr "سريزې IMAP"
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+msgid "<b>Custom Headers</b>"
+msgstr "<b>دوديزې سريزې</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>سريزې IMAP</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+msgid "Fetch A_ll Headers"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:5
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:7
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:9
+msgid ""
+"_Basic Headers - (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "A plugin for the features in the IMAP accounts."
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:78
+msgid "_Import to Calendar"
+msgstr "کليز ته دننول_"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Tasks"
+msgstr "دندو ته دننول_"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:201
+msgid "Import ICS"
+msgstr "دننول ICS"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:224
+msgid "Select Task List"
+msgstr "دنده لړ وټاکئ"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:228
+msgid "Select Calendar"
+msgstr "کليز وټاکئ"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
+msgid "_Import"
+msgstr "دننول_"
+
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "کليز ته دننول"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+msgid "Search for an iPod failed"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+msgid ""
+"Evolution could not find an iPod to synchronize with. Either the iPod is not "
+"connected to the system or it is not powered on."
+msgstr ""
+
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
+msgid "iCalendar format (.ics)"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:569
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:589
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:615
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:691
+msgid "Unable to find any calendars"
+msgstr "کوم کليزونه نه شي موندلی"
+
+#: ../plugins/itip-formatter/itip-formatter.c:698
+msgid "Unable to find this meeting in any calendar"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:702
+msgid "Unable to find this task in any task list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:706
+msgid "Unable to find this memo in any memo list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:777
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:946
+msgid "Unable to parse item"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1004
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1016
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1020
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1025
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1030
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1124
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1131
+msgid "Sent a cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1133
+msgid "Could not send the cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1219
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1246
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1250
+msgid "Attendee status updated"
+msgstr "د ګډونوال انکړ اوسمهال کړل شو"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1276
+msgid "Meeting information sent"
+msgstr "د کتنې خبرتياوې ولېږل شوې"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1279
+msgid "Task information sent"
+msgstr "د دندې خبرتياوې ولېږل شوې"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1282
+msgid "Memo information sent"
+msgstr "د ميمو خبرتياوې ولېږل شوې"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1291
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1294
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1297
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
+msgid "The calendar attached is not valid"
+msgstr "نښتی کليز سم نه دی"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+msgid "The item in the calendar is not valid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1448
+msgid "The calendar attached contains multiple items"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1449
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2149
+msgid "This meeting recurs"
+msgstr "دا کتنه بياپېښيږي"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2152
+msgid "This task recurs"
+msgstr "دا دنده بياپېښيږي"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2155
+msgid "This memo recurs"
+msgstr "دا ميمو بياپېښيږي"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:2384
+msgid "_Delete message after acting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
+msgid "Conflict Search"
+msgstr ""
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:2409
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
+msgid "Today"
+msgstr "نن"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:195
+msgid "Today %H:%M"
+msgstr "%H:%M نن‎"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:199
+msgid "Today %H:%M:%S"
+msgstr "%H:%M:%S نن‎"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:208
+msgid "Today %l:%M:%S %p"
+msgstr "%l:%M:%S %p نن‎"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:218
+msgid "Tomorrow"
+msgstr "سبا"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:223
+msgid "Tomorrow %H:%M"
+msgstr "%H:%M سبا"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:227
+msgid "Tomorrow %H:%M:%S"
+msgstr "%H:%M:%S سبا"
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:232
+msgid "Tomorrow %l:%M %p"
+msgstr "%l:%M %p سبا"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:236
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "%l:%M:%S %p سبا"
+
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:255
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:260
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:264
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:269
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:273
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. without a year.
+#: ../plugins/itip-formatter/itip-view.c:282
+msgid "%A, %B %e"
+msgstr "%A, %B %e"
+
+#. strftime format of a weekday, a date
+#. without a year and a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:288
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %B %e %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:292
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %B %e %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:297
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %B %e %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:301
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %B %e %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:307
+msgid "%A, %B %e, %Y"
+msgstr "%A, %B %e, %Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:312
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %B %e, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:316
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %B %e, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:321
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %B %e, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:325
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
+
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:357
+#, c-format
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:359
+#, c-format
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:364
+#, c-format
+msgid "<b>%s</b> has delegated the following meeting to you:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:367
+#, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:369
+#, c-format
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:375
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:377
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:381
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:387
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:389
+#, c-format
+msgid "<b>%s</b> has sent back the following meeting response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:393
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:395
+#, c-format
+msgid "<b>%s</b> has canceled the following meeting."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:399
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:401
+#, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:405
+#, c-format
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:407
+#, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:445
+#, c-format
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:447
+#, c-format
+msgid "<b>%s</b> has published the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:452
+#, c-format
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:455
+#, c-format
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:457
+#, c-format
+msgid "<b>%s</b> has assigned you a task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:463
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:465
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:469
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:475
+#, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:477
+#, c-format
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:481
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:483
+#, c-format
+msgid "<b>%s</b> has canceled the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:487
+#, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:489
+#, c-format
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:493
+#, c-format
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:495
+#, c-format
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:533
+#, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:535
+#, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:540
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:542
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:546
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:548
+#, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr ""
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:819
+msgid "_Open Calendar"
+msgstr "کليز پرانيستل_"
+
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
+msgid "_Decline"
+msgstr "نه منل_"
+
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
+msgid "_Accept"
+msgstr "منل_"
+
+#: ../plugins/itip-formatter/itip-view.c:829
+msgid "_Decline all"
+msgstr "ټول نه منل_"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+msgid "_Tentative all"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:831
+msgid "_Accept all"
+msgstr "ټول منل_"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:842
+msgid "_Send Information"
+msgstr "خبرتياوې لېږل_"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:846
+msgid "_Update Attendee Status"
+msgstr "د ګډونوال انکړ اوسمهالول"
+
+#: ../plugins/itip-formatter/itip-view.c:849
+msgid "_Update"
+msgstr "اوسمهالول_"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:1010
+msgid "Start time:"
+msgstr ":پېل مهال"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:1019
+msgid "End time:"
+msgstr "پای مهال"
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1085
+msgid "Comment:"
+msgstr ":څرګندون"
+
+#: ../plugins/itip-formatter/itip-view.c:1071
+msgid "Send _reply to sender"
+msgstr "استوونکي ته _ځواب لېږل"
+
+#: ../plugins/itip-formatter/itip-view.c:1099
+msgid "Send _updates to attendees"
+msgstr "ګډونوالانو ته _اوسمهالونې لېږل"
+
+#: ../plugins/itip-formatter/itip-view.c:1108
+msgid "_Apply to all instances"
+msgstr "په ټولو بېلګو کارول_"
+
+#: ../plugins/itip-formatter/itip-view.c:1117
+msgid "Show time as _free"
+msgstr "مهال لکه _وزګار ښودل"
+
+#: ../plugins/itip-formatter/itip-view.c:1850
+msgid "_Tasks :"
+msgstr ":دندې_"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
+msgid "Memos :"
+msgstr ": ميموګانې"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Displays text/calendar parts in messages."
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot;?"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "This meeting has been delegated"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+
+#: ../plugins/mail-account-disable/mail-account-disable.c:47
+msgid "Proxy _Logout"
+msgstr "ګوډاګی _وتون"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+msgid "Allows disabling of accounts."
+msgstr ".د ګڼونونو ناتوانونه پرېښل"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable Account"
+msgstr "ګڼون ناتوانول"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If true, then beep, otherwise will play sound file when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "د نوې استوزې د رسېدو پر مهال غږ غږول"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+msgid "Whether play sound or beep when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+msgid "Whether the icon should blink or not."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:255
+msgid "Generate a _D-Bus message"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:361
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "ليک يادښت"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "ليک يادښت"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:440
+#, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-notification/mail-notification.c:445
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
+msgid "New email"
+msgstr "نوی برېښليک"
+
+#: ../plugins/mail-notification/mail-notification.c:519
+msgid "Show icon in _notification area"
+msgstr "په _يادښت سيمه کې انځورن ښودل"
+
+#: ../plugins/mail-notification/mail-notification.c:522
+msgid "B_link icon in notification area"
+msgstr "په يادښت سيمه کې انځورن پ_ړکول"
+
+#: ../plugins/mail-notification/mail-notification.c:524
+msgid "Popup _message together with the icon"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:705
+msgid "_Play sound when new messages arrive"
+msgstr "د نويو استوزو د رارسېدو پر مهال غږ غږول_"
+
+#: ../plugins/mail-notification/mail-notification.c:711
+msgid "_Beep"
+msgstr "بيپ_"
+
+#: ../plugins/mail-notification/mail-notification.c:712
+msgid "Play _sound file"
+msgstr "غږيزه _دوتنه غږول"
+
+#: ../plugins/mail-notification/mail-notification.c:723
+msgid "Specify _filename:"
+msgstr ":دوتنه نوم _وټاکئ"
+
+#: ../plugins/mail-notification/mail-notification.c:724
+msgid "Select sound file"
+msgstr "غږيزه دوتنه وټاکئ"
+
+#: ../plugins/mail-notification/mail-notification.c:725
+msgid "Pl_ay"
+msgstr "غږ_ول"
+
+#: ../plugins/mail-notification/mail-notification.c:782
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid ""
+"Generates a D-Bus message or notifies the user with an icon in notification "
+"area and a notification message whenever a new message has arrived."
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "ليک يادښت"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr "کت_نې ته اړول"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr "کتنې ته ليکل"
+
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "%s .کليز نه شي پرانيستلی"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Con_vert to Task"
+msgstr "دن_ده اړول"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr "دندې ته ليکل"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Contact list _owner"
+msgstr "د لړ _خاوند سره اړيکه نيول"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Get list _archive"
+msgstr "د لړ _ارشيو اخيستل"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+msgid "Get list _usage information"
+msgstr "د لړ د _کارونې خبرتياوې اخيستل"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+msgid "Mailing List Actions"
+msgstr "د ليک لړ چارونه"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+msgid "Mailing _List"
+msgstr "ليک _لړ"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+msgid "_Post message to list"
+msgstr "لړ ته استوزه لېږل_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+msgid "_Subscribe to list"
+msgstr "لړ کې ګډون کول_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+msgid "_Un-subscribe to list"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "چار شتون نه لري"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr "هېڅ برېښليک چار"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "Send e-mail message to mailing list?"
+msgstr "ليک لړ ته برېښليک استوزه لېږل غواړﺉ؟"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could process.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+msgid "_Edit message"
+msgstr "استوزه سمول_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "استوزه لېږل_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact List _Owner"
+msgstr "د لړ _خاوند سره اړيکه نيول"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get List _Archive"
+msgstr "د لړ _ارشيو اخيستل"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get List _Usage Information"
+msgstr "د لړ د _کارونې خبرتياوې اخيستل"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post Message to List"
+msgstr "لړ ته استوزه لېږل_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to List"
+msgstr "لړ کې ګډون کول_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Unsubscribe from List"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "ټولې استوزې لکه لوستې نښول"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "اوسنۍ پوښۍ او _څېرمه پوښۍ"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "يوازې _اوسنۍ پوښۍ"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "ټول لوستي نښول"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark Me_ssages as Read"
+msgstr "اس_توزې لکه لوستې نښول"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
+msgid "Mark calendar offline"
+msgstr "کليز لکه ناليکه نښول"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
+msgid "Marks the selected calendar for offline viewing."
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+msgid "_Do not make available for offline use"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+msgid "_Make available for offline use"
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+msgid "A plugin which implements mono plugins."
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Mono Loader"
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+msgid "A plugin for managing which plugins are enabled or disabled."
+msgstr ""
+
+#. Setup the ui
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
+#: ../plugins/plugin-manager/plugin-manager.c:236
+msgid "Plugin Manager"
+msgstr "لګون سمبالګر"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr "لګونونه توانول او ناتوانول"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "_Plugins"
+msgstr "لګونونه_"
+
+#: ../plugins/plugin-manager/plugin-manager.c:42
+msgid "Author(s)"
+msgstr "ليکوال(ان)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "سازونه"
+
+#: ../plugins/plugin-manager/plugin-manager.c:249
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:275
+msgid "Overview"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
+msgid "Plugin"
+msgstr "لګون"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML messages.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
+msgstr ""
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+msgid "Plain Text Mode"
+msgstr "ساده ليکنې اکر"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:174
+msgid "Show HTML if present"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:175
+msgid "Prefer PLAIN"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:176
+msgid "Only ever show PLAIN"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:219
+msgid "HTML _Mode"
+msgstr "اکر_HTML"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr ""
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "ځايونه"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:595
+msgid "Are you sure you want to remove this URL?"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">ځای</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">سرچينې</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "ت_وانول"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr ":د_رشل"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing Location"
+msgstr "د خپرولو ځای"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid "Publishing _Frequency:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+msgid "Service _type:"
+msgstr ":د پالنې _ډول"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+msgid "_File:"
+msgstr ":دوتنه_"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr ":تېرنويې_"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr ":خپرول لکه_"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr ":کارننوم_"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "پېټان لېښونکی"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+msgid "SpamAssassin (built-in)"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid ""
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
+"to be installed."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+msgid "SpamAssassin junk plugin"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/save-attachments.c:314
+msgid "Save attachments"
+msgstr "نښلنونه ساتل"
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+msgid "Save Attachments..."
+msgstr "...نښلنونه ساتل"
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+msgid "Save all attachments"
+msgstr "ټول نښلنونه ساتل"
+
+#: ../plugins/save-attachments/save-attachments.c:320
+msgid "Select save base name"
+msgstr "د ساتلو بنسټ نوم وټاکئ"
+
+#: ../plugins/save-attachments/save-attachments.c:339
+msgid "MIME Type"
+msgstr "ډول MIME"
+
+#: ../plugins/save-attachments/save-attachments.c:347
+msgid "Save"
+msgstr "ساتل"
+
+#.
+#. * Translator: the %F %T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the csv-file.
+#. *
+#: ../plugins/save-calendar/csv-format.c:162
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:360
+msgid "UID"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Description List"
+msgstr "د سپراړيو لړ"
+
+#: ../plugins/save-calendar/csv-format.c:363
+msgid "Categories List"
+msgstr "ټولۍ لړ"
+
+#: ../plugins/save-calendar/csv-format.c:364
+msgid "Comment List"
+msgstr "څرګندون لړ"
+
+#: ../plugins/save-calendar/csv-format.c:366
+msgid "Created"
+msgstr "جوړ شوی"
+
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Contact List"
+msgstr "اړيکلور لړ"
+
+#: ../plugins/save-calendar/csv-format.c:368
+msgid "Start"
+msgstr "پېلول"
+
+#: ../plugins/save-calendar/csv-format.c:369
+msgid "End"
+msgstr "پای"
+
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "percent Done"
+msgstr "سلنه شوی"
+
+#: ../plugins/save-calendar/csv-format.c:373
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:374
+msgid "Attendees List"
+msgstr "د ګډونوالو لړ"
+
+#: ../plugins/save-calendar/csv-format.c:376
+msgid "Modified"
+msgstr "بدل شوی"
+
+#: ../plugins/save-calendar/csv-format.c:531
+msgid "Advanced options for the CSV format"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:538
+msgid "Prepend a header"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:547
+msgid "Value delimiter:"
+msgstr ":ارزښت راچاپېرل"
+
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "Record delimiter:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:559
+msgid "Encapsulate values with:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:581
+msgid "Comma separated value format (.csv)"
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "ټاکل شوی ساتل"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Saves selected calendar or tasks list to disk."
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "ټيکلي کې ساتل_"
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:149
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:376
+msgid "RDF format (.rdf)"
+msgstr ""
+
+#: ../plugins/save-calendar/save-calendar.c:160
+msgid "Select destination file"
+msgstr "موخه دوتنه وټاکئ"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+msgid "Select one source"
+msgstr "يوه سرچينه وټاکئ"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+msgid "Selects a single calendar or task source for viewing."
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+msgid "Show _only this Calendar"
+msgstr "يوازې _دا کليز ښودل"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr "يوازې _دا ميمو لړ ښودل"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
+msgid "Show _only this Task List"
+msgstr "يوازې _دا دنده لړ ښودل"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that manages the Startup wizard."
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+msgid "Startup wizard"
+msgstr "پېلنګ اسانګر"
+
+#: ../plugins/startup-wizard/startup-wizard.c:84
+msgid "Evolution Setup Assistant"
+msgstr "د اېوليوشن امستلو مرستيال"
+
+#: ../plugins/startup-wizard/startup-wizard.c:87
+msgid "Welcome"
+msgstr "ښه راغلاست"
+
+#: ../plugins/startup-wizard/startup-wizard.c:88
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"اېوليوشن ته ښه راغلاست. راتلونکي څو پړاونه به اېوليوشن پريږدي چې ستاسو ."
+"برېښليک ګڼونو سره ونښلي، او د نورو کاريالونو نه دوتنې ودننوي\n"
+"\n"
+".تڼۍ کېکاږﺉ \"Forward\" د پرمخبيولو لپاره"
+
+#: ../plugins/startup-wizard/startup-wizard.c:134
+msgid "Importing files"
+msgstr "دوتنې دننول کيږي"
+
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:144
+msgid "Please select the information that you would like to import:"
+msgstr "لورينه وکړﺉ کومې خبرتياوې چې دننول غواړﺉ ويې ټاکئ:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:397
+#, c-format
+msgid "From %s:"
+msgstr ":%s ‎له"
+
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:508
+#, c-format
+msgid "Importing data."
+msgstr "اومتوک دننول کيږي."
+
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
+msgid "Please wait"
+msgstr "لږه تمه وکړﺉ"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+msgid "Subject Threading"
+msgstr "سرليک مزونه"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+msgid "Thread messages by subject"
+msgstr "استوزې په سرليک مزول"
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: ../plugins/subject-thread/subject-thread.c:54
+msgid "F_all back to threading messages by subject"
+msgstr ""
+
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "د دندې سرليک"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "لکه ګارليک ساتل"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "لکه ګارليک ساتل"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr ""
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "اېوليوشن ازموېنه"
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "اېوليوشن ازموېنې رغتوکی"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Configuration version"
+msgstr "د سازونې نسخه"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
+msgid "Decides whether the crash detection should be run or not."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default sidebar width"
+msgstr "د څنګپټې تلواله پلنوالی"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window height"
+msgstr "د څنګپټې تلواله اوږدوالی"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Default window state"
+msgstr "د کړکۍ تلواله دريځ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Default window width"
+msgstr "د کړکۍ تلواله پلنوالی"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username/password combo is defined by \"/apps/evolution/shell/network_config/"
+"authentication_user\" and locally stored password in .gnome2_private/."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Last upgraded configuration version"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Sidebar is visible"
+msgstr "څنګپټه ښکاري"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Skip development warning dialog"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Skip recovery warning dialog"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+msgid "Start in offline mode"
+msgstr "په ناليکه اکر کې پېلول"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Statusbar is visible"
+msgstr "انکړپټه ښکاري"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "The default height for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "The default width for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The default width for the sidebar, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Toolbar is visible"
+msgstr "توکپټه ښکاري"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "ګوډاګی کارول HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "Whether crash detection should be done or not"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid "Whether or not the window should be maximized."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "Whether the sidebar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+msgid "Whether the status bar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid "Whether the window buttons should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:57
+msgid "Window button style"
+msgstr "د کړکۍ تڼۍ ډول"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:58
+msgid "Window buttons are visible"
+msgstr "د کړکۍ تڼۍ ښکاري"
+
+#: ../shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>چارنده نښلېدنې</b>"
+
+#: ../shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "چارنده نښلېدنې"
+
+#: ../shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "هوکې کېکاږﺉ چې ټولې نښلېدنې بندې کړﺉ او ناليکه شئ"
+
+#: ../shell/e-shell-importer.c:132
+msgid "Choose the type of importer to run:"
+msgstr ":د ځغلولو لپاره د دننونکي ډول وټاکئ"
+
+#: ../shell/e-shell-importer.c:135
+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 ""
+
+#: ../shell/e-shell-importer.c:141
+msgid "Choose the destination for this import"
+msgstr "د دې دننونې لپاره موخه وټاکئ"
+
+#: ../shell/e-shell-importer.c:147
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:285
+msgid "F_ilename:"
+msgstr ":د_وتنه نوم"
+
+#: ../shell/e-shell-importer.c:290
+msgid "Select a file"
+msgstr "يوه دوتنه وټاکئ"
+
+#: ../shell/e-shell-importer.c:299
+msgid "File _type:"
+msgstr ":دوتنه _ډول"
+
+#: ../shell/e-shell-importer.c:335
+msgid "Import data and settings from _older programs"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:338
+msgid "Import a _single file"
+msgstr "يوګړې _دوتنه دننول"
+
+#: ../shell/e-shell-settings-dialog.c:314
+msgid "Evolution Preferences"
+msgstr "د اېوليوشن غوراوي"
+
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
+#, c-format
+msgid "%s - Evolution"
+msgstr "اېوليوشن - %s"
+
+#: ../shell/e-shell-window-commands.c:75
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:83
+#, c-format
+msgid "Error executing %s."
+msgstr ".په چلولو کې تېروتنه %s د"
+
+#: ../shell/e-shell-window-commands.c:139
+msgid "Bug buddy is not installed."
+msgstr ".کړاو ملګری نه دی لګول شوی"
+
+#: ../shell/e-shell-window-commands.c:142
+msgid "Bug buddy could not be run."
+msgstr ".کړاو ملګری نه شي ځغلېدی"
+
+#. The translator-credits string is for translators to list
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:729
+msgid "translator-credits"
+msgstr ""
+"Zabeeh Khan <zabeehkhan@gmail.com>\n"
+"The Pathanisation Project <pathanisation@googlegroups.com>"
+
+#: ../shell/e-shell-window-commands.c:740
+msgid "Evolution Website"
+msgstr "د اېوليوشن ګورتپاڼه"
+
+#: ../shell/e-shell-window-commands.c:758
+msgid "Error opening the FAQ webpage."
+msgstr ".د بيابيا کېدونکو پوښتنو ګورتپاڼې په پرانيستلو کې تېروتنه"
+
+#: ../shell/e-shell-window-commands.c:955
+msgid "_Work Online"
+msgstr "پرليکه دنده کول_"
+
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
+msgid "_Work Offline"
+msgstr "ناليکه دنده کول_"
+
+#: ../shell/e-shell-window-commands.c:981
+msgid "Work Offline"
+msgstr "ناليکه دنده کول"
+
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:384
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+
+#: ../shell/e-shell-window.c:780
+#, c-format
+msgid "Switch to %s"
+msgstr "ته ونجول %s"
+
+#: ../shell/e-shell.c:638
+msgid "Unknown system error."
+msgstr "ناپېژندلې غونډال تېروتنه"
+
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
+#, c-format
+msgid "%ld KB"
+msgstr "ک ب %ld"
+
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
+msgid "OK"
+msgstr "هوکې"
+
+#: ../shell/e-shell.c:1280
+msgid "Invalid arguments"
+msgstr "ناسمې ارزښتمنۍ"
+
+#: ../shell/e-shell.c:1282
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: ../shell/e-shell.c:1284
+msgid "Configuration Database not found"
+msgstr ""
+
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
+msgid "New"
+msgstr "نوی"
+
+#: ../shell/test/evolution-test-component.c:107
+msgid "New Test"
+msgstr "نوې ازموېنه"
+
+#: ../shell/test/evolution-test-component.c:108
+msgid "_Test"
+msgstr "ازموېل_"
+
+#: ../shell/test/evolution-test-component.c:109
+msgid "Create a new test item"
+msgstr "نوی ازموېن توکی جوړول"
+
+#: ../shell/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ".کېکاږﺉ \"Import\" اېوليوشن ته د دوتنې دننونه پېلولو لپاره"
+
+#: ../shell/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr "د اېوليوشن دننولو مرستيال"
+
+#: ../shell/import.glade.h:3
+msgid "Import File"
+msgstr "دوتنه دننول"
+
+#: ../shell/import.glade.h:4
+msgid "Import Location"
+msgstr "د دننولو ځای"
+
+#: ../shell/import.glade.h:5
+msgid "Importer Type"
+msgstr "د دننونکي ډول"
+
+#: ../shell/import.glade.h:6
+msgid "Select Importers"
+msgstr "دننونکي وټاکئ"
+
+#: ../shell/import.glade.h:7
+msgid "Select a File"
+msgstr "يوه دوتنه وټاکئ"
+
+#: ../shell/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 ""
+"د اېوليوشن دننونکي مرستيال ته ښه راغلاست.\n"
+"دا مرستيال به تاسو ته د اېوليوشن ته د بهرنېو\n"
+".دوتنو دننولو لياره وښيي"
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:222
+#, no-c-format
+msgid ""
+"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.gnome.org.\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/main.c:246
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"مننه\n"
+"د اېوليوشن ډله\n"
+
+#: ../shell/main.c:253
+msgid "Do not tell me again"
+msgstr "ما ته بيا مه وايه"
+
+#: ../shell/main.c:303
+msgid "Evolution Crash Detection"
+msgstr ""
+
+#: ../shell/main.c:305
+msgid "Ig_nore"
+msgstr "پر_ېښودل"
+
+#: ../shell/main.c:320
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run.  As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+
+#: ../shell/main.c:331
+msgid "_Do not show this message again"
+msgstr "دا استوزه بيا نه ښودل_"
+
+#: ../shell/main.c:563
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: ../shell/main.c:567
+msgid "Start in online mode"
+msgstr "په پرليکه اکر کې پېلول"
+
+#: ../shell/main.c:570
+msgid "Forcibly shut down all Evolution components"
+msgstr ""
+
+#: ../shell/main.c:574
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr ""
+
+#: ../shell/main.c:577
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: ../shell/main.c:579
+msgid "Disable loading of any plugins."
+msgstr ".د ټولو لګونونو لېښنه ناتوانول"
+
+#: ../shell/main.c:581
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+
+#: ../shell/main.c:666
+msgid "- The Evolution PIM and Email Client"
+msgstr ""
+
+#: ../shell/main.c:694
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:2
+msgid "Continue"
+msgstr "پرمخبيول"
+
+#: ../shell/shell.error.xml.h:3
+msgid "Delete old data from version {0}?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:4
+msgid "Evolution can not start."
+msgstr ".اېوليوشن نه شي پېلېدی"
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:7
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:8
+msgid "Really delete old data?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:9
+msgid ""
+"The entire contents of the &quot;evolution&quot; directory are about to be "
+"permanently removed.\n"
+"\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
+"\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:15
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:19
+msgid "Upgrade from previous version failed: {0}"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:20
+msgid ""
+"Upgrading your data and settings will require up to {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/shell.error.xml.h:23
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:26
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:31
+msgid "_Forget"
+msgstr "هېرول_"
+
+#: ../shell/shell.error.xml.h:32
+msgid "_Keep Data"
+msgstr "اومتوک ساتل_"
+
+#: ../shell/shell.error.xml.h:33
+msgid "_Remind Me Later"
+msgstr "وروسته خبرول_"
+
+#: ../shell/shell.error.xml.h:34
+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"
+"که چېرې تاسو پرمخبيول وټاکئ، کېدی شي چې تاسو خپل ځېنې زوړ اومتوک ته .لاسرسی "
+"ونه لرﺉ\n"
+
+#: ../smime/gui/ca-trust-dialog.c:102
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: ../smime/gui/cert-trust-dialog.c:151
+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:155
+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:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
+msgid "Select a certificate to import..."
+msgstr "...د دننولو لپاره برېليک وټاکئ"
+
+#: ../smime/gui/certificate-manager.c:146
+msgid "All PKCS12 files"
+msgstr "دوتنې PKCS۱۲ ټولې"
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+msgid "All files"
+msgstr "ټولې دوتنې"
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
+msgid "Certificate Name"
+msgstr "د بريليک نوم"
+
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
+msgid "Purposes"
+msgstr "موخې"
+
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
+msgid "Serial Number"
+msgstr "لړیزه شمېره"
+
+#: ../smime/gui/certificate-manager.c:297
+msgid "Expires"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:389
+msgid "All email certificate files"
+msgstr "ټول برېښليک برېليک دوتنې"
+
+#: ../smime/gui/certificate-manager.c:489
+msgid "E-Mail Address"
+msgstr "برېښليک پته"
+
+#: ../smime/gui/certificate-manager.c:613
+msgid "All CA certificate files"
+msgstr "برېليک دوتنې CA ټولې"
+
+#: ../smime/gui/certificate-viewer.c:339
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr "%s :برېليک ليدانی"
+
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "لپاره تېرنويې وليکئ `%s' د"
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:70
+msgid "Enter new password for certificate database"
+msgstr "د برېليک توکبنسټ لپاره نوې تېرنويې وليکئ"
+
+#: ../smime/gui/component.c:72
+msgid "Enter new password"
+msgstr "نوې تېرنويې وليکئ"
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:115
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:168
+msgid "Select certificate"
+msgstr "برېليک وټاکئ"
+
+#: ../smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
+msgstr "<د بريليک برخه نه دي>"
+
+#: ../smime/gui/smime-ui.glade.h:2
+msgid "<b>Certificate Fields</b>"
+msgstr "<b>برېليک ډګرونه</b>"
+
+#: ../smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:4
+msgid "<b>Field Value</b>"
+msgstr "<b>ډګر ارزښت</b>"
+
+#: ../smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr "<b>ګوتنښې</b>"
+
+#: ../smime/gui/smime-ui.glade.h:6
+msgid "<b>Issued By</b>"
+msgstr "<b>لخوا ورکړل شوې</b>"
+
+#: ../smime/gui/smime-ui.glade.h:7
+msgid "<b>Issued To</b>"
+msgstr "<b>ته ورکړل شوې</b>"
+
+#: ../smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:9
+msgid "<b>Validity</b>"
+msgstr "<b>باورکړن</b>"
+
+#: ../smime/gui/smime-ui.glade.h:10
+msgid "Authorities"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:11
+msgid "Backup"
+msgstr "شاتړول"
+
+#: ../smime/gui/smime-ui.glade.h:12
+msgid "Backup All"
+msgstr "ټول شاتړول"
+
+#: ../smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+msgid "Certificate"
+msgstr "برېليک"
+
+#: ../smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:16
+msgid "Certificate details"
+msgstr "د بريليک سپړاوي"
+
+#: ../smime/gui/smime-ui.glade.h:17
+msgid "Certificates Table"
+msgstr "د بريليکونو لښتيال"
+
+#: ../smime/gui/smime-ui.glade.h:18
+msgid "Common Name (CN)"
+msgstr "(CN) ټولګړی نوم"
+
+#: ../smime/gui/smime-ui.glade.h:19
+msgid "Contact Certificates"
+msgstr "اړيکلور بريليکونه"
+
+#: ../smime/gui/smime-ui.glade.h:21
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:23
+msgid "Edit"
+msgstr "سمون"
+
+#: ../smime/gui/smime-ui.glade.h:24
+msgid "Email Certificate Trust Settings"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:25
+msgid "Email Recipient Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:26
+msgid "Email Signer Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:27
+msgid "Expires On"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:29
+msgid "Import"
+msgstr "دننول"
+
+#: ../smime/gui/smime-ui.glade.h:30
+msgid "Issued On"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:31
+msgid "MD5 Fingerprint"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:32
+msgid "Organization (O)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:33
+msgid "Organizational Unit (OU)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:34
+msgid "SHA1 Fingerprint"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+msgid "SSL Client Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+msgid "SSL Server Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:38
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:41
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:42
+msgid "View"
+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:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:45
+msgid "You have certificates on file that identify these people:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:46
+msgid "Your Certificates"
+msgstr "ستاسو بريليکونه"
+
+#: ../smime/gui/smime-ui.glade.h:47
+msgid "_Edit CA Trust"
+msgstr ""
+
+#. XXX we shouldn't be popping up dialogs in this code.
+#: ../smime/lib/e-cert-db.c:672
+msgid "Certificate already exists"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:425
+msgid "Sign"
+msgstr "نښه"
+
+#: ../smime/lib/e-cert.c:426
+msgid "Encrypt"
+msgstr "کوډه کښل"
+
+#: ../smime/lib/e-cert.c:531
+msgid "Version"
+msgstr "نسخه"
+
+#: ../smime/lib/e-cert.c:546
+msgid "Version 1"
+msgstr "۱ نسخه"
+
+#: ../smime/lib/e-cert.c:549
+msgid "Version 2"
+msgstr "۲ نسخه"
+
+#: ../smime/lib/e-cert.c:552
+msgid "Version 3"
+msgstr "۳ نسخه"
+
+#: ../smime/lib/e-cert.c:634
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:637
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:640
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:667
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:670
+msgid "Certificate Key Usage"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:673
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:676
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:688
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:739
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:747
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:769
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:774
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:789
+msgid "Subject's Public Key"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+msgid "Object Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:835
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:839
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:867
+msgid "Signing"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:871
+msgid "Non-repudiation"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:875
+msgid "Key Encipherment"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:879
+msgid "Data Encipherment"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:883
+msgid "Key Agreement"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:887
+msgid "Certificate Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:891
+msgid "CRL Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:939
+msgid "Critical"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+msgid "Not Critical"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:965
+msgid "Extensions"
+msgstr "شاتاړي"
+
+#: ../smime/lib/e-cert.c:1036
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+msgid "Certificate Signature Algorithm"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1101
+msgid "Issuer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1155
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1174
+msgid "Subject Unique ID"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1217
+msgid "Certificate Signature Value"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:266
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:266
+msgid "Enter password for PKCS12 file:"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:365
+msgid "Imported Certificate"
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: ../tools/killev.c:61
+#, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "%s ‎:نه شي چلولی '%s'\n"
+
+#: ../tools/killev.c:76
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "د پته _کتاب ځانتياوې"
+
+#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr "د ټاکل شوې پوښۍ ځانتياوې بدلول"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "...ته ټول اړيکلوري لم_ېسل"
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr "د اړيکلوري _مخليد"
+
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:7
+msgid "Copy Selected Contacts to Another Folder..."
+msgstr "...ټاکل شوي اړيکلوري بلې پوښۍ ته لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "د ټاکل شوې پوښۍ اړيکلوري بلې پوښۍ ته لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr "ټاکنه لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Copy to Folder..."
+msgstr "...پوښۍ ته لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Create a new addressbook folder"
+msgstr "نوې پته کتاب پوښۍ جوړول"
+
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "سکڼل"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+msgid "Cut the selection"
+msgstr "ټاکنه سکڼل"
+
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "پته کتاب ړن_ګول"
+
+#: ../ui/evolution-addressbook.xml.h:16
+msgid "Delete selected contacts"
+msgstr "ټاکل شوي اړيکلوري ړنګول"
+
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "ټاکل شوې پوښۍ ړنګول"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "اړيکلوری مخکې کول"
+
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "...ته ټول اړيکلوري خو_ځول"
+
+#: ../ui/evolution-addressbook.xml.h:20
+msgid "Move Selected Contacts to Another Folder..."
+msgstr "...ټاکل شوي اړيکلوري بلې پوښۍ ته خوځول"
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "د ټاکل شوې پوښۍ اړيکلوري بلې پوښۍ ته خوځول"
+
+#: ../ui/evolution-addressbook.xml.h:22
+msgid "Move to Folder..."
+msgstr "...پوښۍ ته خوځول"
+
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "سرېښل"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "ټوټه دړه سرېښل"
+
+#: ../ui/evolution-addressbook.xml.h:25
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:28
+msgid "Print selected contacts"
+msgstr "ټاکل شوي اړيکلوري چاپول"
+
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "ټاکل شوې پوښۍ بيانومول"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "س_اتل ‎VCard ‎پته کتاب لکه"
+
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "...ساتل ‎VCard ‎لکه"
+
+#: ../ui/evolution-addressbook.xml.h:32
+msgid "Save selected contacts as a VCard."
+msgstr ".ساتل ‎VCard ‎ټاکل شوي اړيکلوري لکه"
+
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+msgid "Select All"
+msgstr "ټول ټاکل"
+
+#: ../ui/evolution-addressbook.xml.h:35
+msgid "Select _All"
+msgstr "ټول ټاکل_"
+
+#: ../ui/evolution-addressbook.xml.h:36
+msgid "Select all contacts"
+msgstr "ټول اړيکلوري ټاکل"
+
+#: ../ui/evolution-addressbook.xml.h:37
+msgid "Send a message to the selected contacts."
+msgstr "ټاکل شويو اړيکلوريو ته استوزه لېږل"
+
+#: ../ui/evolution-addressbook.xml.h:38
+msgid "Send message to contact"
+msgstr "اړيکلوري ته استوزه لېږل"
+
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "Send selected contacts to another person."
+msgstr ".ټاکل شوي اړيکلوري بل چا ته لېږل"
+
+#: ../ui/evolution-addressbook.xml.h:40
+msgid "Show contact preview window"
+msgstr "اړيکلوري مخليد کړکۍ ښودل"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "تم_ول"
+
+#: ../ui/evolution-addressbook.xml.h:42
+msgid "Stop"
+msgstr "تمول"
+
+#: ../ui/evolution-addressbook.xml.h:43
+msgid "Stop Loading"
+msgstr "لېښنه تمول"
+
+#: ../ui/evolution-addressbook.xml.h:44
+msgid "View the current contact"
+msgstr "اوسنی اړيکلوری ليدل"
+
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
+msgid "_Actions"
+msgstr "چارې_"
+
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "...ته اړيکلوری لمېسل_"
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "ته پوښۍ اړيکلوري لمېسل_"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "اړيکلوری ړنګول_"
+
+#: ../ui/evolution-addressbook.xml.h:52
+msgid "_Forward Contact..."
+msgstr "اړيکلوری مخکې کول_"
+
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "...ته اړيکلوری خوځول_"
+
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "ته پوښۍ اړيکلوري خوځول_"
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+msgid "_New"
+msgstr "نوی_"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "بيانومول_"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "...ساتل ‎VCard ‎اړيکلوری لکه_"
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "ساتل VCard پوښۍ اړيکلوري لکه_"
+
+#: ../ui/evolution-addressbook.xml.h:63
+msgid "_Send Message to Contact..."
+msgstr "...اړيلکوري ته استوزه لېږل_"
+
+#: ../ui/evolution-calendar.xml.h:4
+msgid "Day"
+msgstr "ورځ"
+
+#: ../ui/evolution-calendar.xml.h:6
+msgid "Delete _all Occurrences"
+msgstr "ټولې _پېښېدنې ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:7
+msgid "Delete all occurrences"
+msgstr "ټولې پېښېدنې ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:8
+msgid "Delete the appointment"
+msgstr "ټاکنه ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:10
+msgid "Delete this occurrence"
+msgstr "دا پېښېدنه ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:11
+msgid "Go To"
+msgstr "ته ورتلل"
+
+#: ../ui/evolution-calendar.xml.h:12
+msgid "Go back"
+msgstr "وروسته تلل"
+
+#: ../ui/evolution-calendar.xml.h:13
+msgid "Go forward"
+msgstr "مخکې تلل"
+
+#: ../ui/evolution-calendar.xml.h:14
+msgid "List"
+msgstr "لړ"
+
+#: ../ui/evolution-calendar.xml.h:15
+msgid "Month"
+msgstr "مياشت"
+
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:196
+msgid "Next"
+msgstr "راتلونکی"
+
+#: ../ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:172
+msgid "Previous"
+msgstr "مخکنی"
+
+#: ../ui/evolution-calendar.xml.h:22
+msgid "Print this calendar"
+msgstr "دا کليز چاپول"
+
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+msgid "Purg_e"
+msgstr "ړنګو_ل"
+
+#: ../ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr "زړې ټاکنې او کتنې ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:25
+msgid "Select _Date"
+msgstr "نېټه _ټاکل"
+
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "نن _ټاکل"
+
+#: ../ui/evolution-calendar.xml.h:27
+msgid "Select a specific date"
+msgstr "کومه ځانګړې نېټه ټاکل"
+
+#: ../ui/evolution-calendar.xml.h:28
+msgid "Select today"
+msgstr "نن ټاکل"
+
+#: ../ui/evolution-calendar.xml.h:29
+msgid "Show as list"
+msgstr "لکه لړ ښودل"
+
+#: ../ui/evolution-calendar.xml.h:30
+msgid "Show one day"
+msgstr "يوه ورځ ښودل"
+
+#: ../ui/evolution-calendar.xml.h:31
+msgid "Show one month"
+msgstr "يوه مياشت ښودل"
+
+#: ../ui/evolution-calendar.xml.h:32
+msgid "Show one week"
+msgstr "يوه اونۍ ښودل"
+
+#: ../ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
+msgstr "دنده اونۍ ښودل"
+
+#: ../ui/evolution-calendar.xml.h:35
+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
+msgid "_Open Appointment"
+msgstr "ټاکنه پرانيستل_"
+
+#: ../ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "اوسنی ليک چلښت بندول"
+
+#: ../ui/evolution-mail-global.xml.h:3
+msgid "Copy the selected folder into another folder"
+msgstr "ټاکل شوې پوښۍ بلې پوښۍ ته لمېسل"
+
+#: ../ui/evolution-mail-global.xml.h:4
+msgid "Create a new folder for storing mail"
+msgstr "د ليک د زېرملو لپاره نوې پوښۍ جوړول"
+
+#: ../ui/evolution-mail-global.xml.h:5
+msgid "Create or edit Search Folder definitions"
+msgstr "د پلټون پوښېو پېژنداوي جوړول يا سمول"
+
+#: ../ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "خځلنۍ _تشول"
+
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+msgid "F_older"
+msgstr "پ_وښۍ"
+
+#: ../ui/evolution-mail-global.xml.h:10
+msgid "Move the selected folder into another folder"
+msgstr "ټاکل شوې پوښۍ بلې پوښۍ ته خوځول"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-global.xml.h:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "د ټولو پوښېو نه ټولې ړنګېدلې استوزې د تل لپاره ړنګول"
+
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Search F_olders"
+msgstr "پوښۍ پ_لټل"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show Message _Preview"
+msgstr "د استوزې _مخليد ښودل"
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Show message preview below the message list"
+msgstr "د استوزه لړ نه لاندې استوزه مخليد ښودل"
+
+#: ../ui/evolution-mail-global.xml.h:16
+msgid "Show message preview side-by-side with the message list"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "Show message preview window"
+msgstr "استوزه مخکوت کړکۍ ښودل"
+
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_Classic View"
+msgstr "لرغیز لید_"
+
+#: ../ui/evolution-mail-global.xml.h:21
+msgid "_Copy Folder To..."
+msgstr "...ته پوښۍ لمېسل_"
+
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "کړاوتمبونې خبرالونه_"
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr "د ناليکې کارونې لپاره استوزې رالېښل_"
+
+#: ../ui/evolution-mail-global.xml.h:25
+msgid "_Message Filters"
+msgstr "استوزه چاڼونه_"
+
+#: ../ui/evolution-mail-global.xml.h:26
+msgid "_Move Folder To..."
+msgstr "...ته پوښۍ خوځول_"
+
+#: ../ui/evolution-mail-global.xml.h:27
+msgid "_New..."
+msgstr "...نوی_"
+
+#: ../ui/evolution-mail-global.xml.h:28
+msgid "_Preview"
+msgstr "مخليد_"
+
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:32
+msgid "_Subscriptions"
+msgstr "ګډونونه_"
+
+#: ../ui/evolution-mail-global.xml.h:33
+msgid "_Vertical View"
+msgstr "نېغ ليد_"
+
+#: ../ui/evolution-mail-list.xml.h:1
+msgid "Change the name of this folder"
+msgstr "د دې پوښۍ نوم بدلول"
+
+#: ../ui/evolution-mail-list.xml.h:2
+msgid "Change the properties of this folder"
+msgstr "د دې پوښۍ ځانتياوې بدلول"
+
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "ټول _مزي وېجاړول"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "ټول استوزه مزي وېجاړول"
+
+#: ../ui/evolution-mail-list.xml.h:5
+msgid "Copy selected message(s) to the clipboard"
+msgstr ""
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Cut selected message(s) to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "ټول مزي غ_ځول"
+
+#: ../ui/evolution-mail-list.xml.h:9
+msgid "E_xpunge"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "ټول استوزه مزي غځول"
+
+#: ../ui/evolution-mail-list.xml.h:12
+msgid "Hide S_elected Messages"
+msgstr "ټ_اکل شوې استوزې پټول"
+
+#: ../ui/evolution-mail-list.xml.h:13
+msgid "Hide _Deleted Messages"
+msgstr "ړنګېدلې _استوزې پټول"
+
+#: ../ui/evolution-mail-list.xml.h:14
+msgid "Hide _Read Messages"
+msgstr "لوستې _استوزې پټول"
+
+#: ../ui/evolution-mail-list.xml.h:15
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "ټولې استوزې لکه لوستې ن_ښول"
+
+#: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "د پوښۍ ټولې استوزې لکه لوستې نښول"
+
+#: ../ui/evolution-mail-list.xml.h:18
+msgid "Paste message(s) from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:19
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:20
+msgid "Permanently remove this folder"
+msgstr "دا پوښۍ د تل لپاره ړنګول"
+
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh..."
+msgstr "...بيا_تاندول"
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr "پوښۍ تاندول"
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr "څ_ېرمه استوزه مزی ټاکل"
+
+#: ../ui/evolution-mail-list.xml.h:24
+msgid "Select Message _Thread"
+msgstr "استوزه _مزی ټاکل"
+
+#: ../ui/evolution-mail-list.xml.h:25
+msgid "Select _All Messages"
+msgstr "ټولې _استوزې ټاکل"
+
+#: ../ui/evolution-mail-list.xml.h:26
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:27
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "Select all visible messages"
+msgstr "ټولې ښکارېدونکې استوزې ټاکل"
+
+#: ../ui/evolution-mail-list.xml.h:30
+msgid "Show Hidde_n Messages"
+msgstr "پټې اس_توزې ښودل"
+
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:32
+msgid "Temporarily hide all messages that have already been read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:33
+msgid "Temporarily hide the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:34
+msgid "Threaded Message list"
+msgstr "مزېدلی استوزه لړ"
+
+#: ../ui/evolution-mail-list.xml.h:36
+msgid "_Group By Threads"
+msgstr "په مزو ډلول_"
+
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+msgid "_Message"
+msgstr "استوزه_"
+
+#: ../ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Address Book"
+msgstr "استوونی پته کتاب کې ز_ياتول"
+
+#: ../ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr "چ_اڼونه کارول"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
+msgid "Add Sender to Address Book"
+msgstr "استوونی پته کتاب کې زياتول"
+
+#: ../ui/evolution-mail-message.xml.h:5
+msgid "All Message _Headers"
+msgstr "ټول استوزه _سريزې"
+
+#: ../ui/evolution-mail-message.xml.h:6
+msgid "Apply filter rules to the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Check for _Junk"
+msgstr "سر_کودن لپاره کتل"
+
+#: ../ui/evolution-mail-message.xml.h:8
+msgid "Compose _New Message"
+msgstr "نوې _استوزه ليکل"
+
+#: ../ui/evolution-mail-message.xml.h:9
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:10
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:11
+msgid "Compose a reply to the sender of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to another folder"
+msgstr "ټاکل شوې استوزې بلې پوښۍ ته لمېسل"
+
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "ټاکل شوې استوزې ټوټه دړې ته لمېسل"
+
+#: ../ui/evolution-mail-message.xml.h:14
+msgid "Create R_ule"
+msgstr "د_وی جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:15
+msgid "Create a Search Folder for these recipients"
+msgstr "د دې ترلاسه کوونکو لپاره يوه پلټون پوښۍ جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:16
+msgid "Create a Search Folder for this mailing list"
+msgstr "د دې ليک لړ لپاره يوه پلټون پوښۍ جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:17
+msgid "Create a Search Folder for this sender"
+msgstr "د دې استووني لپاره يوه پلټون پوښۍ جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:18
+msgid "Create a Search Folder for this subject"
+msgstr "د دې سرليک لپاره يوه پلټون پوښۍ جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:19
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:20
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:21
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:22
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "ټاکل شوې استوزې ټوټه دړې ته سکڼل"
+
+#: ../ui/evolution-mail-message.xml.h:24
+msgid "Decrease the text size"
+msgstr "د ليکنې کچ لږول"
+
+#: ../ui/evolution-mail-message.xml.h:26
+msgid "Display the next important message"
+msgstr "راتلونکې اړينه استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:27
+msgid "Display the next message"
+msgstr "راتلونکې استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr "راتلونکی مزی ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:29
+msgid "Display the next unread message"
+msgstr "راتلونکې نالوستې استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:30
+msgid "Display the previous important message"
+msgstr "مخکنۍ اړينه استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:31
+msgid "Display the previous message"
+msgstr "مخکنۍ استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:32
+msgid "Display the previous unread message"
+msgstr "مخکنۍ نالوستې استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr "...م_خکې کول لکه"
+
+#: ../ui/evolution-mail-message.xml.h:34
+msgid "Filter on Mailing _List..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:35
+msgid "Filter on Se_nder..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Recipients..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:37
+msgid "Filter on _Subject..."
+msgstr ""
+
+#: ../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 messages for follow-up"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ../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:44
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:45
+msgid "Forward the selected message to someone"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:46
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:47
+msgid "Increase the text size"
+msgstr "د ليکنې کچ ډېرول"
+
+#: ../ui/evolution-mail-message.xml.h:49
+msgid "Mar_k as"
+msgstr "نښو_ل لکه"
+
+#: ../ui/evolution-mail-message.xml.h:50
+msgid "Mark the selected messages as having been read"
+msgstr "ټاکل شوې استوزې داسې نښول لکه چې لوستل شوې وي"
+
+#: ../ui/evolution-mail-message.xml.h:51
+msgid "Mark the selected messages as important"
+msgstr "ټاکل شوې استوزې لکه اړينې نښول"
+
+#: ../ui/evolution-mail-message.xml.h:52
+msgid "Mark the selected messages as junk"
+msgstr "ټاکل شوې استوزې لکه سرکودنې نښول"
+
+#: ../ui/evolution-mail-message.xml.h:53
+msgid "Mark the selected messages as not being junk"
+msgstr "ټاکل شوې استوزې داسې نښول لکه چې سرکودن نه وي"
+
+#: ../ui/evolution-mail-message.xml.h:54
+msgid "Mark the selected messages as not having been read"
+msgstr "ټاکل شوې استوزې داسې نښول لکه چې نه وي لوستل شوي"
+
+#: ../ui/evolution-mail-message.xml.h:55
+msgid "Mark the selected messages as unimportant"
+msgstr "ټاکل شوې استوزې لکه نااړينې نښول"
+
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected messages for deletion"
+msgstr "ټاکل شوې استوزې د ړنګولو لپاره نښول"
+
+#: ../ui/evolution-mail-message.xml.h:57
+msgid "Move selected messages to another folder"
+msgstr "ټاکل شوې استوزې بلې پوښۍ ته خوځول"
+
+#: ../ui/evolution-mail-message.xml.h:59
+msgid "Next _Important Message"
+msgstr "راتلونکې _اړينه استوزه"
+
+#: ../ui/evolution-mail-message.xml.h:60
+msgid "Next _Thread"
+msgstr "راتلونکی _مزی"
+
+#: ../ui/evolution-mail-message.xml.h:61
+msgid "Next _Unread Message"
+msgstr "راتلونکې _نالوستې استوزه"
+
+#: ../ui/evolution-mail-message.xml.h:62
+msgid "Not Junk"
+msgstr "نا سرکودن"
+
+#: ../ui/evolution-mail-message.xml.h:63
+msgid "Open a window for composing a mail message"
+msgstr "د ليک استوزې د ليکلو لپاره کړکۍ پرانيستل"
+
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr "ټاکل شوې استوزې په نوې کړکۍ کې پرانيستل"
+
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "P_revious Unread Message"
+msgstr "م_خکنۍ نالوستې استوزه"
+
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "له ټوټه دړې استوزې سرېښل"
+
+#: ../ui/evolution-mail-message.xml.h:68
+msgid "Pos_t New Message to Folder"
+msgstr "پوښۍ ته نوې استوزه ل_ېږل"
+
+#: ../ui/evolution-mail-message.xml.h:69
+msgid "Post a Repl_y"
+msgstr "ځواب ل_ېږل"
+
+#: ../ui/evolution-mail-message.xml.h:70
+msgid "Post a message to a Public folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:71
+msgid "Post a reply to a message in a Public folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:72
+msgid "Pr_evious Important Message"
+msgstr "مخ_کنۍ اړينه استوزه"
+
+#: ../ui/evolution-mail-message.xml.h:73
+msgid "Preview the message to be printed"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:77
+msgid "Print this message"
+msgstr "دا استوزه چاپول"
+
+#: ../ui/evolution-mail-message.xml.h:78
+msgid "Re_direct"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:79
+msgid "Redirect (bounce) the selected message to someone"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:84
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search Folder from Mailing _List..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Search Folder from Recipien_ts..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:88
+msgid "Search Folder from S_ubject..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:89
+msgid "Search Folder from Sen_der..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:90
+msgid "Search for text in the body of the displayed message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:91
+msgid "Select _All Text"
+msgstr "ټوله _ليکنه ټاکل"
+
+#: ../ui/evolution-mail-message.xml.h:92
+msgid "Select all the text in a message"
+msgstr "په کومې استوزه کې ټوله ليکنه ټاکل"
+
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+msgid "Set up the page settings for your current printer"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:94
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Show messages in the normal style"
+msgstr "استوزې په لېوي ډول ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:96
+msgid "Show messages with all email headers"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "Show the raw email source of the message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Undelete the selected messages"
+msgstr "ټاکل شوې استوزې ناړنګول"
+
+#: ../ui/evolution-mail-message.xml.h:99
+msgid "Uni_mportant"
+msgstr "نا_اړين"
+
+#: ../ui/evolution-mail-message.xml.h:100
+msgid "Zoom _Out"
+msgstr "لو_کمول"
+
+#: ../ui/evolution-mail-message.xml.h:101
+msgid "_Attached"
+msgstr "نښلېدلی_"
+
+#: ../ui/evolution-mail-message.xml.h:102
+msgid "_Caret Mode"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:103
+msgid "_Clear Flag"
+msgstr "جنډه پاکول_"
+
+#: ../ui/evolution-mail-message.xml.h:106
+msgid "_Delete Message"
+msgstr "استوزه ړنګول_"
+
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Find in Message..."
+msgstr "...په استوزه کې لټول_"
+
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Flag Completed"
+msgstr "جنډه بشپړه شوه_"
+
+#: ../ui/evolution-mail-message.xml.h:111
+msgid "_Go To"
+msgstr "ته ورتلل_"
+
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Important"
+msgstr "اړين_"
+
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Inline"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:114
+msgid "_Junk"
+msgstr "سرکودن_"
+
+#: ../ui/evolution-mail-message.xml.h:115
+msgid "_Load Images"
+msgstr "انځورونه لېښل_"
+
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Message Source"
+msgstr "د استوزې سرچينه_"
+
+#: ../ui/evolution-mail-message.xml.h:119
+msgid "_Next Message"
+msgstr "راتلونکې استوزه_"
+
+#: ../ui/evolution-mail-message.xml.h:120
+msgid "_Normal Size"
+msgstr "لېوی کچ_"
+
+#: ../ui/evolution-mail-message.xml.h:121
+msgid "_Not Junk"
+msgstr "نا سرکودن_"
+
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Open in New Window"
+msgstr "په نوې کړکۍ کې پرانيستل_"
+
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Previous Message"
+msgstr "مخکنۍ استوزه_"
+
+#: ../ui/evolution-mail-message.xml.h:125
+msgid "_Quoted"
+msgstr ""
+
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "لوستی_"
+
+#: ../ui/evolution-mail-message.xml.h:129
+msgid "_Save Message..."
+msgstr "...استوزه ساتل_"
+
+#: ../ui/evolution-mail-message.xml.h:130
+msgid "_Undelete Message"
+msgstr "استوزه ناړنګول_"
+
+#: ../ui/evolution-mail-message.xml.h:131
+msgid "_Unread"
+msgstr "نالوستی_"
+
+#: ../ui/evolution-mail-message.xml.h:132
+msgid "_Zoom"
+msgstr "لويول_"
+
+#: ../ui/evolution-mail-message.xml.h:133
+msgid "_Zoom In"
+msgstr "لوډېرول_"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "بندول"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+msgid "Main toolbar"
+msgstr "اره توکپټه"
+
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "ټاکل شوې ميمو لمېسل"
+
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "ټاکل شوې ميمو سکڼل"
+
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "ټاکل شوي ميموګانې ړنګول"
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "له ټوټه دړې ميمو سرېښل"
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "د ميموګانو لړ چاپول"
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "ټاکل شوې ميمو ليدل"
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "ميمو پرانيستل_"
+
+#: ../ui/evolution-tasks.xml.h:3
+msgid "Copy selected tasks"
+msgstr "ټاکل شوې دندې لمېسل"
+
+#: ../ui/evolution-tasks.xml.h:5
+msgid "Cut selected tasks"
+msgstr "ټاکل شوې دندې سکڼل"
+
+#: ../ui/evolution-tasks.xml.h:7
+msgid "Delete completed tasks"
+msgstr "بشپړې شوې دندې ړنګول"
+
+#: ../ui/evolution-tasks.xml.h:8
+msgid "Delete selected tasks"
+msgstr "ټاکل شوې دندې ړنګول"
+
+#: ../ui/evolution-tasks.xml.h:9
+msgid "Mar_k as Complete"
+msgstr "لکه بشپړ نښو_ل"
+
+#: ../ui/evolution-tasks.xml.h:10
+msgid "Mark selected tasks as complete"
+msgstr "ټاکل شوې دندې لکه بشپړې نښول"
+
+#: ../ui/evolution-tasks.xml.h:12
+msgid "Paste tasks from the clipboard"
+msgstr "له ټوټه ډړې دندې سرېښل"
+
+#: ../ui/evolution-tasks.xml.h:13
+msgid "Previews the list of tasks to be printed"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:16
+msgid "Print the list of tasks"
+msgstr "د دندو لړ چاپول"
+
+#: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr "دنده مخليد کړکۍ ښودل"
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr "دنده _مخليد"
+
+#: ../ui/evolution-tasks.xml.h:20
+msgid "View the selected task"
+msgstr "ټاکل شوې دنده ليدل"
+
+#: ../ui/evolution-tasks.xml.h:27
+msgid "_Open Task"
+msgstr "دنده پرانيستل_"
+
+#: ../ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr "...د اېوليوشن په اړه"
+
+#: ../ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr "د اېوليوشن امستنې بدلول"
+
+#: ../ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr "د توکپټې ښکارېدنه بدلول"
+
+#: ../ui/evolution.xml.h:5
+msgid "Create a new window displaying this folder"
+msgstr ""
+
+#: ../ui/evolution.xml.h:6
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "د کړکۍ تڼۍ د سرپاڼه توکپټې د امستنې په کارولو سره ښودل"
+
+#: ../ui/evolution.xml.h:7
+msgid "Display window buttons with icons and text"
+msgstr "د کړکۍ تڼۍ د انځورنونو او ليکنې سره ښودل"
+
+#: ../ui/evolution.xml.h:8
+msgid "Display window buttons with icons only"
+msgstr "د کړکۍ تڼۍ يوازې د انځورنونو سره ښودل"
+
+#: ../ui/evolution.xml.h:9
+msgid "Display window buttons with text only"
+msgstr "د کړکۍ تڼۍ يوازې د ليکنې سره ښودل"
+
+#: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "د اېوليوشن په اړه بيابيا کېدونکې پوښتنې"
+
+#: ../ui/evolution.xml.h:11
+msgid "Exit the program"
+msgstr "کړنلار بندول"
+
+#: ../ui/evolution.xml.h:12
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+
+#: ../ui/evolution.xml.h:13
+msgid "Hide window buttons"
+msgstr "د کړکۍ تڼۍ پټول"
+
+#: ../ui/evolution.xml.h:14
+msgid "I_mport..."
+msgstr "...د_ننول"
+
+#: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr "انځورنونه _او ليکنه"
+
+#: ../ui/evolution.xml.h:16
+msgid "Import data from other programs"
+msgstr "د نورو کړنلارو نه اومتوک دننول"
+
+#: ../ui/evolution.xml.h:17
+msgid "Lay_out"
+msgstr "هډو_انه"
+
+#: ../ui/evolution.xml.h:19
+msgid "New _Window"
+msgstr "نوې _کړکۍ"
+
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "د بيابيا کېدونکو پوښتنو ګورتپاڼه پرانيستل "
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "...مخ امس_ته"
+
+#: ../ui/evolution.xml.h:22
+msgid "Prefere_nces"
+msgstr "غور_اوي"
+
+#: ../ui/evolution.xml.h:23
+msgid "Send / Receive"
+msgstr "لېږل / راوستل"
+
+#: ../ui/evolution.xml.h:24
+msgid "Send / _Receive"
+msgstr "لېږل / _راوستل"
+
+#: ../ui/evolution.xml.h:25
+msgid "Send queued items and retrieve new items"
+msgstr ""
+
+#: ../ui/evolution.xml.h:26
+msgid "Set up Pilot configuration"
+msgstr ""
+
+#: ../ui/evolution.xml.h:28
+msgid "Show Side _Bar"
+msgstr "څنګ _پټه ښودل"
+
+#: ../ui/evolution.xml.h:29
+msgid "Show _Status Bar"
+msgstr "انکړ _پټه ښودل"
+
+#: ../ui/evolution.xml.h:30
+msgid "Show _Toolbar"
+msgstr "توکپټه _ښودل"
+
+#: ../ui/evolution.xml.h:31
+msgid "Show information about Evolution"
+msgstr "د اېوليوشن په اړه خبرتياوې ښودل"
+
+#: ../ui/evolution.xml.h:32
+msgid "Submit Bug Report"
+msgstr "کړاو راپور لېږل"
+
+#: ../ui/evolution.xml.h:33
+msgid "Submit _Bug Report"
+msgstr "کړاو _راپور لېږل"
+
+#: ../ui/evolution.xml.h:34
+msgid "Submit a bug report using Bug Buddy"
+msgstr "د کړاو ملګري په کارولو سره کړاو لېږل"
+
+#: ../ui/evolution.xml.h:35
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ../ui/evolution.xml.h:36
+msgid "Tool_bar Style"
+msgstr "د توک_پټې ډول"
+
+#: ../ui/evolution.xml.h:37
+msgid "View/Hide the Side Bar"
+msgstr "څنګ پټه ښودل/پټول"
+
+#: ../ui/evolution.xml.h:38
+msgid "View/Hide the Status Bar"
+msgstr "انکړ پټه ښودل/پټول"
+
+#: ../ui/evolution.xml.h:39
+msgid "_About"
+msgstr "په اړه_"
+
+#: ../ui/evolution.xml.h:40
+msgid "_Close Window"
+msgstr "کړکۍ بندول_"
+
+#: ../ui/evolution.xml.h:43
+msgid "_Forget Passwords"
+msgstr "تېرنويې هېرول_"
+
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr "بيابيا کېدونکې پوښتنې_"
+
+#: ../ui/evolution.xml.h:46
+msgid "_Hide Buttons"
+msgstr "تڼۍ پټول_"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Icons Only"
+msgstr "يوازې انځورنونه_"
+
+#: ../ui/evolution.xml.h:49
+msgid "_Quick Reference"
+msgstr ""
+
+#: ../ui/evolution.xml.h:50
+msgid "_Quit"
+msgstr "وتل_"
+
+#: ../ui/evolution.xml.h:51
+msgid "_Switcher Appearance"
+msgstr "د ونجوونکي ښکارېدنه_"
+
+#: ../ui/evolution.xml.h:52
+msgid "_Synchronization Options..."
+msgstr ""
+
+#: ../ui/evolution.xml.h:53
+msgid "_Text Only"
+msgstr "يوازې ليکنه_"
+
+#: ../ui/evolution.xml.h:55
+msgid "_Window"
+msgstr "کړکۍ_"
+
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "په _کمپنۍ"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "پته کارډونه_"
+
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "لړ ليد_"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "ا_ونۍ ليد"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "ورځ ليد_"
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "مياشت ليد_"
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr "دنده اونۍ ليد_"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "لکه _لېږل شوي پوښۍ"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "په ا_نکړ"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "په لې_ږونکي"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "په سر_ليک"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "استوزې_"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "ميموګانې_"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "د کولو _نېټې سره"
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr "د _انکړ سره"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+msgid "UTC"
+msgstr "‍‍UTC"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "<b>Time Zones</b>"
+msgstr "<b>مهال سيمې</b>"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "<b>_Selection</b>"
+msgstr "<b>ټاکنه_</b>"
+
+#: ../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 "Timezone drop-down combination box"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:186
+msgid "Collection"
+msgstr "ټولګه"
+
+#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views.glade.h:4
+#, no-c-format
+msgid "Define Views for %s"
+msgstr "لپاره ليدنې پېژندل %s د"
+
+#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:368
+msgid "Define Views"
+msgstr "ليدنۍ پېژندل"
+
+#: ../widgets/menus/gal-define-views.glade.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "لپاره ليدنې پېژندل ‎\"%s\""
+
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
+msgid "Table"
+msgstr "لښتيال"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+msgid "Instance"
+msgstr "بېلګه"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+msgid "Save Current View"
+msgstr "اوسنی ليد ساتل"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "_Create new view"
+msgstr "نوی ليد جوړول_"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+msgid "_Replace existing view"
+msgstr "شته ليد ځاېناستول_"
+
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:354
+msgid "Custom View"
+msgstr "دوديز ليد"
+
+#: ../widgets/menus/gal-view-instance.c:583
+msgid "Save Custom View"
+msgstr "دوديز ليد ساتل"
+
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:378
+msgid "Define Views..."
+msgstr "...ليدنې پېژندل"
+
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "C_urrent View"
+msgstr "ا_وسنی ليد"
+
+#: ../widgets/menus/gal-view-menus.c:315
+#, c-format
+msgid "Select View: %s"
+msgstr "%s ‎:ليد ټاکل"
+
+#: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr "اوسنی ليد يو دوديز ليد دی"
+
+#: ../widgets/menus/gal-view-menus.c:364
+msgid "Save Custom View..."
+msgstr "...دوديز ليد ساتل"
+
+#: ../widgets/menus/gal-view-menus.c:369
+msgid "Save current custom view"
+msgstr "اوسنی دوديز ليد ساتل"
+
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Create or edit views"
+msgstr "ليدنې جوړول يا سمول"
+
+#: ../widgets/menus/gal-view-new-dialog.c:70
+msgid "Factory"
+msgstr "فېکټرۍ"
+
+#: ../widgets/menus/gal-view-new-dialog.c:105
+msgid "Define New View"
+msgstr "نوی ليد پېژندل"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+msgid "Name of new view:"
+msgstr ":د نوې ليد نوم"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+msgid "Type of View"
+msgstr "د ليد ډول"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+msgid "Type of view:"
+msgstr ":د ليد ډول"
+
+#: ../widgets/misc/e-attachment-bar.c:1137
+msgid "Attachment Bar"
+msgstr "نښلن پټه"
+
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "%s ‎:دوتنه نه شي نښلولی ‎%s"
+
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "نښلن ځانتياوې"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr ":دوتنه نوم"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr ":‌ډول MIME"
+
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1273
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:221
+msgid "Month Calendar"
+msgstr "مياشت کليز"
+
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
+msgid "Fill color"
+msgstr "ډکون رنګ"
+
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
+msgid "GDK fill color"
+msgstr "ډکون رنګ GDK"
+
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
+msgid "Fill stipple"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
+msgid "X1"
+msgstr "X۱"
+
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
+msgid "X2"
+msgstr "X۲"
+
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
+msgid "Y1"
+msgstr "Y۱"
+
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
+msgid "Y2"
+msgstr "Y۲"
+
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
+msgid "Minimum width"
+msgstr "ټولولږه پلنوالی"
+
+#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
+msgid "Minimum Width"
+msgstr "ټولولږه پلنوالی"
+
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-expander.c:204
+msgid "Spacing"
+msgstr "تشونه"
+
+#: ../widgets/misc/e-cell-date-edit.c:291
+msgid "Now"
+msgstr "اوس"
+
+#: ../widgets/misc/e-cell-date-edit.c:848
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+
+#: ../widgets/misc/e-cell-percent.c:79
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:56
+msgid "Arabic"
+msgstr "عربي"
+
+#: ../widgets/misc/e-charset-picker.c:57
+msgid "Baltic"
+msgstr "بالټيک"
+
+#: ../widgets/misc/e-charset-picker.c:58
+msgid "Central European"
+msgstr "منځنی اروپايي"
+
+#: ../widgets/misc/e-charset-picker.c:59
+msgid "Chinese"
+msgstr "چينايي"
+
+#: ../widgets/misc/e-charset-picker.c:60
+msgid "Cyrillic"
+msgstr "سېرېلېک"
+
+#: ../widgets/misc/e-charset-picker.c:61
+msgid "Greek"
+msgstr "ګريک"
+
+#: ../widgets/misc/e-charset-picker.c:62
+msgid "Hebrew"
+msgstr "هېبرو"
+
+#: ../widgets/misc/e-charset-picker.c:63
+msgid "Japanese"
+msgstr "جاپاني"
+
+#: ../widgets/misc/e-charset-picker.c:64
+msgid "Korean"
+msgstr "کوريايي"
+
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Thai"
+msgstr "ټهايي"
+
+#: ../widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr "ترکي"
+
+#: ../widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr "يونيکوډ"
+
+#: ../widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr "لوېديځ اروپايي"
+
+#: ../widgets/misc/e-charset-picker.c:69
+msgid "Western European, New"
+msgstr "لوېديځ اروپايي، نوی"
+
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
+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
+msgid "Simplified"
+msgstr "ساده"
+
+#: ../widgets/misc/e-charset-picker.c:97
+msgid "Ukrainian"
+msgstr "اکرېني"
+
+#: ../widgets/misc/e-charset-picker.c:100
+msgid "Visual"
+msgstr "ښکارېدونکی"
+
+#: ../widgets/misc/e-charset-picker.c:169
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:214
+msgid "Character Encoding"
+msgstr "لوښه کوډييزونه"
+
+#: ../widgets/misc/e-charset-picker.c:229
+msgid "Enter the character set to use"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:336
+msgid "Other..."
+msgstr "...نور"
+
+#: ../widgets/misc/e-charset-picker.c:598
+msgid "Ch_aracter Encoding"
+msgstr "ل_وښه کوډييزونه"
+
+#: ../widgets/misc/e-dateedit.c:309
+msgid "Date and Time"
+msgstr "نېټه او مهال"
+
+#: ../widgets/misc/e-dateedit.c:330
+msgid "Text entry to input date"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:352
+msgid "Click this button to show a calendar"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:470
+msgid "No_w"
+msgstr "او_س"
+
+#: ../widgets/misc/e-dateedit.c:476
+msgid "_Today"
+msgstr "نن_"
+
+#: ../widgets/misc/e-dateedit.c:1641
+msgid "Invalid Date Value"
+msgstr "ناسم نېټه ارزښت"
+
+#: ../widgets/misc/e-dateedit.c:1670
+msgid "Invalid Time Value"
+msgstr "ناسم مهال ارزښت"
+
+#: ../widgets/misc/e-expander.c:180
+msgid "Expanded"
+msgstr "غځېدلی"
+
+#: ../widgets/misc/e-expander.c:181
+msgid "Whether or not the expander is expanded"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:189
+msgid "Text of the expander's label"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:196
+msgid "Use underline"
+msgstr "لاندکرښه کارول"
+
+#: ../widgets/misc/e-expander.c:197
+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
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:214
+msgid "Label widget"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:215
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+msgid "Expander Size"
+msgstr "د غځوونکي کچ"
+
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+msgid "Size of the expander arrow"
+msgstr "د غځوونکي غشي کچ"
+
+#: ../widgets/misc/e-expander.c:230
+msgid "Indicator Spacing"
+msgstr "نغوتاند تشونه"
+
+#: ../widgets/misc/e-expander.c:231
+msgid "Spacing around expander arrow"
+msgstr ""
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
+msgid "Advanced Search"
+msgstr "ژور پلټون"
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:234
+msgid "Save Search"
+msgstr "پلټون ساتل"
+
+#: ../widgets/misc/e-filter-bar.c:271
+msgid "_Searches"
+msgstr "پلټونونه_"
+
+#: ../widgets/misc/e-filter-bar.c:273
+msgid "Searches"
+msgstr "پلټونونه"
+
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+msgid "_Save Search..."
+msgstr "...پلټون ساتل_"
+
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+msgid "_Edit Saved Searches..."
+msgstr "...ساتل شوي پلټونونه سمول_"
+
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+msgid "_Advanced Search..."
+msgstr "...ژور پلټون_"
+
+#: ../widgets/misc/e-filter-bar.h:104
+msgid "All Accounts"
+msgstr "ټول ګڼونونه"
+
+#: ../widgets/misc/e-filter-bar.h:105
+msgid "Current Account"
+msgstr "اوسنی ګڼون"
+
+#: ../widgets/misc/e-filter-bar.h:106
+msgid "Current Folder"
+msgstr "اوسنۍ پوښۍ"
+
+#: ../widgets/misc/e-filter-bar.h:107
+msgid "Current Message"
+msgstr "اوسنۍ استوزه"
+
+#: ../widgets/misc/e-image-chooser.c:167
+msgid "Choose Image"
+msgstr "انځور ټاکل"
+
+#: ../widgets/misc/e-map.c:625
+msgid "World Map"
+msgstr "د نړۍ نخچه"
+
+#: ../widgets/misc/e-map.c:627
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+
+#: ../widgets/misc/e-online-button.c:112
+#, fuzzy
+msgid "Online"
+msgstr "يو"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:103
+msgid "Sync with:"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:111
+msgid "Sync Private Records:"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:120
+msgid "Sync Categories:"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+msgid "Empty message"
+msgstr "تشه استوزه"
+
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+msgid "Reflow model"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+msgid "Column width"
+msgstr "د ستن پلنوالی"
+
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
+msgid "Search"
+msgstr "پلټون"
+
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
+msgid "Click here to change the search type"
+msgstr "د پلټون ډول بدلولو لپاره دلته کېکاږﺉ"
+
+#: ../widgets/misc/e-search-bar.c:607
+msgid "_Search"
+msgstr "پلټون_"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Find Now"
+msgstr "اوس لټول_"
+
+#: ../widgets/misc/e-search-bar.c:614
+msgid "_Clear"
+msgstr "پاکول_"
+
+#: ../widgets/misc/e-search-bar.c:869
+msgid "Item ID"
+msgstr "توکی پېژند"
+
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
+msgid "Text"
+msgstr "ليکنه"
+
+#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
+#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
+#: ../widgets/misc/e-search-bar.c:1007
+msgid "Sho_w: "
+msgstr ":ښود_ل"
+
+#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
+#. the term to search for
+#: ../widgets/misc/e-search-bar.c:1024
+msgid "Sear_ch: "
+msgstr ":پلټو_ن"
+
+#. To Translators: The " in " label is part of the Quick Search Bar, example:
+#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
+#: ../widgets/misc/e-search-bar.c:1036
+msgid " i_n "
+msgstr "پ_ه"
+
+#: ../widgets/misc/e-selection-model-array.c:594
+#: ../widgets/table/e-tree-selection-model.c:807
+msgid "Cursor Row"
+msgstr "ځری کيل"
+
+#: ../widgets/misc/e-selection-model-array.c:601
+#: ../widgets/table/e-tree-selection-model.c:814
+msgid "Cursor Column"
+msgstr "ځری ستن"
+
+#: ../widgets/misc/e-selection-model.c:210
+msgid "Sorter"
+msgstr "اڼوکی"
+
+#: ../widgets/misc/e-selection-model.c:217
+msgid "Selection Mode"
+msgstr "ټاکنې اکر"
+
+#: ../widgets/misc/e-selection-model.c:225
+msgid "Cursor Mode"
+msgstr "ځری اکر"
+
+#: ../widgets/misc/e-send-options.c:518
+msgid "When de_leted:"
+msgstr ":کله چې وړ_نګول شي"
+
+#: ../widgets/misc/e-send-options.glade.h:1
+msgid "<b>Delivery Options</b>"
+msgstr "<b>د لېږلو غوراوي</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr "<b>ځوابونه</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:3
+msgid "<b>Return Notification</b>"
+msgstr "<b>راستنېدا يادښت</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:4
+msgid "<b>Status Tracking</b>"
+msgstr "<b>انکړ پلنيونه</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:5
+msgid "A_uto-delete sent item"
+msgstr "لېږل شوی توکی خپل-ړنګول"
+
+#: ../widgets/misc/e-send-options.glade.h:7
+msgid "Creat_e a sent item to track information"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:8
+msgid "Deli_vered and opened"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:9
+msgid "Gene_ral Options"
+msgstr "ټول_ګړي غوراوي"
+
+#: ../widgets/misc/e-send-options.glade.h:10
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:12
+msgid ""
+"Normal\n"
+"Proprietary\n"
+"Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:18
+msgid "R_eply requested"
+msgstr "ځ_واب غوښتل شوی"
+
+#: ../widgets/misc/e-send-options.glade.h:20
+msgid "Sta_tus Tracking"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:21
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:25
+msgid "When acce_pted:"
+msgstr ":کله چې وم_نل شي"
+
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "When co_mpleted:"
+msgstr ":کله چې ب_شپړ شي"
+
+#: ../widgets/misc/e-send-options.glade.h:27
+msgid "When decli_ned:"
+msgstr ":کله چې ون_ه منل شي"
+
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "Wi_thin"
+msgstr "پ_ه"
+
+#: ../widgets/misc/e-send-options.glade.h:29
+msgid "_After:"
+msgstr ":وروسته_"
+
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_All information"
+msgstr "ټولې خبرتياوې_"
+
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
+msgid "_Delay message delivery"
+msgstr "د استوزې لېږنه ځنډول_"
+
+#: ../widgets/misc/e-send-options.glade.h:33
+msgid "_Delivered"
+msgstr "لېږل شوي_"
+
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_Set expiration date"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:36
+msgid "_Until:"
+msgstr ":تر_"
+
+#: ../widgets/misc/e-send-options.glade.h:37
+msgid "_When convenient"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:38
+msgid "_When opened:"
+msgstr ":کله چې پرانيستل شي_"
+
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:278
+#, c-format
+msgid "%s (...)"
+msgstr "(...) %s"
+
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:284
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: ../widgets/misc/e-url-entry.c:107
+msgid "Click here to go to URL"
+msgstr "ته د تلو لپاره دلته کېکاږﺉ ‎URL"
+
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "Edit Master Category List..."
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:2
+msgid "Item(s) belong to these _categories:"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:3
+msgid "_Available Categories:"
+msgstr ":شته ټولۍ_"
+
+#: ../widgets/misc/gal-categories.glade.h:4
+msgid "categories"
+msgstr "ټولۍ"
+
+#: ../widgets/table/e-cell-combo.c:169
+msgid "popup list"
+msgstr "بړبوکيز لړ"
+
+#: ../widgets/table/e-cell-date.c:62
+msgid "%l:%M %p"
+msgstr "%l:%M %p"
+
+#: ../widgets/table/e-cell-pixbuf.c:360
+msgid "Selected Column"
+msgstr "ټاکل شوې ستن"
+
+#: ../widgets/table/e-cell-pixbuf.c:367
+msgid "Focused Column"
+msgstr "منځواله ستن"
+
+#: ../widgets/table/e-cell-pixbuf.c:374
+msgid "Unselected Column"
+msgstr "ناټاکل شوې ستن"
+
+#: ../widgets/table/e-cell-text.c:1808
+msgid "Strikeout Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1815
+msgid "Underline Column"
+msgstr "لاندکرښه ستن"
+
+#: ../widgets/table/e-cell-text.c:1822
+msgid "Bold Column"
+msgstr "ډبل ستن"
+
+#: ../widgets/table/e-cell-text.c:1829
+msgid "Color Column"
+msgstr "رنګه ستن"
+
+#: ../widgets/table/e-cell-text.c:1843
+msgid "BG Color Column"
+msgstr "د شاليد رنګ ستن"
+
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "دريځ"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "نا اڼل شوی"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "هېڅ ډلونه"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "ډګرونه ښودل"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "شته ډګرونه"
+
+#: ../widgets/table/e-table-config.glade.h:1
+msgid "A_vailable Fields:"
+msgstr ":ش_ته ډګرونه"
+
+#: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1583
+msgid "Ascending"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:3
+msgid "Clear All"
+msgstr "ټول پاکول"
+
+#: ../widgets/table/e-table-config.glade.h:4
+msgid "Clear _All"
+msgstr "ټول _پاکول"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1583
+msgid "Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:8
+msgid "Group Items By"
+msgstr "توکي ډلول په"
+
+#: ../widgets/table/e-table-config.glade.h:9
+msgid "Move _Down"
+msgstr "ښکته _خوځول"
+
+#: ../widgets/table/e-table-config.glade.h:10
+msgid "Move _Up"
+msgstr "بره _خوځول"
+
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr "ډګر په _ليد کې ښودل"
+
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "ډګر پ_ه ليد کې ښودل"
+
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "ډګر په لي_د کې ښودل"
+
+#: ../widgets/table/e-table-config.glade.h:15
+msgid "Sort"
+msgstr "اڼل"
+
+#: ../widgets/table/e-table-config.glade.h:16
+msgid "Sort Items By"
+msgstr "توکي اڼل په"
+
+#: ../widgets/table/e-table-config.glade.h:17
+msgid "Then By"
+msgstr "بيا په"
+
+#: ../widgets/table/e-table-config.glade.h:19
+msgid "_Fields Shown..."
+msgstr "...ښکارېدلي ډګرونه_"
+
+#: ../widgets/table/e-table-config.glade.h:20
+msgid "_Group By..."
+msgstr "...ډلول په_"
+
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "ډګر په ليد کې ښودل_"
+
+#: ../widgets/table/e-table-config.glade.h:23
+msgid "_Show these fields in order:"
+msgstr ":دا ډګرونه په اوډون ښودل_"
+
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "...اڼل_"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:634
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1887
+msgid "DnD code"
+msgstr "کوډ ‎DnD"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:641
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1901
+msgid "Full Header"
+msgstr "بشپړ سريز"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
+msgid "Add a column..."
+msgstr "...ستن زياتول"
+
+#: ../widgets/table/e-table-field-chooser.glade.h:1
+msgid "Field Chooser"
+msgstr "ډګر ټاکونکی"
+
+#: ../widgets/table/e-table-field-chooser.glade.h:2
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:345
+#, c-format
+msgid "%s : %s (%d item)"
+msgid_plural "%s : %s (%d items)"
+msgstr[0] "‎%s : %s (‎توکی %d)"
+msgstr[1] "‎%s : %s (‎توکي %d)"
+
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "‎%s (‎توکی %d)"
+msgstr[1] "‎%s (‎توکي %d)"
+
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+msgid "Alternating Row Colors"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
+msgid "Horizontal Draw Grid"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+msgid "Vertical Draw Grid"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
+msgid "Draw focus"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+msgid "Cursor mode"
+msgstr "ځری اکر"
+
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+msgid "Selection model"
+msgstr "د ټاکنې بېلګه"
+
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
+msgid "Length Threshold"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
+msgid "Uniform row height"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
+msgid "Frozen"
+msgstr "کنګل شوی"
+
+#: ../widgets/table/e-table-header-item.c:1453
+msgid "Customize Current View"
+msgstr "اوسنی ليد دوديزول"
+
+#: ../widgets/table/e-table-header-item.c:1473
+msgid "Sort _Ascending"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1474
+msgid "Sort _Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1475
+msgid "_Unsort"
+msgstr "نااڼل_"
+
+#: ../widgets/table/e-table-header-item.c:1477
+msgid "Group By This _Field"
+msgstr "په دې _ډګر ډلول"
+
+#: ../widgets/table/e-table-header-item.c:1478
+msgid "Group By _Box"
+msgstr "په _بکس ډلول"
+
+#: ../widgets/table/e-table-header-item.c:1480
+msgid "Remove This _Column"
+msgstr "دا _ستن ړنګول"
+
+#: ../widgets/table/e-table-header-item.c:1481
+msgid "Add a C_olumn..."
+msgstr "...س_تن زياتول"
+
+#: ../widgets/table/e-table-header-item.c:1483
+msgid "A_lignment"
+msgstr "پ_رليکتيا"
+
+#: ../widgets/table/e-table-header-item.c:1484
+msgid "B_est Fit"
+msgstr "ښ_ه برابرول"
+
+#: ../widgets/table/e-table-header-item.c:1485
+msgid "Format Column_s..."
+msgstr "...ستن_ې بڼول"
+
+#: ../widgets/table/e-table-header-item.c:1487
+msgid "Custo_mize Current View..."
+msgstr "...اوسنی ليد دود_يزول"
+
+#: ../widgets/table/e-table-header-item.c:1543
+msgid "_Sort By"
+msgstr "اڼل په_"
+
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1561
+msgid "_Custom"
+msgstr "دوديز_"
+
+#: ../widgets/table/e-table-header-item.c:1894
+msgid "Font Description"
+msgstr "د ليکبڼې سپړاوی"
+
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:173
+msgid "Sort Info"
+msgstr "خبرتياوې اڼل"
+
+#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "ونه"
+
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+msgid "Table header"
+msgstr "لښتيال سرۍ"
+
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+msgid "Table model"
+msgstr "د لښتيال بېلګه"
+
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+msgid "Cursor row"
+msgstr "ځری کيل"
+
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
+msgid "Always search"
+msgstr "تل پلټل"
+
+#: ../widgets/table/e-table.c:3346
+msgid "Use click to add"
+msgstr "د زياتولو لپاره کېکاږﺉ"
+
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+msgid "ETree table adapter"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3362
+msgid "Retro Look"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3363
+msgid "Draw lines and +/- expanders."
+msgstr ""
+
+#: ../widgets/text/e-text.c:2735
+msgid "Input Methods"
+msgstr "د ننوتۍ لېلې"
+
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+msgid "Event Processor"
+msgstr "پېښه بهيرګر"
+
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+msgid "Bold"
+msgstr "ډبل"
+
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+msgid "Strikeout"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+msgid "Anchor"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+msgid "Justification"
+msgstr "همجوليزتيا"
+
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+msgid "Clip Width"
+msgstr "د ټوټې پلنوالی"
+
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+msgid "Clip Height"
+msgstr "د ټوټې اوږدوالی"
+
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+msgid "Clip"
+msgstr "ټوټه"
+
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+msgid "Fill clip rectangle"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+msgid "X Offset"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+msgid "Y Offset"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+msgid "Text width"
+msgstr "د ليکنې پلنوالی"
+
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+msgid "Text height"
+msgstr "د ليکنې اوږدوالی"
+
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+msgid "Use ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+msgid "Ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+msgid "Line wrap"
+msgstr "ليکې نغاړل"
+
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+msgid "Break characters"
+msgstr "مات لوښې"
+
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+msgid "Max lines"
+msgstr "ټولوجګه ليکې"
+
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+msgid "Draw borders"
+msgstr "بريدونه انځورول"
+
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+msgid "Allow newlines"
+msgstr "نوېليکې پرېښل"
+
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+msgid "Draw background"
+msgstr "شاليد انځورول"
+
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+msgid "Draw button"
+msgstr "تڼۍ انځورول"
+
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+msgid "Cursor position"
+msgstr "د ځري ځای"
+
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+msgid "IM Context"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+msgid "Handle Popup"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2c4c1e4035..ac83a441b7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,6 +8,7 @@
 # Rodrigo Flores <rodrigomarquesflores@gmail.com>, 2007.
 # Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2008.
 # Vladimir Melo <vladimirmelo.psi@gmail.com>, 2008
+# Fabrício Godoy <skarllot@gmail.com>, 2008
 #
 #: ../shell/main.c:694
 msgid ""
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-06-29 19:52+0000\n"
-"PO-Revision-Date: 2008-06-29 17:15-0300\n"
-"Last-Translator: Vladimir Melo <vladimirmelo.psi@gmail.com>\n"
+"PO-Revision-Date: 2008-07-22 02:46-0300\n"
+"Last-Translator: Fabrício Godoy <skarllot@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -454,7 +455,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "O catálogo de endereços do Evolution terminou de forma inesperada."
+msgstr "O catálogo de endereços do Evolution saiu inesperadamente."
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid ""
@@ -592,11 +593,11 @@ msgstr "Não foi possível carregar o catálogo de endereços"
 #: ../addressbook/conduit/address-conduit.c:1397
 #: ../addressbook/conduit/address-conduit.c:1400
 msgid "Could not read pilot's Address application block"
-msgstr "Não foi possível ler os dados do aplicativo de endereços do Palm"
+msgstr "Não foi possível ler os dados do aplicativo de endereços do PDA"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
-msgstr "Completar Automaticamente"
+msgstr "Completar automaticamente"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
@@ -1162,7 +1163,7 @@ 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 é o número máximo de entradas a serem baixadas. Atribuir um valor muito "
+"Este é o número máximo de entradas a serem baixadas. Definir um valor muito "
 "grande a este número diminuirá a velocidade de seu catálogo de endereços."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
@@ -1416,7 +1417,7 @@ msgstr "A_rquivar em:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Free/Busy:"
-msgstr "_Livre/Ocupado:"
+msgstr "Disponibi_lidade:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home Page:"
@@ -3405,7 +3406,7 @@ msgstr "Agenda"
 #: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
-msgstr "Livre/Ocupado"
+msgstr "Disponibilidade"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:638
 #: ../addressbook/gui/widgets/eab-contact-display.c:653
@@ -3628,7 +3629,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This query did not complete successfully."
-msgstr "Esta consulta não terminou com sucesso."
+msgstr "Esta consulta não foi concluída com sucesso."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error adding list"
@@ -4361,15 +4362,15 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution calendar has quit unexpectedly."
-msgstr "A agenda do Evolution terminou inesperadamente."
+msgstr "A agenda do Evolution saiu inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "The Evolution memo has quit unexpectedly."
-msgstr "O memorando do Evolution terminou inesperadamente."
+msgstr "O memorando do Evolution saiu inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:49
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr "As tarefas do Evolution terminaram inesperadamente."
+msgstr "As tarefas do Evolution sairam inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "The calendar is not marked for offline usage."
@@ -4512,17 +4513,17 @@ msgstr "Não foi possível iniciar o evolution-data-server"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1627
 #: ../calendar/conduits/calendar/calendar-conduit.c:1630
 msgid "Could not read pilot's Calendar application block"
-msgstr "Não foi possível ler os dados do aplicativo de Agenda do palm"
+msgstr "Não foi possível ler os dados do aplicativo de Agenda do PDA"
 
 #: ../calendar/conduits/memo/memo-conduit.c:912
 #: ../calendar/conduits/memo/memo-conduit.c:915
 msgid "Could not read pilot's Memo application block"
-msgstr "Não foi possível ler os dados do aplicativo de memorandos do palm"
+msgstr "Não foi possível ler os dados do aplicativo de memorandos do PDA"
 
 #: ../calendar/conduits/memo/memo-conduit.c:959
 #: ../calendar/conduits/memo/memo-conduit.c:962
 msgid "Could not write pilot's Memo application block"
-msgstr "Não foi possível ler os dados do aplicativo de memorandos do palm"
+msgstr "Não foi possível gravar os dados do aplicativo de memorandos do PDA"
 
 #: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
@@ -4531,12 +4532,12 @@ msgstr "Prioridade Padrão:"
 #: ../calendar/conduits/todo/todo-conduit.c:1100
 #: ../calendar/conduits/todo/todo-conduit.c:1103
 msgid "Could not read pilot's ToDo application block"
-msgstr "Não foi possível ler os dados do aplicativo de tarefas do palm"
+msgstr "Não foi possível ler os dados do aplicativo de tarefas do PDA"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1145
 #: ../calendar/conduits/todo/todo-conduit.c:1148
 msgid "Could not write pilot's ToDo application block"
-msgstr "Não foi possível escrever os dados do aplicativo de tarefas do palm"
+msgstr "Não foi possível gravar os dados do aplicativo de tarefas do PDA"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:2354
@@ -4858,11 +4859,11 @@ msgstr "Transparência do Evento"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
-msgstr "URLs de servidor de livre/ocupado"
+msgstr "URLs de servidor de disponibilidade"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
-msgstr "Modelo de URL livre/ocupado"
+msgstr "Modelo de URL de disponibilidade"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
@@ -4902,7 +4903,7 @@ msgstr "Hora do último alarme"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
-msgstr "Lista de URLs de servidores para a publicação de livre/ocupado."
+msgstr "Lista de URLs de servidores para a publicação de disponibilidade."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
@@ -5060,9 +5061,9 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"O modelo de URL a se usar como padrão para dados de livre/ocupado, %u é "
-"substituído pela parte usuário do endereço de e-mail e %d é substituído pelo "
-"domínio."
+"O modelo de URL a se usar como padrão para dados de disponibilidade, %u é "
+"substituído pela parte referente ao usuário do endereço de e-mail e %d é "
+"substituído pelo domínio."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
@@ -5611,7 +5612,7 @@ msgstr "<span weight=\"bold\">Alertas</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Servidor Livre/Ocupado Padrão</span>"
+msgstr "<span weight=\"bold\">Servidor Padrão de Disponibilidade</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:17
@@ -7123,7 +7124,7 @@ msgstr "Clique para adicionar uma tarefa"
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr "% Concluída"
+msgstr "% Concluído"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
@@ -7592,33 +7593,33 @@ msgstr "Mensagem de Tarefa Inválida"
 #: ../calendar/gui/e-itip-control.c:1515
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> publicou informação de livre/ocupado."
+msgstr "<b>%s</b> publicou informações de disponibilidade."
 
 #: ../calendar/gui/e-itip-control.c:1516
 msgid "Free/Busy Information"
-msgstr "Informação de livre/ocupado"
+msgstr "Informação de disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1520
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> requisita sua informação de livre/ocupado."
+msgstr "<b>%s</b> está requisitando sua informação de disponibilidade."
 
 #: ../calendar/gui/e-itip-control.c:1521
 msgid "Free/Busy Request"
-msgstr "Pedido de Livre/Ocupado"
+msgstr "Pedido de Disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1525
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
+msgstr "<b>%s</b> respondeu a um pedido de disponibilidade."
 
 #: ../calendar/gui/e-itip-control.c:1526
 msgid "Free/Busy Reply"
-msgstr "Resposta de Livre/Ocupado"
+msgstr "Resposta de Disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1531
 msgid "Bad Free/Busy Message"
-msgstr "Mensagem de Livre/Ocupado Inválida"
+msgstr "Mensagem de Disponibilidade Inválida"
 
 #: ../calendar/gui/e-itip-control.c:1607
 msgid "The message does not appear to be properly formed"
@@ -7696,7 +7697,7 @@ msgstr "Recusar"
 
 #: ../calendar/gui/e-itip-control.c:2388
 msgid "Send Free/Busy Information"
-msgstr "Enviar Informação de Livre/Ocupado"
+msgstr "Enviar Informação de Disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:2416
 msgid "Update respondent status"
@@ -7885,7 +7886,7 @@ msgstr "Mostrar com _menos ampliação"
 
 #: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_Update free/busy"
-msgstr "_Atualizar livre/ocupado"
+msgstr "_Atualizar disponibilidade"
 
 #: ../calendar/gui/e-meeting-time-sel.c:508
 msgid "_<<"
@@ -8130,7 +8131,7 @@ msgstr "Informação do memorando"
 
 #: ../calendar/gui/itip-utils.c:662 ../calendar/gui/itip-utils.c:801
 msgid "Free/Busy information"
-msgstr "Informação de Livre/Ocupado"
+msgstr "Informação de disponibilidade"
 
 #: ../calendar/gui/itip-utils.c:664
 msgid "Calendar information"
@@ -8151,7 +8152,7 @@ msgstr "Contraproposta"
 #: ../calendar/gui/itip-utils.c:797
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "Informação de livre/ocupado (%s para %s)"
+msgstr "Informação de disponibilidade (%s para %s)"
 
 #: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
@@ -10359,7 +10360,7 @@ msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"O Evolution terminou de forma inesperada enquanto você redigia uma nova "
+"O Evolution saiu de forma inesperada enquanto você redigia uma nova "
 "mensagem. Recuperar a mensagem permitirá que você continue de onde você "
 "parou."
 
@@ -12497,10 +12498,10 @@ msgid ""
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
 msgstr ""
-"Procurar no catálogo de endereços o e-mail do remetente. Se encontrado não "
-"será classificado como SPAM. Procurar nos livros marcados para completar "
+"Procurar no catálogo de endereços o e-mail do remetente. Se encontrado, não "
+"será classificado como spam. Procurar nos catálogos marcados para completar "
 "automaticamente. Se estiverem marcados catálogos de endereços remotos (como "
-"ldap), poderá ser demorado para completar automaticamente."
+"LDAP), poderá ser demorado para completar automaticamente."
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid "Determines whether to use custom headers to check for junk"
@@ -12538,7 +12539,7 @@ msgstr "Exibir indicadores de erros ortográficos enquanto você digita."
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid "Empty Junk folders on exit"
-msgstr "Esvaziar pastas Spam ao sair"
+msgstr "Esvaziar pastas de Spam ao sair"
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Empty Trash folders on exit"
@@ -12546,7 +12547,7 @@ msgstr "Esvaziar pastas Lixeira ao sair"
 
 #: ../mail/evolution-mail.schemas.in.h:37
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Esvaziar todas as pastas Spam ao sair do Evolution."
+msgstr "Esvaziar todas as pastas de Spam ao sair do Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:38
 msgid "Empty all Trash folders when exiting Evolution."
@@ -12791,7 +12792,7 @@ msgstr "Tempo mínimo em dias para esvaziar o spam ao sair."
 
 #: ../mail/evolution-mail.schemas.in.h:84
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Intervalo mínimo para esvaziar a lixeira ao sair, em dias."
+msgstr "Tempo mínimo em dias para esvaziar a lixeira ao sair."
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid "Number of addresses to display in TO/CC/BCC"
@@ -13387,7 +13388,7 @@ msgstr " V_erificar Tipos com Suporte "
 
 #: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
-msgstr "(Nota: É necessário reiniciar a aplicação)"
+msgstr "(Nota: É necessário reiniciar o aplicativo)"
 
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
@@ -13608,7 +13609,7 @@ msgstr ""
 "Agora você está pronto para enviar e receber e-mails \n"
 "utilizando o Evolution. \n"
 "\n"
-"Pressione \"Aplicar\" para salvar suas configurações."
+"Clique em \"Aplicar\" para salvar suas configurações."
 
 #: ../mail/mail-config.glade.h:65
 msgid "De_fault"
@@ -13620,7 +13621,7 @@ msgstr "Co_dificação de caracteres padrão:"
 
 #: ../mail/mail-config.glade.h:68
 msgid "Delete junk messages on e_xit"
-msgstr "E_xcluir spam ao sair"
+msgstr "Remover mensagens marcadas como spam ao sair"
 
 #: ../mail/mail-config.glade.h:70
 msgid "Digitally sign o_utgoing messages (by default)"
@@ -14453,10 +14454,10 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"A pasta não vazia em &quot;{1}&quot; já existe.\n"
+"Uma pasta não vazia em &quot;{1}&quot; já existe.\n"
 "\n"
-"Você pode escolher entre ignorar esta pasta, sobrescrevê-la, adicionar o seu "
-"conteúdo ou sair."
+"Você pode escolher entre ignorar esta pasta, acrescentar o seu conteúdo, "
+"sobrescrevê-la ou sair."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
@@ -14752,7 +14753,7 @@ msgid ""
 "again."
 msgstr ""
 "Se você sair, estas mensagens não serão enviadas até que o Evolution seja "
-"reiniciado."
+"iniciado novamente."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15336,12 +15337,13 @@ msgid ""
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
 "Você pode restaurar o Evolution a partir do backup. Você pode restaurar "
-"todas Mensagens, Agendas, Tarefas, Memorandos, e Catálogos de Endereços.\n"
-"Também serão restauradas suas configurações pessoais, filtros de e-mail etc."
+"todas as Mensagens, Agendas, Tarefas, Memorandos, e Catálogos de Endereços.\n"
+"Também serão restauradas suas configurações pessoais, filtros de e-mail e "
+"etc."
 
 #: ../plugins/backup-restore/backup-restore.c:244
 msgid "_Restore Evolution from the backup file"
-msgstr "_Restaurar Evolution a partir do arquivo de backup"
+msgstr "_Restaurar o Evolution a partir do arquivo de backup"
 
 #: ../plugins/backup-restore/backup-restore.c:251
 msgid "Please select an Evolution Archive to restore:"
@@ -15361,7 +15363,7 @@ msgstr "Restaurar diretório do Evolution"
 
 #: ../plugins/backup-restore/backup.c:44
 msgid "Check Evolution Backup"
-msgstr "Checar Backup do Evolution"
+msgstr "Verificar o Backup do Evolution"
 
 #: ../plugins/backup-restore/backup.c:46
 msgid "Restart Evolution"
@@ -15388,7 +15390,7 @@ msgstr ""
 
 #: ../plugins/backup-restore/backup.c:88
 msgid "Backup complete"
-msgstr "Backup Completo"
+msgstr "Backup concluído"
 
 #: ../plugins/backup-restore/backup.c:93
 #: ../plugins/backup-restore/backup.c:136
@@ -15409,7 +15411,7 @@ msgstr "Carregando configurações do Evolution"
 
 #: ../plugins/backup-restore/backup.c:129
 msgid "Removing temporary backup files"
-msgstr "removendo arquivos temporários de backup"
+msgstr "Removendo arquivos temporários de backup"
 
 #: ../plugins/backup-restore/backup.c:249
 #, c-format
@@ -15457,10 +15459,10 @@ msgid ""
 "you want Evolution to restart automatically after backup, please enable the "
 "toggle button."
 msgstr ""
-"Backup do Evolution somente pode começar quando o Evolution não está "
-"executando. Por favor esteja certo que você salvou e fechou todas as janelas "
-"não salvas antes de prosseguir. Se você quiser o Evolution pode reiniciar "
-"automaticamente após fazer o backup, por favor habilite o botão de "
+"Backup do Evolution somente pode começar quando o Evolution não está sendo "
+"executado. Por favor, esteja certo de que você salvou e fechou todas as "
+"janelas não salvas antes de prosseguir. Se você quiser, o Evolution pode "
+"reiniciar automaticamente após fazer o backup, por favor habilite o botão de "
 "alternância."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -15483,12 +15485,12 @@ msgstr ""
 "los a partir do backup. A Restauração do Evolution só poderá ser iniciada "
 "quando o Evolution não estiver em execução. Por favor, certifique-se de "
 "fechar todas as janela não salvas antes de prosseguir. Se você deseja que o "
-"Evolution reinicie automaticamente após a restaurações, por favor habilite "
-"o  botão de alternância."
+"Evolution reinicie automaticamente após a restauração, por favor habilite o "
+"botão de alternância."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
-msgstr "Fazer backup e restaurar configurações e dados do Evolution"
+msgstr "Fazer backup e restauração das configurações e dados do Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
@@ -17356,7 +17358,7 @@ msgid ""
 "tasks or free/busy information"
 msgstr ""
 "A mensagem contém uma agenda, mas a agenda não contém eventos, tarefas ou "
-"informação de livre/ocupado"
+"informação de disponibilidade"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "The calendar attached contains multiple items"
@@ -18539,7 +18541,7 @@ msgid ""
 "Free/Busy"
 msgstr ""
 "iCal\n"
-"Livre/Ocupado"
+"Disponibilidade"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
@@ -18756,7 +18758,7 @@ msgstr ""
 "ao Evolution conectar-se às suas contas de e-mail e importar\n"
 "arquivos de outros aplicativos. \n"
 "\n"
-"Por favor, clique o botão \"Avançar\" para continuar. "
+"Por favor, clique no botão \"Avançar\" para continuar. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:134
 msgid "Importing files"
@@ -19265,7 +19267,7 @@ msgstr ""
 "para indivíduos com tendência a acessos violentos de raiva.\n"
 "\n"
 "Nós esperamos que você aprecie os resultados do nosso trabalho\n"
-"duro, e estamos esperando ansiosamente suas contribuições!\n"
+"duro, e estamos esperando ansiosamente as suas contribuições!\n"
 
 #: ../shell/main.c:257
 msgid ""
@@ -20512,7 +20514,7 @@ msgstr "_Confidencial"
 
 #: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
-msgstr "_Livre/Ocupado"
+msgstr "Disponibilidade"
 
 #: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
@@ -20557,7 +20559,7 @@ msgstr "Criar ou editar as regras para filtragem de correio"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
-msgstr "Baixar mensagens das contas/pastas marcadas como desligadas"
+msgstr "Baixar mensagens das contas e pastas marcadas como desconectadas"
 
 #: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
@@ -20620,7 +20622,7 @@ msgstr "_Logs de Depuração"
 
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
-msgstr "Baixar mensagens para leitura _desconectado"
+msgstr "Baixar mensagens para uso _desconectado"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
@@ -22617,7 +22619,7 @@ msgstr "%s (...)"
 #: ../widgets/misc/e-task-widget.c:303
 #, c-format
 msgid "%s (%d%% complete)"
-msgstr "%s (%d%% cumprida)"
+msgstr "%s (%d%% concluído)"
 
 #: ../widgets/misc/e-url-entry.c:107
 msgid "Click here to go to URL"
diff --git a/po/ru.po b/po/ru.po
index eff0c7f007..6ba0295a80 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,27 +1,28 @@
+# translation of ru.po to Russian
 # translation of evolution to Russian
 #
 # Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
+#
+#: ../shell/main.c:683
 # Valek Filippov <frob@df.ru>, 2000.
 # Dmitry Mastrukov  <dmitry@taurussoft.org>, 2001-2003.
 # Leonid Kanter <leon@asplinux.ru>, 2001-2003, 2004, 2005, 2006, 2007, 2008.
 # Michael Yakhontov <mvy@asplinux.ru>, 2003, 2005.
 # Anatol Kamynin <anatol@tiflocomp.ru>, 2008.
-#
-#: ../shell/main.c:683
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution trunk\n"
+"Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 15:31+0400\n"
-"PO-Revision-Date: 2008-05-26 19:07+0500\n"
-"Last-Translator: Anatol Kamynin <anatol@tiflocomp.ru>\n"
-"Language-Team: Russian <gnome-cyr@gnome.org>\n"
+"POT-Creation-Date: 2008-08-04 12:17+0300\n"
+"PO-Revision-Date: 2008-08-04 16:58+0300\n"
+"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -158,7 +159,7 @@ msgid "calendar view for one or more days"
 msgstr "окно календаря для просмотра одного или более дней"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A, %d %b %Y"
 
@@ -169,7 +170,7 @@ msgstr "%A, %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:761
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
@@ -178,9 +179,9 @@ msgstr "%a, %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a, %d %b %Y"
 
@@ -188,10 +189,10 @@ msgstr "%a, %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -201,7 +202,7 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:787
 #: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
@@ -344,12 +345,9 @@ msgstr "активировать"
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr ""
-"«{0}» — это источник адресной книги, который доступен только для чтения. "
-"Перейдите к виду календаря и выберите календарь, который может принимать "
-"встречи."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr "«{0}» — это источник адресной книги, который доступен только для чтения. Выберите другую адресную книгу из боковой панели вида «Контакты»."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -397,12 +395,12 @@ msgstr "Не удалось удалить адресную книгу."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"В настоящее время вы можете получить доступ только к адресной книге системы "
+"В настоящее время вы можете получить доступ только к системной адресной книге "
 "GroupWise из Evolution. Пожалуйста, используйте какой-нибудь другой почтовый "
-"клиент GroupWise, чтобы получить доступ к папкам Часто Используемых "
-"Контактов и Личной Информации GroupWise."
+"клиент GroupWise, чтобы получить доступ к папкам Часто используемых "
+"Контактов и Персональных контактов GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -447,10 +445,8 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Работа компонента адресной книги Evolution неожиданно завершилась."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Выбранное вами изображение слишком велико. Изменить размер перед сохранением?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Выбранное вами изображение слишком велико. Изменить размер перед сохранением?"
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid ""
@@ -522,9 +518,8 @@ msgstr ""
 "сервер должен быть обновлен до поддерживаемой версии"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr "У вас недостаточно прав для удаления контакта из этой Адресной книги."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "У вас недостаточно прав для удаления контактов из этой адресной книги."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -533,8 +528,7 @@ msgid ""
 msgstr "Вы изменили этот контакт. Сохранить изменения?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Ваши контакты для {0} не будут доступны до перезапуска Evolution."
 
 #: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
@@ -562,7 +556,7 @@ msgstr "_Использовать как есть"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -604,7 +598,7 @@ msgstr "Здесь настраивается автозавершение"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -650,8 +644,9 @@ msgstr "Здесь можно управлять вашими сертифика
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "На этом компьютере"
 
@@ -664,31 +659,24 @@ msgstr "На этом компьютере"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Личное"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "На серверах LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "Контакт"
-
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Создание нового контакта"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "Список _контактов"
-
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Создание нового списка контактов"
@@ -698,10 +686,6 @@ msgstr "Создание нового списка контактов"
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "Адресная _книга"
-
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Создать новую адресную книгу"
@@ -730,7 +714,7 @@ msgstr "Скопировать _книгу локально для автоно�
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Общие"
@@ -751,12 +735,12 @@ msgstr "Аутентификация"
 
 #: ../addressbook/gui/component/addressbook-config.c:977
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Подробности"
 
 #: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Поиск"
 
@@ -770,12 +754,12 @@ msgid "Address Book Properties"
 msgstr "Свойства адресной книги"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Перенос..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Переносится «%s»:"
@@ -856,11 +840,11 @@ msgstr "Сохранить как VCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1345
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -1008,8 +992,7 @@ msgid "Email address"
 msgstr "Электронная почта"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-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:19
@@ -1242,7 +1225,7 @@ msgstr "карточек"
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "минут"
 
@@ -1348,7 +1331,7 @@ msgstr "Телефон"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Служебное"
 
@@ -1370,9 +1353,9 @@ msgid "_Birthday:"
 msgstr "_День рождения:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Календарь:"
 
@@ -1475,7 +1458,7 @@ msgstr "Адрес"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2492,6 +2475,7 @@ msgid "Service"
 msgstr "Служба"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:693
 #: ../plugins/save-calendar/csv-format.c:375
@@ -2783,8 +2767,7 @@ msgstr "Имя _списка:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"_Введите адрес почты или перетащите контакт в список, приведённый ниже:"
+msgstr "_Введите адрес почты или перетащите контакт в список, приведённый ниже:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
@@ -2800,7 +2783,7 @@ msgstr "_Участники"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Книга"
 
@@ -2845,14 +2828,15 @@ msgstr ""
 "Имя или адрес этого контактного лица уже существуют\n"
 "в этой папке. Всё равно хотите добавить?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "Объединить контакты"
-
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
 #: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Объединить"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Объединить контакты"
+
 #: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
@@ -2865,8 +2849,8 @@ msgstr "Эл. почта"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
@@ -2895,7 +2879,7 @@ msgstr[2] "%d контактов"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Запрос"
 
@@ -2906,7 +2890,7 @@ msgstr "Ошибка при получении вида книги"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2938,8 +2922,8 @@ msgid "Save as vCard..."
 msgstr "Сохранить как vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -2990,19 +2974,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "Пере_местить в адресную книгу..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Вырезать"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2045
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Копировать"
 
@@ -3054,7 +3037,7 @@ msgstr "Телефон в машине"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3199,11 +3182,11 @@ msgstr "Веб-сайт"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Ширина"
@@ -3214,11 +3197,11 @@ msgstr "Ширина"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Высота"
@@ -3248,7 +3231,17 @@ msgstr "Максимальная длина имени поля"
 msgid "Column Width"
 msgstr "Ширина столбца"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Поиск контактов..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3262,7 +3255,7 @@ msgstr ""
 "\n"
 "Или дважды щелкните здесь, чтобы создать новый контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3276,7 +3269,7 @@ msgstr ""
 "\n"
 "Дважды щелкните здесь, чтобы создать новый контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3286,7 +3279,7 @@ msgstr ""
 "\n"
 "Поиск контакта."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3296,7 +3289,7 @@ msgstr ""
 "\n"
 "Нет элементов для отображения в этом окне."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Адаптер"
 
@@ -3326,7 +3319,7 @@ msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Копировать ссылку"
 
@@ -3374,7 +3367,7 @@ msgstr "Видеочат"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2376
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -3390,8 +3383,7 @@ msgstr "Календарь"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Cвободен/занят"
 
@@ -3413,12 +3405,14 @@ msgid "Web Log"
 msgstr "Веб-журнал"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "День рождения"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Годовщина"
 
@@ -3464,7 +3458,7 @@ msgstr "Свой контакт не определён"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
@@ -3486,11 +3480,11 @@ msgstr "Протокол не поддерживается"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Отменено"
 
@@ -3605,13 +3599,11 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"База данных для этой адресной книги не смогла обработать текущий запрос."
+msgstr "База данных для этой адресной книги не смогла обработать текущий запрос."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
+msgstr "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
@@ -3772,7 +3764,7 @@ msgstr "Сохранить в адресной книге"
 msgid "Card View"
 msgstr "Вид карточек"
 
-#: ../addressbook/importers/evolution-csv-importer.c:623
+#: ../addressbook/importers/evolution-csv-importer.c:658
 #: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:306
@@ -3780,27 +3772,27 @@ msgstr "Вид карточек"
 msgid "Importing..."
 msgstr "Импорт..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:825
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Программа импортирования Outlook CSV или Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:834
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Программа импортирования Mozilla CSV или Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:843
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Программа импортирования Evolution CSV и Tab"
 
@@ -3868,7 +3860,7 @@ msgstr "Формат"
 #: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
-msgstr "Верхний колонтитул"
+msgstr "Заголовок"
 
 #: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
@@ -3968,7 +3960,7 @@ msgstr "С тенью"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:985
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4010,8 +4002,7 @@ 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 ""
-"Так можно проверить виджет правки стиля отображения контакта при печати"
+msgstr "Так можно проверить виджет правки стиля отображения контакта при печати"
 
 #: ../addressbook/printing/test-print.c:43
 msgid "Contact Print Test"
@@ -4072,8 +4063,7 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-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, чтобы "
 "просмотреть доступные аргументы."
@@ -4097,20 +4087,16 @@ msgstr "Необрабатываемая ошибка"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
-msgstr ""
-"«{0}» — это источник календаря, доступный только для чтения. Смените "
-"календарь на тот, который может принимать встречи."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr "«{0}» — это источник календаря, доступный только для чтения, и не может быть изменён. Выберите в боковой панели вида «Календарь» другой источник календаря."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr ""
-"«{0}» — это источник календаря, доступный только для чтения. Перейдите к "
-"виду календаря и выберите календарь, который может принимать встречи."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr "«{0}» — это источник календаря, доступный только для чтения. Выберите другой календарь, который может принимать встречи."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4147,13 +4133,11 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Вся информация о этих задачах будет безвозвратно удалена."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "Все сведения об этой встрече будут безвозвратно удалены."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Все сведения об этом собрании будут безвозвратно удалены."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4267,8 +4251,7 @@ msgstr ""
 "смогли принять эту задачу."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Сообщения будут разосланы по электронной почте всем участникам, чтобы дать "
 "им возможность ответить."
@@ -4362,8 +4345,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Этот календарь не отмечен для автономного использования."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "Этот список заметок не отмечен для автономного использования"
+msgid "The memo list is not marked for offline usage."
+msgstr "Этот список заметок не отмечен для автономного использования."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4452,12 +4435,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Ваши задачи будут недоступны до перезапуска Evolution."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Отклонить изменения"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Сохранить"
 
@@ -4466,7 +4448,7 @@ msgid "_Save Changes"
 msgstr "_Сохранить изменения"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Отправить"
@@ -4522,12 +4504,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Не удалось прочитать блок приложения ToDo пилота"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Календарь и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4569,17 +4551,17 @@ msgstr "_Заметки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Заметки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4617,7 +4599,7 @@ msgstr[2] "минут"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "час"
@@ -4635,10 +4617,10 @@ msgstr "Встречи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Адрес:"
 
@@ -4647,14 +4629,15 @@ msgid "Snooze _time:"
 msgstr "Напомнить _через:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Правка"
 
@@ -4666,32 +4649,32 @@ msgstr "Напомнить по_зже"
 msgid "location of appointment"
 msgstr "место проведения встречи"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "Сводка недоступна."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "Описание не доступно."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "Данные об адресе недоступны."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "У вас есть %d сигналов"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4703,7 +4686,7 @@ msgstr ""
 "Вместо этого Evolution отобразит нормальный диалог\n"
 "напоминания."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4720,7 +4703,7 @@ msgstr ""
 "\n"
 "Вы действительно хотите запустить эту программу?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "Не задавать больше этот вопрос."
 
@@ -4793,8 +4776,7 @@ msgid "Calendars to run alarms for"
 msgstr "Календари для запуска напоминаний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Цвет маркера времени в расписании (для значения по умолчанию оставьте "
 "пустым)."
@@ -4877,8 +4859,7 @@ msgstr "Час начала рабочего дня, в 24-часовом фор
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Интервалы, отображаемые в режимах \"День\" и \"Рабочая неделя\", в минутах."
+msgstr "Интервалы, отображаемые в режимах \"День\" и \"Рабочая неделя\", в минутах."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
@@ -4986,8 +4967,7 @@ msgstr "Каталог для сохранения звуковых файлов
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Отображать поле \"Просьба ответить\" в редакторе событий/задач/собраний"
+msgstr "Отображать поле \"Просьба ответить\" в редакторе событий/задач/собраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
@@ -5010,12 +4990,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Отображать поле состояния в редакторе событий/задач/собраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Показывать панель предварительного просмотра"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Отображать панель предварительного просмотра."
 
@@ -5087,8 +5067,7 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Единицы напоминания по умолчанию, \"minutes\", \"hours\" или \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Единицы для определения момента скрытия задач, \"minutes\", \"hours\" или "
 "\"days\"."
@@ -5126,8 +5105,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "Показывать ли время завершения событий в обзоре недели и месяца."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Отображать ли маркер текущего времени в календаре."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
@@ -5140,8 +5118,7 @@ msgstr "Устанавливать ли напоминание для событ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Отображать ли поле \"Просьба ответить\" в редакторе событий/задач/собраний"
+msgstr "Отображать ли поле \"Просьба ответить\" в редакторе событий/задач/собраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
@@ -5156,8 +5133,7 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Отображать ли поле состояния в редакторе событий/задач/собраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Показывать ли время в 24-часовом формате вместо am/pm."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
@@ -5276,7 +5252,7 @@ msgstr "Очистить элементы старше чем"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "дней"
@@ -5285,103 +5261,103 @@ msgstr "дней"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "В Сети"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Дни рождения и годовщины"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Погода"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Создать календарь"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2090
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Свойства"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Ошибка обновления календарей."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Не удалось открыть календарь «%s» для создания событий и совещаний"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нет доступного календаря для создания событий и совещаний"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Выбор источника календаря"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Новая встреча"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_Встреча"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Новое собрание"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "_Собрание"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Создать новое приглашение на собрание"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Новая встреча на весь день"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "_Ежедневная встреча"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Создать новую ежедневную встречу"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Новый календарь"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "Кале_ндарь"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
@@ -5402,15 +5378,219 @@ msgid "Month View"
 msgstr "как месяц"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Любое поле"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Вложения"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Участник"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Бизнес"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Категория"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Классификация"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Выполнение"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Конфиденциальное"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Описание"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Описание содержит"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Не существует"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Существует"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Избранное"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Подарки"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Задачи/Цели"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Выходной"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Карточки выходного дня"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Горячие контакты"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Идеи"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Международный"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Ключевой клиент"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Разное"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Следующие 7 дней"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Организатор"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Телефонные звонки"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Личное"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Общее"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Повторение"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Состояние"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Стратегии"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Сводка"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Сводка содержит"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Поставщики"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Время и затраты"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "Ожидание"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "содержит"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "не содержит"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "является"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "не является"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Ошибка при открытии календаря"
@@ -5427,7 +5607,7 @@ msgstr "Отказ в доступе при открытии календаря"
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Изменить сигнал"
 
@@ -5530,7 +5710,10 @@ msgstr "дополнительное время каждые"
 msgid "hour(s)"
 msgstr "часов"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "минут"
 
@@ -5549,12 +5732,11 @@ msgstr "_Добавить"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Сигналы"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
-#: ../composer/e-composer-actions.c:63
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предполагать автоматическое отображение вложения"
 
@@ -5582,8 +5764,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u и %d будут заменены на пользователя и домен из адреса электронной "
 "почты.</i>"
@@ -5628,7 +5809,7 @@ msgid "Display"
 msgstr "Отображение"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Пятница"
@@ -5644,7 +5825,7 @@ msgstr ""
 "Дни"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Понедельник"
@@ -5668,7 +5849,7 @@ msgstr ""
 "Воскресенье"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
@@ -5678,7 +5859,7 @@ msgid "S_un"
 msgstr "Вск"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Суббота"
@@ -5696,7 +5877,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Показывать номера недель в навигаторе по датам"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Воскресенье"
@@ -5715,7 +5896,7 @@ msgid "Template:"
 msgstr "Шаблон:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Четверг"
@@ -5730,13 +5911,13 @@ msgid "Time format:"
 msgstr "Формат времени:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Вторник"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Среда"
@@ -5907,40 +6088,40 @@ msgstr "%s Вы сделали изменения. Отменить их?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Вы ничего не изменили. Обновить редактор?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Ошибка проверки: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " к "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Завершено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Завершено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (к дате"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "К дате"
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Вложенное сообщение - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5948,29 +6129,211 @@ msgstr[0] "%d вложенное сообщение"
 msgstr[1] "%d вложенных сообщения"
 msgstr[2] "%d вложенных сообщений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "Пере_местить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Отменить _перенос"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "вложение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Не удалось обновить объект"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Изменить встречу"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Собрание - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Встреча - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Назначенная задача - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Задача - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Заметка - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Нет сводки"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Нажмите, чтобы закрыть текущее окно"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Копировать выделенный текст в буфер обмена"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Вырезать выделенный текст в буфер обмена"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Нажмите, чтобы просмотреть справку"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Вставить текст из буфера обмена"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Нажмите, чтобы сохранить текущее окно"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Выделить весь текст"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "_Классификация"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Файл"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Справка"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "_Вставить"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Параметры"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Вид"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Вложение..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Нажмите, чтобы вложить файл"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Категории"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Переключает отображение категорий"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Часовой _пояс"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Переключает отображение часового пояса"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Пу_бличное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Классифицировать как публичное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Личное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Классифицировать как личное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Конфиденциальное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Классифицировать как конфиденциальное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Поле «_Должность»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Переключает отображение поля «Должность»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "П_росьба ответить"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Переключает отображение поля «Просьба ответить»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Поле _состояния"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Переключает отображение поля «Состояние»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Поле _типа"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Переключает отображение поля типа участников"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Недавние доку_менты"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Вложить"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5978,88 +6341,48 @@ msgstr[0] "<b>%d</b> вложение"
 msgstr[1] "<b>%d</b> вложения"
 msgstr[2] "<b>%d</b> вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Скрыть _панель вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Показать _панель вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Добавить вложение..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Отображать вложения"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Нажмите клавишу \"Пробел\" для переключения панели вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Изменить встречу"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Собрание - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Встреча - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Назначенная задача - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Задача - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Заметка - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Нет Краткого описания"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Изменения этого элемента будут отвергнуты, если по электронной почте придет "
 "обновление."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Не удалось использовать текущую версию!"
 
@@ -6140,96 +6463,142 @@ msgstr "Поручить:"
 msgid "Enter Delegate"
 msgstr "Ввести представителя"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Сигналы"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Нажмите, чтобы установить или сбросить сигналы для этого события"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Повторение"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Сделать это событие повторяющимся"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Параметры отправки"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Вставить дополнительные параметры оправки"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Событие на весь _день"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Переключает, является ли событие событием на весь день"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Показать время как _Занят"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Переключить отображение времени как «занят»"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "Cво_боден/Занят"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Запросить информацию о занятости для участников"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "Встре_ча"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Повторение"
-
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Это событие имеет сигналы"
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Представители"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "_Участники"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Событие без даты начала"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Событие без даты завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Дата начала неверна"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Неверная дата завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Неверное время начала"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Неверное время завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Выбранный организатор больше не имеет учётной записи."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Требуется организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Требуется как минимум один участник"
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Добавить "
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не удалось открыть календарь «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Вы действуете от лица %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6237,7 +6606,7 @@ msgstr[0] "%d день до встречи"
 msgstr[1] "%d дня до встречи"
 msgstr[2] "%d дней до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6245,7 +6614,7 @@ msgstr[0] "%d час до встречи"
 msgstr[1] "%d часа до встречи"
 msgstr[2] "%d часов до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6253,22 +6622,22 @@ msgstr[0] "%d минута до встречи"
 msgstr[1] "%d минуты до встречи"
 msgstr[2] "%d минут до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Настроить"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:907
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6343,26 +6712,22 @@ msgstr "И_зменить организатора"
 msgid "Co_ntacts..."
 msgstr "Ко_нтакты..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Организатор"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Заметка"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Не удалось открыть заметки в «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1559
-#: ../mail/em-format-html.c:1617 ../mail/em-format-html.c:1643
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
@@ -6382,7 +6747,7 @@ msgid "_Description:"
 msgstr "_Описание:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Группа:"
@@ -6423,17 +6788,17 @@ msgstr "Эту и последующие записи"
 msgid "All Instances"
 msgstr "Все записи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Эта встреча имеет правила повторения, не редактируемые в Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Повторяющаяся дата некорректна"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "в"
 
@@ -6441,7 +6806,7 @@ msgstr "в"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "первый"
 
@@ -6450,7 +6815,7 @@ msgstr "первый"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "второй"
 
@@ -6458,7 +6823,7 @@ msgstr "второй"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "третий"
 
@@ -6466,7 +6831,7 @@ msgstr "третий"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "четвертый"
 
@@ -6474,13 +6839,13 @@ msgstr "четвертый"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "последний"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Другая дата"
 
@@ -6488,7 +6853,7 @@ msgstr "Другая дата"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "с 1-го по 10-е"
 
@@ -6496,7 +6861,7 @@ msgstr "с 1-го по 10-е"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "с 11-го по 20-е"
 
@@ -6504,45 +6869,45 @@ msgstr "с 11-го по 20-е"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "с 21-го по 31-е"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "день"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "случаи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Добавить исключение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Не удалось получить выделение для изменения."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Изменить исключение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Не удалось получить изменение для удаления."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Дата/Время"
 
@@ -6593,12 +6958,12 @@ msgstr "неделя"
 msgid "year(s)"
 msgstr "год(лет)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Веб-страница"
 
@@ -6613,51 +6978,55 @@ 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:252
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Завершена"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Высокий"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "Выполняется"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1061
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Низкий"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Нормальный"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Не началась"
 
@@ -6670,9 +7039,9 @@ msgid "Stat_us:"
 msgstr "Сост_ояние:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
-msgstr "Не определён"
+msgstr "Не определено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
@@ -6687,25 +7056,37 @@ msgstr "_Приоритет:"
 msgid "_Web Page:"
 msgstr "_Веб-страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "_Подробности состояния"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Нажмите, чтобы изменить или просмотреть детали задачи"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Параметры _отправки"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Описание задачи"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Органи_затор:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не удалось открыть задачи в «%s»."
@@ -6808,75 +7189,59 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для неизвестного типа переключателя"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Нажмите, чтобы открыть %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:820
-#: ../shell/e-shell-folder-title-bar.c:586
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Неозаглавленное"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Дата начала:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
 #: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Веб-страница:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:210
 #: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Сводка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Дата выполнения:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Состояние:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Общее"
-
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Личное"
-
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Конфиденциальное"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Дата завершения"
@@ -6886,20 +7251,13 @@ msgstr "Дата завершения"
 msgid "Start Date"
 msgstr "Дата начала"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Summary"
-msgstr "Сводка"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Свободен"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Занят"
@@ -6936,12 +7294,12 @@ msgstr "Нет"
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
-#: ../plugins/plugin-manager/plugin-manager.c:69
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -6967,9 +7325,9 @@ msgstr "Выберите папку для сохранения выделенн
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Со_хранить как..."
 
@@ -6987,126 +7345,152 @@ msgstr "_Сохранить выделенное"
 msgid "Open in %s..."
 msgstr "Открыть в программе %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Нет краткого описания *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Организатор: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Организатор: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Начало: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Завершение: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:879
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Удаление выделенных объектов"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1163
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1348
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1571
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Новая _задача"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Открыть _веб-страницу"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1577
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Печать..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Вырезать"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1583
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Вст_авить"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Назначить задачу"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Переслать как iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "По_метить как выполненное"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "По_метить выбранную задачу как выполненную"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "По_метить как невыполненные"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "По_метить выбранные задачи как выполненные"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "У_далить выделенные задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Нажмите, чтобы добавить задачу"
@@ -7129,6 +7513,7 @@ msgid "Due date"
 msgstr "Срок выполнения"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Приоритет"
@@ -7137,13 +7522,6 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Дата начала"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Состояние"
-
 #: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Перемещение элементов"
@@ -7205,7 +7583,7 @@ msgstr "_Переслать как iCalendar..."
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1335
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7223,26 +7601,14 @@ msgstr "Удалить это вхождение"
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Организатор: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "Организатор: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Адрес: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Время: %s %s"
@@ -7282,19 +7648,19 @@ msgstr "Деления через %02i минут"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
@@ -7418,12 +7784,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Принято"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Экспериментально принятый"
 
@@ -7431,7 +7797,7 @@ msgstr "Экспериментально принятый"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Отклонено"
 
@@ -7439,14 +7805,11 @@ msgstr "Отклонено"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
-"Собрание было отменено, но оно не может быть найдено в ваших календарях"
+msgstr "Собрание было отменено, но оно не может быть найдено в ваших календарях"
 
 #: ../calendar/gui/e-itip-control.c:1285
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Задача была отменена, но она не может быть найдена в ваших списках задач"
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Задача была отменена, но она не может быть найдена в ваших списках задач"
 
 #: ../calendar/gui/e-itip-control.c:1363
 #, c-format
@@ -7639,13 +8002,11 @@ msgstr "Объект некорректен и не может быть обно
 
 #: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
+msgstr "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
 #: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
+msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
@@ -7751,49 +8112,49 @@ msgstr "Участники"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Индивидуально"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Группа"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Источник"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Комната"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Председатель"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Требуемые участники"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Дополнительные участники"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "Не участвует"
 
@@ -7812,7 +8173,7 @@ msgstr "Экспериментальный"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Поручено"
 
@@ -7917,10 +8278,6 @@ msgstr "Нача_ло:"
 msgid "_End time:"
 msgstr "Коне_ц:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Участник"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Нажмите, чтобы добавить участника"
@@ -8000,7 +8357,7 @@ 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/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8154,11 +8511,11 @@ msgstr "Информация iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Вы должны быть участником события."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Новый список заметок"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8166,7 +8523,7 @@ msgstr[0] "%d заметка"
 msgstr[1] "%d заметки"
 msgstr[2] "%d заметок"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8174,56 +8531,44 @@ msgstr[0] ", выделено %d"
 msgstr[1] ", выделено %d"
 msgstr[2] ", выделено %d"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Не удалось обновить заметки."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Не удалось открыть список заметок «%s» для создания событий и собраний"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Нет календаря, доступного для создания заметок"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Выбор источника заметок"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Новая заметка"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "З_аметка"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Создать новую заметку"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Новая общая заметка"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "_Общая заметка"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Создать новую общую заметку"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Новый список заметок"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Список з_аметок"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Создать новый список заметок"
 
@@ -8231,6 +8576,10 @@ msgstr "Создать новый список заметок"
 msgid "Print Memos"
 msgstr "Напечатать заметки"
 
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Следующие 7 дней"
+
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8433,62 +8782,62 @@ msgstr "Пт"
 msgid "Sa"
 msgstr "Cб"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Встреча"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Задание"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Сводка: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Участники: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Состояние: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Завершено процентов: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Контакты: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Следующие встречи"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Новый список задач"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8496,52 +8845,44 @@ msgstr[0] "%d задача"
 msgstr[1] "%d задачи"
 msgstr[2] "%d задач"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "Не удалось обновить задачи."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Не удалось открыть список задач «%s» для создания событий и собраний"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Нет календаря, доступного для создания задач"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Выбор источника задач"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Новая задача"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Новая назначенная задача"
 
-#: ../calendar/gui/tasks-component.c:1333
-msgid "Assigne_d Task"
-msgstr "Назначенная за_дача"
-
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Создать новую назначенную задачу"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Новый список задач"
 
-#: ../calendar/gui/tasks-component.c:1341
-msgid "Tas_k list"
-msgstr "Списо_к задач"
-
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Создать новый список задач"
 
@@ -8557,7 +8898,7 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1131
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Не задавать больше этот вопрос."
 
@@ -8565,6 +8906,27 @@ msgstr "Не задавать больше этот вопрос."
 msgid "Print Tasks"
 msgstr "Напечатать задачи"
 
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% Завершено"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Отменено"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Выполняется"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "больше чем"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "меньше чем"
+
 #: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Встречи и собрания"
@@ -10141,202 +10503,198 @@ msgstr "Не удалось открыть автоматически сохра
 msgid "Unable to retrieve message from editor"
 msgstr "Не удалось получить сообщение из редактора"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Вставить вложение"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "В_ложить"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "Неозаглавленное сообщение"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Вложение..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Вложить файл"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "Закрыть текущий файл"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1342
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Печать..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Пред_варительный просмотр"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "Сохранить текущий файл"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "Сохранить как..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "Сохранить текущий файл под другим именем"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "Сохранить _черновик"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "Сохранить как черновик"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "Отпр_авить"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "Отправить это сообщение"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Параметры _отправки"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Вставить параметры отправки"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "_Новое сообщение"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Открыть окно создания нового сообщения"
+
+#: ../composer/e-composer-actions.c:544
 msgid "Character _Encoding"
 msgstr "Кодировка _символов"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "_Безопасность"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "За_шифровать с помощью PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "Зашифровать это сообщение с помощью PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "Подпи_сать с помощью PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "Подписать это сообщение вашим PGP-ключом"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "Изменить _приоритет сообщения"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "Установить высокий приоритет сообщения"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:585
 msgid "Re_quest Read Receipt"
 msgstr "Запросить уведомление о прочт_ении"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Установите, чтобы получить уведомление о доставке по прочтении вашего "
 "сообщения"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "Зашифровать с _помощью S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Зашифровать это сообщение вашим сертификатом шифрования S/MIME"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "Подписать с по_мощью S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Подписать это сообщение вашим сертификатом шифрования S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "Поле скрытой копии"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Переключить отображение поля скрытой копии"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "Поле копии"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
 msgstr "Переключить отображение поля копии"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "Поле \"От\""
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Переключить отображение выбора для поля \"От\""
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "Поле \"Post-To\""
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Переключить отображение поля \"Post-To\""
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "Поле \"Об_ратный адрес\""
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Переключить отображение поля \"Обратный адрес\""
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 msgid "_Subject Field"
 msgstr "Поле _темы"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Переключает отображение поля \"Темы\""
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "Поле \"_Кому\""
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
 msgstr "Переключить отображение поля \"Кому\""
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Вложить"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Перечислите получателей сообщения"
@@ -10410,8 +10768,7 @@ msgid "Show _Attachment Bar"
 msgstr "Показать панель _вложений"
 
 #: ../composer/e-msg-composer.c:873
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Не удалось подписать исходящее сообщение: нет сертификата подписи для этой "
 "учётной записи"
@@ -10437,11 +10794,11 @@ msgstr[2] "Вложений"
 msgid "Hide _Attachment Bar"
 msgstr "Скрыть панель _вложений"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Новое сообщение"
 
-#: ../composer/e-msg-composer.c:4007
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10546,8 +10903,7 @@ msgstr "Параметры отправки недоступны."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"Файл `{0}' не является обычным файлом и не может быть отправлен в сообщении."
+msgstr "Файл `{0}' не является обычным файлом и не может быть отправлен в сообщении."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -10584,29 +10940,33 @@ msgstr "Внимание: Изменено сообщение"
 
 #: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
-msgstr "Вы не можете вложить файл `{0}' в это сообщение."
+msgstr "Вы не можете вложить файл «{0}» в это сообщение. "
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "Перед созданием нового письма необходимо настроить учётную запись."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "П_родолжить редактирование"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Не восстанавливать"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Восстановить"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Сохранить сообщение"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Сохранить черновик"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Электронная почта и календарь Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Пакет для групповой работы"
 
@@ -10654,7 +11014,7 @@ msgstr "Название компонента для журнала"
 
 #: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:316
+#: ../plugins/plugin-manager/plugin-manager.c:339
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Включено"
@@ -10663,17 +11023,16 @@ msgstr "Включено"
 msgid "Whether the plugin is enabled"
 msgstr "Включён ли модуль"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Во время печати возникла ошибка"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "От системы печати получены следующие детали:"
 
-#: ../e-util/e-print.c:151
-msgid ""
-"The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:171
+msgid "The printing system did not report any additional details about the error."
 msgstr "Система печати не предоставила подробностей о причине ошибки."
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
@@ -10900,56 +11259,56 @@ msgstr "Выберите файл"
 msgid "Test"
 msgstr "Проверка"
 
-#: ../filter/filter-rule.c:815
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "_Имя правила:"
 
-#: ../filter/filter-rule.c:843
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Найти элементы, которые соответствуют следующему критерию"
 
-#: ../filter/filter-rule.c:877
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "_Добавить правило фильтра"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Если удовлетворяет всем критериям"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Если удовлетворяет любому из критериев"
 
-#: ../filter/filter-rule.c:885
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Найти элементы:"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Всё связанное"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Ответы"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Ответы и родительские"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Не является ответом или родительским"
 
-#: ../filter/filter-rule.c:909
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "Включ_ая подшивки"
 
-#: ../filter/filter-rule.c:1005 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Входящие"
 
-#: ../filter/filter-rule.c:1005 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Исходящие"
 
@@ -11063,7 +11422,7 @@ msgstr "указанное вами время"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "недели"
 
@@ -11088,8 +11447,7 @@ msgid "Composer Preferences"
 msgstr "Настройка редактора"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Тут настраиваются параметры почты, включая безопасность и отображение "
 "сообщений"
@@ -11134,10 +11492,10 @@ msgstr "Настройка параметров почты Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Настройка параметров сети Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:610
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Почта"
@@ -11196,46 +11554,46 @@ msgstr "Запрашивать для каждого сообщения"
 msgid "Identity"
 msgstr "Подлинность"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Получение почты"
 
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Проверять _новую почту каждые"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "мину_т"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "По умолчанию"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Безопасность"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Параметры получения"
 
-#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Проверка новой почты"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Редактор учётных записей"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Помощник по учётным записям Evolution"
 
@@ -11253,7 +11611,7 @@ msgid "Protocol"
 msgstr "Протокол"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1157 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Без названия"
 
@@ -11269,18 +11627,18 @@ msgstr "Добавить скрипт подписи"
 msgid "Signature(s)"
 msgstr "Подпись(и)"
 
-#: ../mail/em-composer-utils.c:1008 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Пересланное сообщение --------"
 
-#: ../mail/em-composer-utils.c:1820
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 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:1867
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11288,7 +11646,7 @@ msgstr ""
 "В ${AbbrevWeekdayName}, ${Day}/${Month}/${Year} в ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пишет:"
 
-#: ../mail/em-composer-utils.c:2010
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Исходное сообщение --------"
 
@@ -11309,10 +11667,6 @@ msgstr "Назначить цвет"
 msgid "Assign Score"
 msgstr "Назначить вес"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Вложения"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11329,10 +11683,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Завершено в"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "содержит"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Скопировать в папку"
@@ -11357,10 +11707,6 @@ msgstr "Удалить"
 msgid "Deleted"
 msgstr "Удалено"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "не содержит"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "не заканчивается на"
@@ -11381,10 +11727,6 @@ msgstr "не похоже на"
 msgid "does not start with"
 msgstr "не начинается с"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Не существует"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Черновик"
@@ -11393,10 +11735,6 @@ msgstr "Черновик"
 msgid "ends with"
 msgstr "заканчивается на"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Существует"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "существует"
@@ -11409,14 +11747,10 @@ msgstr "Выражение"
 msgid "Follow Up"
 msgstr "К исполнению"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Важное"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "является"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "после"
@@ -11429,18 +11763,6 @@ msgstr "до"
 msgid "is Flagged"
 msgstr "Отмечено"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "больше чем"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "меньше чем"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "не является"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "не отмечено"
@@ -11589,11 +11911,11 @@ msgid "Unset Status"
 msgstr "Сбросить состояние"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Затем"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Добавить д_ействие"
 
@@ -11639,11 +11961,11 @@ msgstr "Важные"
 msgid "Messages Not Junk"
 msgstr "Не спам"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Текущая учётная запись"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Все учётные записи"
 
@@ -11668,7 +11990,16 @@ msgstr[2] "Всего сообщений:"
 msgid "Quota usage"
 msgstr "Квота"
 
-#: ../mail/em-folder-properties.c:385
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "Входящие"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Свойства папки"
@@ -11685,8 +12016,9 @@ msgstr "С_оздать"
 msgid "Folder _name:"
 msgstr "_Имя папки:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Папки поиска"
 
@@ -11695,124 +12027,89 @@ msgstr "Папки поиска"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Черновики"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "Входящие"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Исходящие"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Отправленные"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
-#. *
-#. * Most languages should translate this as "%s (%u)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:371
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
-
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Дерево почтовых папок"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Перемещение папки %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копирование папки %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перемещение сообщений в папку %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирование сообщений в папку %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Нельзя перетащить сообщение в хранилище верхнего уровня"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Копировать в папку"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Переместить в папку"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на «%s»"
 
-#: ../mail/em-folder-tree.c:2082 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Вид"
-
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Открыть в _новом окне"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Создать папку..."
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "Пере_местить..."
 
-#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Пе_реименовать..."
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Обнов_ить"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Отправить исход_ящие"
 
-#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "О_чистить корзину"
 
@@ -11821,13 +12118,13 @@ msgstr "О_чистить корзину"
 msgid "Copying `%s' to `%s'"
 msgstr "Копирование `%s' в `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
-#: ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "_Копировать"
 
@@ -11849,168 +12146,168 @@ msgstr "Создать новую папку"
 msgid "Specify where to create the folder:"
 msgstr "Укажите, где создать папку:"
 
-#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Сбой удаления почты"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "У вас недостаточно прав для удаления этого сообщения."
 
-#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Пе_реслать"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1340 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Править как новое сообщение..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "В_осстановить"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку..."
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "По_метить как прочитанные"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Пометить как _непрочтенные"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Пометить как _важное"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Пометить как нева_жное"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Пометить как _спам"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Пометить как _не спам"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Пометить к _исполнению..."
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "_Метка"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Нет"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "_Новый ярлык"
 
-#: ../mail/em-folder-view.c:1367
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Отметка «_Завершено»"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "О_чистить отметку"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Созда_ть правило из сообщения"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Папка поиска по _теме"
 
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Папка поиска по _отправителю"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Папка поиска по _получателю"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Папка поиска по списку _рассылки"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Фильтр по _теме"
 
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Фильтр по _отправителю"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Фильтр по _получателям"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Фильтр по списку _рассылки"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Не удалось получить сообщение"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Получение сообщения..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "Позвон_ить..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Создать папку поиска"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_ этого адреса"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_По этому адресу"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Нажмите, чтобы написать письмо %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Нажмите, чтобы позвонить %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Нажмите, чтобы показать/скрыть адреса"
 
@@ -12037,7 +12334,7 @@ msgstr "_Следующее"
 msgid "M_atch case"
 msgstr "_Учитывать регистр"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Не подписано"
 
@@ -12045,10 +12342,9 @@ msgstr "Не подписано"
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr ""
-"Это сообщение не подписано. Отправитель не может быть аутентифицирован."
+msgstr "Это сообщение не подписано. Отправитель не может быть аутентифицирован."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Подпись действительна"
 
@@ -12060,7 +12356,7 @@ msgstr ""
 "Это сообщение подписано действительной подписью, что удостоверяет "
 "подлинность отправителя."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Подпись недействительна"
 
@@ -12072,7 +12368,7 @@ msgstr ""
 "Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
 "изменено по дороге."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Подпись действительна, но проверить отправителя не удалось"
 
@@ -12084,7 +12380,7 @@ msgstr ""
 "Это сообщение подписано действительной подписью, но отправитель сообщения не "
 "может быть проверен."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Подпись существует, но требуется публичный ключ"
 
@@ -12096,7 +12392,7 @@ msgstr ""
 "Это сообщение подписано действительной подписью, не не удалось найти "
 "соответствующий публичный ключ."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Не зашифровано"
 
@@ -12108,7 +12404,7 @@ msgstr ""
 "Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
 "процессе передачи по Интернету."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Зашифровано, уязвимый шифр"
 
@@ -12122,7 +12418,7 @@ msgstr ""
 "Посторонние лица могут, хотя и с определёнными трудностями, получить доступ "
 "к содержимому письма за разумное время."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Зашифровано"
 
@@ -12134,7 +12430,7 @@ msgstr ""
 "Это сообщение зашифровано. Посторонним лицам будет очень сложно просмотреть "
 "содержимое этого сообщения."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Зашифровано, стойкий шифр"
 
@@ -12243,84 +12539,84 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Получение «%s»"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Неизвестная часть external-body."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Часть external-body неверно сформирована"
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указатель на локальный файл (%s), доступный на сайте «%s»"
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указатель на локальный файл (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указатель на удалённые данные (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указатель на неизвестные внешние данные (типа «%s»)"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Форматирование сообщения"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Форматирование сообщения..."
 
-#: ../mail/em-format-html.c:1560 ../mail/em-format-html.c:1624
-#: ../mail/em-format-html.c:1646 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Копия"
 
-#: ../mail/em-format-html.c:1561 ../mail/em-format-html.c:1630
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Скр.копия"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1741 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1768
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1773
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1904
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Это письмо было отослано <b>%s</b> от лица <b>%s</b>"
@@ -12351,43 +12647,43 @@ msgstr "Группы новостей"
 msgid "%s attachment"
 msgstr "вложение %s"
 
-#: ../mail/em-format.c:1197
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Не удалось разобрать сообщение S/MIME: Неизвестная ошибка"
 
-#: ../mail/em-format.c:1334 ../mail/em-format.c:1490
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не удалось разобрать сообщение MIME. Отображается как есть."
 
-#: ../mail/em-format.c:1342
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподдерживаемый тип шифрования для multipart/encrypted"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Не удалось разобрать сообщение PGP/MIME"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Не удалось разобрать сообщение PGP/MIME: Неизвестная ошибка"
 
-#: ../mail/em-format.c:1509
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Неподдерживаемый формат подписи"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Ошибка проверки подписи"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1579 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Неизвестная ошибка при проверке подписи"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Не удалось разобрать сообщение PGP."
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Не удалось разобрать сообщение PGP: Неизвестная ошибка"
 
@@ -12440,8 +12736,7 @@ msgstr "Модуль %s доступен и соответствующий ис�
 #. May be a better text
 #: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "Модуль %s недоступен. Проверьте, что соответствующий пакет установлен."
 
 #: ../mail/em-mailer-prefs.c:1107
@@ -12449,69 +12744,84 @@ msgid "No Junk plugin available"
 msgstr "Модуль работы со спамом недоступен"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Выполнить"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Позже"
 
-#: ../mail/em-migrate.c:1210
-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 ""
-"Расположение и иерархия папок почтового ящика Evolution изменилась после "
-"Evolution 1.x.\n"
-"\n"
-"Подождите, пока Evolution преобразует ваши папки..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Преобразование «%s»:"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Не удалось создать папку `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Не удалось скопировать дескриптор файла: `%s' в `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Не удалось сканировать имеющиеся почтовые ящики на `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+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 ""
+"Расположение и иерархия папок почтового ящика Evolution изменилась после "
+"Evolution 1.x.\n"
+"\n"
+"Подождите, пока Evolution преобразует ваши папки..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Не удалось открыть сохраненные на сервере POP данные «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Не удалось создать каталог для хранения данных на сервере POP3 `%s': %s"
+msgstr "Не удалось создать каталог для хранения данных на сервере POP3 `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Не удалось скопировать сохраненные на сервере POP3 данные `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Ошибка создания локального хранилища почты`%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"После версии Evolution 2.24 форматом хранения сведений о папках почтовых ящиков стал sqlite.\n"
+"\n"
+"Подождите, пока Evolution преобразует ваши папки..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Не удалось создать локальные почтовые папки в `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12663,10 +12973,16 @@ msgstr ""
 "указанного в address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr "Определяет, как часто локальны изменения синхронизируются с удалённым почтовым сервером. Интервал должен быть хотя бы 30 секунд."
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Указанные пользователем заголовки для выявления спама"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12674,59 +12990,59 @@ msgstr ""
 "Указанные пользователем заголовки для выявления спама. Формат в GConf: "
 "заголовок=значение."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Кодировка по умолчанию для составления сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Кодировка по умолчанию для составления сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Кодировка по умолчанию для отображения сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Кодировка по умолчанию для отображения сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Стиль пересылки по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Высота окна редактора по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Высота окна сообщения по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Высота диалога подписки по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Стиль ответа по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Состояние подшивки по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Ширина окна редактора по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Ширина окна сообщения по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Ширина окна подписки по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
@@ -12734,11 +13050,11 @@ msgstr ""
 "Определяет, нужно ли искать адреса для фильтрации спама только в локальной "
 "адресной книге"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "Определяет, нужно ли искать отправителя в адресной книге"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12751,13 +13067,13 @@ msgstr ""
 "быть медленным, если для автозавершения помечены удалённые книги (например, "
 "LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Определяет, надо ли использовать указанные пользователем заголовки для "
 "выявления спама"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12767,7 +13083,7 @@ msgstr ""
 "выявления спама. Если этот ключ установлен и заголовки указаны, то скорость "
 "проверки на спам повысится."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12775,60 +13091,59 @@ msgstr ""
 "Определяет, надо ли использовать одинаковые шрифты для строк «От» и «Тема» в "
 "столбце «Сообщения» в вертикальном режиме просмотра."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Каталог для сохранения файлов компонентов почты."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Каталог для сохранения файлов компонентов почты."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr "Включить или выключить сокращение имён папок в дереве"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Подчеркивать ошибки орфографии при вводе текста"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Очищать каталог спама при выходе"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Очищать корзину при выходе"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Очищать все каталоги со спамом при выходе из Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Очищать все корзины при выходе из Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
+msgstr "Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Включить или выключить «волшебный пробел»"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Включить папки поиска"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Включить папки поиска при запуске."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12840,7 +13155,7 @@ msgstr ""
 "который можно произвести, просто набрав имя папки. Выделение будет "
 "автоматически перемещено к нужной папке."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12848,28 +13163,27 @@ msgstr ""
 "Установите этот ключ, чтобы можно было использовать клавишу пробела для "
 "прокрутки предпросмотра сообщения, списка сообщений и папок."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Разрешить рендеринг текстовой части сообщения ограниченного размера"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Включить/выключить режим каретки"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Высота панели списка сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Высота панели спика сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
-msgstr ""
-"Скрыть предварительный просмотр для каждого каталога и удалить выделение"
+msgstr "Скрыть предварительный просмотр для каждого каталога и удалить выделение"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12877,7 +13191,7 @@ msgstr ""
 "Если пользователь пытается открыть 10 или более сообщений одновременно, "
 "выводить диалог запроса, действительно ли пользователь хочет это сделать."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12885,7 +13199,7 @@ msgstr ""
 "Если включен предварительный просмотр сообщений, отображать его сбоку, а не "
 "под списком сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 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 "
@@ -12896,7 +13210,7 @@ msgstr ""
 "компонентом просмотра bonobo среды Гном, могут использоваться для "
 "отображения содержимого."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -12904,7 +13218,7 @@ msgstr ""
 "Исходное значение высоты окна «Отправка и получение почты». Это значение "
 "изменяется, когда пользователь изменяет размер окна по вертикали."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12918,7 +13232,7 @@ msgstr ""
 "окно «Отправка и получение почты» не может быть развёрнуто на весь экран. "
 "Этот ключ существует только из-за деталей реализации."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -12926,12 +13240,11 @@ msgstr ""
 "Исходное значение ширины окна «Отправка и получение почты». Это значение "
 "изменяется, когда пользователь изменяет размер окна по горизонтали."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-"Включает/выключает запрос подтверждения при пометке нескольких сообщений."
+msgstr "Включает/выключает запрос подтверждения при пометке нескольких сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12939,7 +13252,7 @@ msgstr ""
 "Включает/выключает повторяющиеся запросы о том, надо ли синхронизировать "
 "перед переходом в автономный режим."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12949,31 +13262,31 @@ msgstr ""
 "сообщений из папки поиска они удаляются совсем, а не только из результатов "
 "поиска."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Время последней очистки спама"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Время последней очистки корзины"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Уровень, за которым сообщение должно заноситься в журнал."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Список ярлыков и связанных с ними цветов"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Список принятых лицензий"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Список учётных записей"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12982,15 +13295,15 @@ msgstr ""
 "список содержит строки, соответствующие именам каталогов в /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Список дополнительных заголовков и включены ли они."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Список языков, используемый для проверки орфографии."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 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."
@@ -12998,271 +13311,271 @@ msgstr ""
 "Список ярлыков, известных почтовому компоненту Evolution. Список содержит "
 "строки имя:цвет, где цвет использует кодировку цвета HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Список типов mime для подбора программы просмотра через bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Список имен протоколов, чьи лицензии были приняты."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Загружать сообщения для HTML-сообщений по http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Загружать изображения для HTML-сообщений по http(s). Возможные значения: 0 — "
-"никогда не загружать изображения из сети; 1 — загружать изображения, если "
-"отправитель есть в адресной книге; 2 — всегда загружать изображения из сети."
+"Загружать изображения для HTML-сообщений по http(s). Возможные значения: «0»"
+" — никогда не загружать изображения из сети; «1» — загружать изображения, если "
+"отправитель есть в адресной книге; «2» — всегда загружать изображения из сети."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Регистрировать действия фильтра"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Регистрировать действия фильтра в указанном файле журнала."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Файл журнала действий фильтра"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Файл журнала действий фильтра."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Помечать как просмотренные через указанное время"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Помечать сообщение как просмотренное через указанный период времени."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Помечать цитирование в сообщении в панели предварительного просмотра"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Помечать цитирование в сообщении в панели предварительного просмотра."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Высота окна сообщения по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Ширина окна сообщения по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Тип отображения сообщения («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Минимальное количество дней между очисткой спама при выходе"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Минимальное количество дней между очисткой корзины при выходе"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Минимальное время между очисткой спама при выходе, в днях."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Минимальное время между очисткой корзины при выходе, в днях."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Количество адресов, отображаемых в TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Предупреждать, если тема пустая"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Предупреждать, если пользователь пытается очистить удалённые сообщения в "
 "папке."
 
-#: ../mail/evolution-mail.schemas.in.h:99
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Предупреждать, если пользователь пытается отправить сообщение с пустым полем "
 "Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Предупреждать о немедленном выходе в автономный режим"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Предупреждать при удалении сообщений в папке поиска"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Предупреждать при очистке пользователем"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Предупреждать, если пользователь заполнил только поле Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Выводить запрос при попытке пользователя открыть 10 или более сообщений "
 "одновременно"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 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.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 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.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-"Предупреждать, когда пользователь пытается отправить нежелательный HTML"
+msgstr "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Предупреждать при пометке нескольких сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Распознавать эмоции в тексте и заменять их значками."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Распознавать ссылки в тексте и заменять их."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Проверять на спам входящую почту."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Сохранить каталог"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Искать фотографии отправителя в локальных адресных книгах"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Отправлять почту в формате HTML по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Отправлять почту в формате HTML по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Показывать адрес отправителя в столбце списка сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Интервал синхронизации с сервером"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Показывать анимацию"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Показывать анимированные изображения как анимации."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Показывать удалённые сообщения (как перечеркнутые) в списке сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Показывать удалённые сообщения в списке сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Показать фотографию отправителя"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Показывать адрес отправителя в отдельном столбце списка сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Показывать фотографию отправителя в панели чтения сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Проверять орфографию при вводе"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Цвет проверки орфографии"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Языки проверки орфографии"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Высота диалога подписки по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Ширина окна диалога подписки по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Шрифт терминала"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Ограничение размера текстового вложения"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Модуль, обрабатывающий спам по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Время последней очистки спама, в днях с начала эпохи."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Время последней очистки корзины, в днях с начала эпохи."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Шрифт терминала для отображения почты."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Пропорциональный шрифт для основного дисплея."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
 "У этого ключа может быть одно из трёх значений: 0 — ошибки, 1 — "
 "предупреждения; 2 — отладочные сообщения."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13271,7 +13584,7 @@ msgstr ""
 "отформатировано в программе Evolution. Размер по умолчанию 4MB / 4096 KB и "
 "указывается в КБ."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13281,16 +13594,16 @@ msgstr ""
 "обработки спама включены одновременно. Если модуль по умолчанию выключен, "
 "доступные модули обработки спама всё равно не будут использоваться."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 "Этот ключ читается только один раз и сбрасывается в ложь после чтения. С "
 "помощью него можно отменить выделение почты и отключить панель просмотра "
 "текущего каталога."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 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;"
@@ -13302,7 +13615,7 @@ msgstr ""
 "enabled&gt; - установить включенным, если заголовок должен отображаться в "
 "окне просмотра почты."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
@@ -13312,11 +13625,11 @@ msgstr ""
 "использовать ли только локальные адресные книги при исключении известных "
 "контактов при фильтрации спама."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Этот параметр должен увеличить скорость загрузки."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13324,7 +13637,7 @@ msgstr ""
 "Устанавливает количество адресов, отображаемых при просмотре сообщения, за "
 "которыми отображается «...»."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13333,7 +13646,7 @@ msgstr ""
 "свёрнутой. Чтобы изменение этого ключа вступило в силу, надо перезапустить "
 "Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13343,32 +13656,18 @@ msgstr ""
 "сообщению в каждой подшивке, а не по дате сообщения. Чтобы изменение этого "
 "ключа вступило в силу, надо перезапустить Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Подшивать список сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Подшивать список сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Подшивать список сообщений по полю «Тема»"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-"Временной интервал в секундах, содержащий частоту сохранения изменений на "
-"сервере."
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-"Временной интервал в секундах, содержащий частоту сохранения изменений на "
-"сервере. Значение не может быть меньше 30 секунд."
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Задержка перед помечанием сообщения как просмотренное"
@@ -13563,7 +13862,13 @@ msgstr "список рассылки %s"
 msgid "Add Filter Rule"
 msgstr "Добавить правило фильтра"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Шаблоны"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13571,7 +13876,7 @@ msgstr[0] "выделено %d, "
 msgstr[1] "выделено %d, "
 msgstr[2] "выделено %d, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13579,7 +13884,7 @@ msgstr[0] "%d удаленное"
 msgstr[1] "%d удаленных"
 msgstr[2] "%d удаленных"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13587,7 +13892,7 @@ msgstr[0] "%d спам"
 msgstr[1] "%d спам"
 msgstr[2] "%d спам"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13595,7 +13900,7 @@ msgstr[0] "%d черновиков"
 msgstr[1] "%d черновика"
 msgstr[2] "%d черновиков"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13603,7 +13908,7 @@ msgstr[0] "%d отправленное"
 msgstr[1] "%d отправленных"
 msgstr[2] "%d отправленных"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13611,7 +13916,7 @@ msgstr[0] "%d неотправленное"
 msgstr[1] "%d неотправленных"
 msgstr[2] "%d неотправленных"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13619,7 +13924,7 @@ msgstr[0] "%d непрочитанное"
 msgstr[1] "%d непрочитанных"
 msgstr[2] "%d непрочитанных"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13627,86 +13932,78 @@ msgstr[0] "%d всего"
 msgstr[1] "%d всего"
 msgstr[2] "%d всего"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "Новое почтовое сообщение"
 
-#: ../mail/mail-component.c:914
-msgid "_Mail Message"
-msgstr "_Почтовое сообщение"
-
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Создать новое сообщение"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "Новая почтовая папка"
 
-#: ../mail/mail-component.c:922
-msgid "Mail _Folder"
-msgstr "По_чтовая папка"
-
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Создать новую почтовую папку"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Ошибка обновления параметров почты или папок."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Ошибки"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Предупреждения и ошибки"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Отладка"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Ошибки, предупреждения и отладочные сообщения"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Журналы отладки"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Показывать о_шибки в строке состояния для"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1745
 msgid "second(s)."
 msgstr "секунд."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Сообщения журнала:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "Уровень журналирования"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Время"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2386
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Сообщения"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Закрыть это окно"
@@ -13959,15 +14256,14 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Подписывать исходящие сообщения (по умолчанию)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 "Не форматировать текстовое содержимое в сообщениях, если размер текста "
 "превышает"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
-msgstr ""
-"Не поме_чать сообщения как спам, если отправитель есть в моей адресной книге"
+msgstr "Не поме_чать сообщения как спам, если отправитель есть в моей адресной книге"
 
 #: ../mail/mail-config.glade.h:73
 msgid "Do not quote"
@@ -14086,8 +14382,7 @@ msgid "No _Proxy for:"
 msgstr "Не использовать _прокси для:"
 
 #: ../mail/mail-config.glade.h:107
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Примечание: Символ подчёркивания в надписи используется как обозначение "
 "мнемоники в меню."
@@ -14101,18 +14396,24 @@ msgstr ""
 "серверу"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Этот параметр будет игнорироваться, в случае совпадения с "
+"указанных пользователем заголовков для выявления спама."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "О_рганизация:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "Идентификатор ключа PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Пароль:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14120,7 +14421,7 @@ msgstr ""
 "Введите имя, описывающее эту учётную запись.\n"
 "Это имя будет использоваться только на экране."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14128,7 +14429,7 @@ msgstr ""
 "Введите информацию о способе отправки электронной почты. Если вы не уверены, "
 "свяжитесь со своим системным администратором или поставщиком услуг Интернета."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 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 "
@@ -14138,117 +14439,117 @@ msgstr ""
 "обязательны для заполнения, если только вы не хотите включать эти сведения в "
 "отправляемую вами почту."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Выберите один из следующих вариантов"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "_Порт:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Пр_едупреждать при отправке сообщений, в которых определены только "
 "получатели скрытой копии."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Процитировано"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "За_помнить пароль"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "_Обратный адрес:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Запомнить _пароль"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "Узел S_OCKS:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "И_скать фотографию отправителя в локальных адресных книгах"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "В_ыбрать..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "О_тправлять отчёты:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "С_тандартный шрифт:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Выбрать шрифт HTML фиксированной ширины"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Выбрать шрифт HTML фиксированной ширины для печати"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Выбрать шрифт HTML переменной ширины"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Выбрать шрифт HTML переменной ширины для печати"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Отправка почты"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Папка _отправленных сообщений:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Т_ребуется проверка подлинности"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Тип сервера: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Се_ртификат подписи:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Подп_ись:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Подписи"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Таблица подписей"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Проверка орфографии"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr "При ответе начинать _ввод после цитаты"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Тип: "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14256,7 +14557,7 @@ msgstr ""
 "Этот список языков перечисляет только те языки, для которых у вас "
 "установлены словари."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14266,13 +14567,6 @@ msgstr ""
 "в качестве вашей подписи. Имя, указанное вами,\n"
 "будет использоваться только для отображения. "
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Этот параметр будет переопределён, если будет найдено совпадение для "
-"указанных пользователем заголовков для выявления спама."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14290,7 +14584,7 @@ msgid "Use Authe_ntication"
 msgstr "Использовать аутентифик_ацию"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "_Имя пользователя:"
 
@@ -14366,12 +14660,11 @@ msgstr "_Никогда не загружать изображения из Ин
 
 #: ../mail/mail-config.glade.h:177
 msgid "_Path:"
-msgstr "Путь:"
+msgstr "_Путь:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr ""
-"П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
 #: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
@@ -14466,43 +14759,43 @@ msgstr "Учитывать _регистр"
 msgid "Co_mpleted"
 msgstr "_Завершено"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Найти:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Поиск в сообщении"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Пометить к исполнению"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Подписка на папки"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Лицензионное соглашение"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ничего не выбрано"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "С_ервер:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Сведения о безопасности"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Указанные папки"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14510,19 +14803,19 @@ msgstr ""
 "Сообщения, помеченные вами к исполнению, перечислены ниже.\n"
 "Выберите действие из меню «Отметка»."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Принять лицензию"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Срок до:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Отметка:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Установите, чтобы принять лицензионное соглашение"
 
@@ -14667,10 +14960,10 @@ msgstr[2] "Получение %d сообщений"
 #: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Подписывается %d сообщение"
-msgstr[1] "Подписывается %d сообщения"
-msgstr[2] "Подписывается %d сообщений"
+msgid_plural "Saving %d messages"
+msgstr[0] "Сохранение %d сообщения"
+msgstr[1] "Сохранение %d сообщений"
+msgstr[2] "Сохранение %d сообщений"
 
 #: ../mail/mail-ops.c:2056
 #, c-format
@@ -14770,11 +15063,6 @@ msgstr "Операция отменена пользователем."
 msgid "_Save and Close"
 msgstr "Со_хранить и закрыть"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Файл"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Редактировать подписи"
@@ -14822,11 +15110,11 @@ msgstr "Обновление папок поиска для '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Обновление папок писка для «%s»"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Изменить папку поиска"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Новая папка поиска"
 
@@ -14854,9 +15142,7 @@ msgstr ""
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr ""
-"Было запрошено уведомление о прочтении для «{1}». Отправить уведомление к "
-"{0}?"
+msgstr "Было запрошено уведомление о прочтении для «{1}». Отправить уведомление к {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -14881,8 +15167,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Вы действительно хотите удалить эту учётную запись?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Вы действительно хотите удалить эту учётную запись и все её прокси?"
 
 #: ../mail/mail.error.xml.h:12
@@ -14911,8 +15196,7 @@ msgstr "Вы действительно хотите отправить сооб
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Вы действительно хотите отправить сообщение получателям только слепой копии?"
+msgstr "Вы действительно хотите отправить сообщение получателям только слепой копии?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -14960,8 +15244,7 @@ msgstr "Не удалось удалить системную папку «{0}»
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr ""
-"Не удалось изменить папку поиска «{0}», потому что такая папка не существует."
+msgstr "Не удалось изменить папку поиска «{0}», потому что такая папка не существует."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
@@ -15127,8 +15410,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"Если вы продолжите, сведения о учётной записи будут безвозвратно удалены."
+msgstr "Если вы продолжите, сведения о учётной записи будут безвозвратно удалены."
 
 #: ../mail/mail.error.xml.h:67
 msgid ""
@@ -15186,8 +15468,7 @@ msgstr "Проверьте параметры вашей учётной запи
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
-msgstr ""
-"Включите учётную запись или используйте для отправки другую учётную запись."
+msgstr "Включите учётную запись или используйте для отправки другую учётную запись."
 
 #: ../mail/mail.error.xml.h:80
 msgid ""
@@ -15339,10 +15620,8 @@ msgstr ""
 "отключена"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr ""
-"Сообщение не может быть отправлено, потому что не указан ни один получатель"
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "Сообщение не может быть отправлено, потому что не указан ни один получатель"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
@@ -15453,78 +15732,79 @@ msgstr "Уни_чтожить удалённые"
 msgid "_Open Messages"
 msgstr "_Открыть сообщения"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Прочитано"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Отвечено"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Переслано"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Низкий"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Высокий"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3831
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
-#: ../mail/message-list.c:4106
+#: ../mail/message-list.c:4176
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15532,7 +15812,7 @@ msgstr ""
 "Нет писем, удовлетворяющих критериям поиска. Очистите поле поиска с помощью "
 "меню Поиск → Очистить или измените критерии."
 
-#: ../mail/message-list.c:4108
+#: ../mail/message-list.c:4178
 msgid "There are no messages in this folder."
 msgstr "В папке нет сообщений."
 
@@ -15650,6 +15930,7 @@ msgstr ""
 "теле письма."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Ключевые слова"
 
@@ -15736,84 +16017,107 @@ msgstr "Выберите архив Evolution для восстановлени�
 msgid "Choose a file to restore"
 msgstr "Выберите файл для восстановления"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Сохранить каталог Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Восстановить каталог Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Проверить архив Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Перезапустить Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "С графическим интерфейсом"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Останавливается Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Сохранение и восстановление данных и параметров Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Сохранение данных Evolution (писем, контактов, календарей, задач, заметок)"
+msgstr "Сохранение данных Evolution (писем, контактов, календарей, задач, заметок)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Архив создан"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Перезапуск Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Сохранение текущих данных Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Восстановление из архива"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Загрузка настроек Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Удаление временных файлов архивации"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "Проверка локальных источников"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Архивация данных в каталог %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Восстановление из каталога %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Архив Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Восстановление Evolution"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "Резервное копирование данных Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Подождите, пока Evolution выполняет резервное копирование ваших данных."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Восстановление данных Evolution"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Подождите, пока Evolution восстанавливает ваши данные."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "Это может занять некоторое время, в завимости от объема данных вашей учетной записи."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "Модуль для сохранения и восстановление данных и параметров Evolution."
@@ -15828,10 +16132,8 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Вы действительно хотите закрыть Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Вы действительно хотите восстановить Evolution из выбранного файла архива?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Вы действительно хотите восстановить Evolution из выбранного файла архива?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -15857,8 +16159,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Выберите архив Evolution для восстановления"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "Недостаточно прав доступа для создания файла в выделенном каталоге."
+msgid "The selected folder is not writable."
+msgstr "Выделенная папка недоступна для записи."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -15893,10 +16195,8 @@ msgstr "Автоматические контакты"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr ""
-"_Автоматически создавать записи в адресной книге при ответе на сообщения"
+msgid "_Auto-create addressbook entries when replying to messages"
+msgstr "_Автоматически создавать записи в адресной книге при ответе на сообщения"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15908,11 +16208,9 @@ msgstr "Контакты мгновенных сообщений"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Периодически синхронизирует контактную информацию и изображения из списка "
+"Синхронизирует контактную информацию и изображения из списка "
 "контактов Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
@@ -15997,7 +16295,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "Использовать _SSL"
 
@@ -16019,7 +16317,7 @@ msgstr "Предоставляет базовую функциональност
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:381
 msgid "Re_fresh:"
 msgstr "Обнов_ить"
 
@@ -16109,16 +16407,14 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Проверять, является ли Evolution почтовой программой по умолчанию"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Проверять при каждом запуске, является ли Evolution почтовой программой по "
 "умолчанию."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Проверяет при запуске, является ли Evolution почтовым клиентом по умолчанию."
+msgstr "Проверяет при запуске, является ли Evolution почтовым клиентом по умолчанию."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -16161,10 +16457,28 @@ msgstr ""
 "Предоставляет функциональность для установки календаря или адресной книги "
 "как используемых по умолчанию."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
 msgstr "_Дополнительные заголовки"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Ключ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Значения"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"Формат определения дополнительного заголовка:\n"
+"Имена значений ключа дополнительных заголовков разделяются знаком «;»."
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "Дополнительные заголовки сообщений"
@@ -16179,7 +16493,7 @@ msgid "Custom Header"
 msgstr "Дополнительные заголовки"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "Список дополнительных заголовков"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16295,29 +16609,33 @@ msgstr "Размер папок"
 msgid "Exchange Settings"
 msgstr "Параметры Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:623
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:649
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "А_утентификация"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Почтовый ящик:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Тип _аутентификации"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:866
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Пров_ерить поддерживаемые типы"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:978
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16539,7 +16857,7 @@ msgstr "Размер папки"
 msgid "User"
 msgstr "Пользователь"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Подписка на папку другого пользователя"
@@ -16804,8 +17122,8 @@ msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
 msgstr ""
-"Изменения настройки учётной записи Exchange «{0}» вступят в силу только "
-"после перезапуска Evolution."
+"Изменения настройки учётной записи Exchange «{0}» вступят в силу только после "
+"перезапуска Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not authenticate to server."
@@ -16871,10 +17189,14 @@ msgid "Could not update out-of-office state"
 msgstr "Не удалось обновить состояние «не на работе»"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "Для загрузки подписанного почтового ящика пользователя требуется перезапуск Evolution"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Учётная запись Exchange отключена."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16902,32 +17224,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Ошибка обновления представителей:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Папка уже существует"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Папка не существует"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Папка отключена"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Общая ошибка"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Сервер глобального каталога недоступен"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16935,73 +17257,73 @@ msgstr ""
 "Если OWA выполняется по другому пути, вы должны указать это в диалоге "
 "настройки учётной записи."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "Почтовый ящик для {0} находится не на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Убедитесь, что URL верен, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Убедитесь, что имя сервера введено корректно, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "Убедитесь, что имя пользователя и пароль верны, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Для этой учётной записи не настроен сервер Глобального каталога."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Нет почтовых ящиков для пользователя {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Нет такого пользователя {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Пароль успешно изменен."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Введите идентификатор представителя или уберите параметр отсылки сообщения "
 "как сообщения представителя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Убедитесь, что имя сервера глобального каталога корректно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Перезапустите Evolution, чтобы изменения вступили в силу"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Выберите пользователя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Сервер отверг пароль, потому что он слишком уязвим."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Учётная запись Exchange запрещена, когда вы выйдете из Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Учётная запись Exchange будет удалена, когда вы выйдете из Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Сервер Exchange несовместим с Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17009,7 +17331,7 @@ msgstr ""
 "На этом сервере работает Exchange 5.5. Exchange Connector\n"
 " поддерживает только Microsoft Exchange 2000 и 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17022,57 +17344,57 @@ msgstr ""
 "\n"
 "Или же вы просто неправильно ввели пароль."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Попробуйте еще раз с другим паролем."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Не удалось добавить пользователя в список управления доступом:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Не удалось изменить представителей."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Неизвестная ошибка при поиске {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Неизвестный тип"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Неподдерживаемое действие"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Вы почти достигли квоты сохранения сообщений на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Вам разрешено посылать сообщение только от имени одного пользователя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Вы не можете сделать себя своим представителем"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Вы превысили квоту для сохранения сообщений на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Вы можете настроить только одну учётную запись Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17080,7 +17402,7 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Попробуйте очистить место, удалив некоторое "
 "количество сообщений."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -17088,7 +17410,7 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Вы не сможете ни отправлять, ни получать "
 "сообщения."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17096,19 +17418,19 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Вы не сможете отправлять сообщения, пока не "
 "очистите место путем удаления некоторого количества сообщений."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Срок действия вашего пароля истёк."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} не может быть добавлен в список управления доступом"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} уже является представителем"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} уже в списке"
 
@@ -17166,8 +17488,8 @@ msgstr ""
 "задать другой редактор."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Составлять сообщения во внешнем редакторе"
+msgid "Compose in _External Editor"
+msgstr "Составлять сообщения _во внешнем редакторе"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
@@ -17219,8 +17541,7 @@ msgstr "Отмена подписки на папку «%s»"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
-"Позволяет отменять подписку на почтовые папки в контекстном меню папки."
+msgstr "Позволяет отменять подписку на почтовые папки в контекстном меню папки."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17228,16 +17549,33 @@ msgstr "Отписка от папок"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
-msgstr "Отказаться от подписки"
+msgstr "_Отказаться от подписки"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+msgid "<b>Server</b>"
+msgstr "<b>Сервер</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+msgid "Update every"
+msgstr "Обновлять каждые"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Модуль для настройки календаря google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Модуль для настройки календаря и контактов google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17323,10 +17661,20 @@ msgid "_Junk List"
 msgstr "_Список спама"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Отзыв сообщения"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr "Отзыв сообщения может повлечь за собой его удаление из почтового ящика получателя. Вы действительно хотите отозвать сообщение?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Сообщение было успешно отозвано"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Отозвать сообщение"
 
@@ -17334,12 +17682,6 @@ msgstr "Отозвать сообщение"
 msgid "Add Send Options to groupwise messages"
 msgstr "Добавить Параметры Отправки к сообщениям groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Параметры отправки"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Модуль для поддержки функций учётных записей Groupwise."
@@ -17389,10 +17731,10 @@ msgstr "Учётная запись уже существует"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
-"Регистрация в прокси под «{0}» не удалась. Проверьте идентификатор "
+"Регистрация в прокси под именем «{0}» не удалась. Проверьте идентификатор "
 "электронной почты и попробуйте ещё раз."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
@@ -17400,15 +17742,18 @@ msgid "This is a recurring meeting"
 msgstr "Это повторяющаяся встреча"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "Что вы хотели бы для {0}?"
+msgid "Would you like to accept it?"
+msgstr "Принять?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr ""
-"Вы не можете использовать эту папку совместно с указанным пользователем «{0}»"
+msgid "Would you like to decline it?"
+msgstr "Отклонить?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Вы не можете использовать эту папку совместно с указанным пользователем «{0}»"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Вы должны указать имя пользователя, которого хотите добавить в список"
 
@@ -17843,8 +18188,7 @@ msgstr "Невозможно отправить уведомление об от
 
 #: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Статус участника не может быть обновлён из-за неверного текущего статуса"
+msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
@@ -17921,31 +18265,31 @@ msgstr ""
 "Чтобы обработать все эти элементы, файл должен быть сохранен и календарь "
 "должен быть импортирован"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Эта встреча повторяется"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Эта задача повторяется"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Эта заметка повторяется"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Удалить сообщение после действия"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Поиск конфликтов"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Выберите календари для поиска конфликтующих собраний"
 
@@ -18146,13 +18490,11 @@ msgstr "<b>%s</b> желает добавить к существующему с
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
-msgstr ""
-"<b>%s</b> через %s желает получить последнюю информацию о следующем собрании:"
+msgstr "<b>%s</b> через %s желает получить последнюю информацию о следующем собрании:"
 
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> желает получить последнюю информацию о следующем собрании:"
 
 #: ../plugins/itip-formatter/itip-view.c:387
@@ -18250,8 +18592,7 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> через %s вернул следующий ответ на назначенную задачу:"
 
 #: ../plugins/itip-formatter/itip-view.c:477
@@ -18271,8 +18612,7 @@ msgstr "<b>%s</b> отменил следующую назначенную за�
 
 #: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> через %s предложил следующие изменения назначения задачи:"
 
 #: ../plugins/itip-formatter/itip-view.c:489
@@ -18375,42 +18715,42 @@ msgid "_Update"
 msgstr "_Обновить"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Время начала:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Время завершения:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "Ответить отп_равителю"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Отправить о_бновления к участникам"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "П_рименить ко всем записям"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Показать время как _свободное"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Задачи :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Заметки :"
 
@@ -18433,8 +18773,7 @@ msgid "This meeting has been delegated"
 msgstr "Это собрание было поручено"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Этот ответ пришел не от текущего участника. Добавить отправителя как "
 "участника?"
@@ -18473,7 +18812,8 @@ msgstr "Генерирует сообщение D-BUS при приходе но
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
 "Если этот ключ установлен, то подавать гудок, иначе проигрывать звуковой "
 "файл при поступлении новых сообщений."
@@ -18492,8 +18832,7 @@ msgstr "Всплывающие сообщения вместе со значко
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Извещает пользователя о появлении новой почты значком в области уведомлений."
+msgstr "Извещает пользователя о появлении новой почты значком в области уведомлений."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -18513,8 +18852,7 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Надо ли показывать сообщение над значком при поступлении новых сообщений."
+msgstr "Надо ли показывать сообщение над значком при поступлении новых сообщений."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether the icon should blink or not."
@@ -18524,12 +18862,20 @@ msgstr "Должен ли значёк мигать или нет."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Надо ли оповещать о новых сообщениях только в папке Входящие."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Генерировать сообщение D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "Уведомление о новой почте Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "Свойства уведомления о новой почте"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18547,7 +18893,7 @@ msgstr[2] ""
 "Вы получили %d новых сообщений\n"
 "в %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18555,48 +18901,48 @@ msgstr[0] "Вы получили %d новое сообщение."
 msgstr[1] "Вы получили %d новых сообщения."
 msgstr[2] "Вы получили %d новых сообщений."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Новое письмо"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "Пока_зывать значок в области уведомлений"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "Мер_цать значком в области уведомлений"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "Показ_ывать всплывающее сообщение вместе со значком"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "_Воспроизводить звук при приходе новой почты"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "По_давать гудок"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "Про_игрывать звуковой файл"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "Имя _файла:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "Выбрать звуковой файл"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "Вос_произвести"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "Опове_щать о новых сообщениях только во «Входящих»"
 
@@ -18645,8 +18991,7 @@ msgstr ""
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr ""
-"Модуль, который позволяет создание задач из содержимого почтового сообщения."
+msgstr "Модуль, который позволяет создание задач из содержимого почтового сообщения."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -18683,8 +19028,7 @@ msgid "Mailing _List"
 msgstr "Список _рассылки"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Предоставляет действия для основных команд списков рассылки (подписка, "
 "отписка, ...)."
@@ -18769,8 +19113,7 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
-"Заголовок сообщения не содержит информации, необходимой для этого действия."
+msgstr "Заголовок сообщения не содержит информации, необходимой для этого действия."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -18786,8 +19129,7 @@ msgstr "Связаться с _владельцем списка"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Связаться с владельцем списка рассылки, которому принадлежит это сообщение"
+msgstr "Связаться с владельцем списка рассылки, которому принадлежит это сообщение"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
@@ -18809,8 +19151,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
-"Опубликовать сообщение в списке рассылки, которому принадлежит это сообщение"
+msgstr "Опубликовать сообщение в списке рассылки, которому принадлежит это сообщение"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
@@ -18894,7 +19235,7 @@ msgstr "Модуль для управления другими модулями
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Мeнеджер модулей"
 
@@ -18910,29 +19251,20 @@ msgstr "_Модули"
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Описание"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Настройка"
 
-#: ../plugins/plugin-manager/plugin-manager.c:223
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Примечание: Некоторые изменения не вступят в силу до перезапуска"
 
-#: ../plugins/plugin-manager/plugin-manager.c:245
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Обзор"
 
-#: ../plugins/plugin-manager/plugin-manager.c:246
-msgid "Configuration"
-msgstr "Настройка"
-
-#: ../plugins/plugin-manager/plugin-manager.c:262
-msgid "There is no configuration option for this plugin."
-msgstr "Этот модуль не имеет настраиваемых параметров."
-
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/plugin-manager/plugin-manager.c:385
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Модуль"
 
@@ -19085,6 +19417,30 @@ msgstr ""
 "iCal\n"
 "Cвободен/занят"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Тесты загрузчика модулей Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Тестовый модуль Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Тестовый модуль для загрузчика Python EPlugin."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Модуль, который загружает другие модули, написанные на питоне."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Загрузчик Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (встроенный)"
@@ -19176,7 +19532,6 @@ msgid "MIME Type"
 msgstr "Тип MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Сохранить"
 
@@ -19310,12 +19665,12 @@ msgid "Show _only this Task List"
 msgstr "_Отображать только этот список задач"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that manages the Startup wizard."
-msgstr "Модуль помощника для первоначальной настройки."
+msgid "Guides you through your initial account setup."
+msgstr "Помогает вам выполнить начальную настройку."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Запуск помощника"
+msgid "Setup Assistant"
+msgstr "Помощник по установке"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -19382,6 +19737,28 @@ msgstr "Подшивать сообщения по полю «Тема»"
 msgid "F_all back to threading messages by subject"
 msgstr "Вернуться к подшивке сообщений по _теме"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "Список пар ключевое слово/значение модуля шаблонов для замены в теле сообщения."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Нет заголовка"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Сохранить как _шаблон"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Сохранить как шаблон"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Модуль шаблонов на основе черновиков"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Простой модуль, использующий ytnef для расшифровки вложений."
@@ -19407,120 +19784,114 @@ msgid "Evolution Test component"
 msgstr "Evolution Test component"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Строковое описание текущих параметров принтера."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr "Авторизоваться при соединении с прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
 msgstr "URL автоматической настройки прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Версия конфигурации"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "Определяет, должно ли запускаться обнаружение сбоя."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Ширина боковой панели по умолчанию"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Высота окна по умолчанию"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Состояние окна по умолчанию"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Ширина окна по умолчанию"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"Включает настройки прокси для доступа к Интернет по протоколу HTTP/HTTPS."
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Включает настройки прокси для доступа к Интернет по протоколу HTTP/HTTPS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
 msgstr "Узел HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy password"
 msgstr "Пароль прокси HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
 msgstr "Порт прокси HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
 msgstr "Имя пользователя прокси HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "Идентификатор или псевдоним компонента, который будет показываться при "
 "запуске по умолчанию."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 "Если true, то соединение с прокси-сервером требует проверки подлинности. Имя "
-"пользователя / пароль определяются при помощи «/apps/evolution/shell/"
+"пользователя / пароль определяются при помощи ключа GConf «/apps/evolution/shell/"
 "network_config/authentication_user» и локально сохраненного пароля  в ."
 "gnome2_private/."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Версия последней обновленной конфигурации"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Список путей для папок, которые будут синхронизироваться на диск для "
 "автономной работы"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
 msgstr "Узлы для доступа без прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Пароль для авторизации на прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Proxy configuration mode"
 msgstr "Режим настройки прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
 msgstr "Имя узла прокси SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
 msgstr "Порт прокси SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
 msgstr "Имя узла прокси HTTPS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
 msgstr "Порт прокси HTTPS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19532,27 +19903,27 @@ msgstr ""
 "«использовать заданные настройки» и «использовать ресурс для автоматической "
 "конфигурации»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Боковая панель видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Пропускать диалог предупреждения о тестовой версии"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Пропускать диалог предупреждения о восстановлении"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Запуск в автономном режиме"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Панель состояния видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19560,19 +19931,19 @@ msgstr ""
 "Версия конфигурации Evolution, с уровнями major/minor/configuration "
 "(например, «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Высота основного окна по умолчанию, в пикселах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Ширина основного окна по умолчанию, в пикселах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Ширина боковой панели по умолчанию, в пикселах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19580,19 +19951,19 @@ msgstr ""
 "Версия последней обновленной версии Evolution, с уровнями major/minor/"
 "configuration (например, «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
 msgstr "Имя узла прокси протокола HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Имя узла прокси протокола HTTPS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
 msgstr "Имя узла прокси протокола SOCKS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19600,7 +19971,7 @@ msgstr ""
 "Порт на прокси узле, определённом ключом «/apps/evolution/shell/"
 "network_config/http_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19608,7 +19979,7 @@ msgstr ""
 "Порт на прокси узле, определённом ключом «/apps/evolution/shell/"
 "network_config/secure_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19616,17 +19987,17 @@ msgstr ""
 "Порт на прокси узле, определённом ключом «/apps/evolution/shell/"
 "network_config/socks_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"Стиль кнопок окон. Возможные варианты: «text», «icons», «both», «toolbar». "
-"Если установлено значение «toolbar», стиль кнопок соответствует системным "
+"Стиль кнопок окон. Возможные варианты: «text», «icons», «both», «toolbar». Если "
+"установлено значение «toolbar», стиль кнопок соответствует системным "
 "параметрам среды GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19638,69 +20009,67 @@ msgstr ""
 "могут исользовать шаблоны как *.foo.com, адресами IP (и IPv4 и IPv6) и "
 "адресами сетей с маской (например, 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Панель инструментов видимая"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "URL that provides proxy configuration values."
 msgstr "URL для получения параметров настройки прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
 msgstr "Использовать прокси HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Имя пользователя для прохождения проверки подлинности при подключении к "
 "прокси HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
+msgstr "Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "Надо ли проводить обнаружение сбоя"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Должны ли окно быть максимизированным."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Должна ли боковая панель быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Должна ли панель состояния быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Должна ли панель инструментов быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Если этот ключ установлен, диалог предупреждения в тестовых версиях "
 "Evolution не отображается."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "Надо ли пропускать диалог предупреждения при восстановлении Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Должны ли быть видимыми кнопки окон."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Стиль кнопок окон"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Кнопки окон видимы"
 
@@ -19775,29 +20144,9 @@ msgstr "Импорт _одного файла"
 msgid "Evolution Preferences"
 msgstr "Параметры Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Не указано имя папки."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Имя папки не может содержать символ возврата каретки."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Имя папки не может содержать символ \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Имя папки не может содержать символ \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "\".\" и \"..\" -- зарезервированные имена папок."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19822,7 +20171,7 @@ msgstr "Не удалось запустить Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Valek Filippov <frob@df.ru>\n"
@@ -19830,43 +20179,48 @@ msgstr ""
 "Leonid Kanter <leon@asplinux.ru>\n"
 "Michael Yakhontov <mvy@asplinux.ru>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Веб-сайт Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Произошла ошибка при открытии веб-страницы вопросов."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Перейти в сетевой режим"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ав_тономная работа"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для перехода "
+"Evolution сейчас подключен к сети.\n"
+"Нажмите на эту кнопку для перехода\n"
 "в автономный режим."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution находится в процессе перехода в автономный режим работы."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"Evolution сейчас работает в автономном режиме. Нажмите на эту кнопку для "
-"перехода в режим работы в сети."
+"Evolution сейчас работает в автономном режиме.\n"
+"Нажмите на эту кнопку для подключения к сети."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Переключиться в %s"
@@ -19896,9 +20250,9 @@ msgstr "Не удалось зарегистрировать в OAF"
 msgid "Configuration Database not found"
 msgstr "База данных настроек не найдена"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Создать"
 
@@ -19906,10 +20260,6 @@ msgstr "Создать"
 msgid "New Test"
 msgstr "Новый тест"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "_Тест"
-
 #: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "Создать новый тестовый элемент"
@@ -20484,16 +20834,14 @@ 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:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "У вас в файле имеются сертификаты, которые идентифицируют следующих "
 "поставщиков:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
-"У вас в файле имеются сертификаты, которые идентифицируют следующих лиц:"
+msgstr "У вас в файле имеются сертификаты, которые идентифицируют следующих лиц:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -20819,7 +21167,7 @@ msgstr "Сохранить контакты из выделенной папки
 msgid "Select All"
 msgstr "Выделить все"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "В_ыделить все"
 
@@ -20888,7 +21236,7 @@ msgstr "_Переместить контакт в..."
 msgid "_Move Folder Contacts To"
 msgstr "Пере_местить папку контактов в"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Создать"
 
@@ -21026,192 +21374,6 @@ msgstr "Рабочая неделя"
 msgid "_Open Appointment"
 msgstr "_Открыть встречу"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Нажмите, чтобы вложить файл"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Нажмите, чтобы закрыть текущее окно"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Нажмите, чтобы сохранить текущее окно"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Нажмите, чтобы просмотреть справку"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Закрыть"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Копировать выделенный текст в буфер обмена"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Вырезать выделенный текст в буфер обмена"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "_Вставить"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Вставить текст из буфера обмена"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Выделить весь текст"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Справка"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Параметры"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Событие на весь день"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Событие на весь _день"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Классифицировать как Конфиденциальное"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Классифицировать как личное"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Классифицировать как публичное"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Нажмите, чтобы установить или сбросить сигналы для этого события"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Вставить дополнительные параметры оправки"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Сделать это событие повторяющимся"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Пу_бличное"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Запросить информацию о занятости для участников"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Поле «_Должность»"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Параметры отпра_вки"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Показать время как _занят"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Часовой _пояс"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Переключает отображение поля «Кому»"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Переключает отображение поля «Просьба ответить»"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Переключает отображение поля «Должность»"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Переключает отображение поля «Состояние»"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Переключает отображение часового пояса"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Переключает отображение категорий"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Переключает, является ли событие событием на весь день"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Переключить отображение времени как «занят»"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Сигналы"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Категории"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Классификация"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Конфиденциальное"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "Cво_боден/Занят"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Личное"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "П_росьба ответить"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Повторение"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Поле _состояния"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Поле _типа"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Отменить текущую почтовую операцию"
@@ -21376,8 +21538,7 @@ msgid "Hide _Read Messages"
 msgstr "Скрыть п_рочитанные сообщения"
 
 #: ../ui/evolution-mail-list.xml.h:15
-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:16
@@ -21915,6 +22076,10 @@ msgstr "_Масштаб"
 msgid "_Zoom In"
 msgstr "У_величить"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Закрыть"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Главная панель инструментов"
@@ -21951,22 +22116,6 @@ msgstr "Просмотреть выделенные заметки"
 msgid "_Open Memo"
 msgstr "_Открыть заметку"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Нажмите, чтобы изменить или просмотреть детали состояния задачи"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Подробности состояния"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Часовой пояс"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Подробности состояния"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Копировать выделенные задачи"
@@ -22160,50 +22309,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Показать или спрятать строку состояния."
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Работать _автономно"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_О программе"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Закрыть окно"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Забыть пароли"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Часто задаваемые вопросы"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Скрыть кнопки"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Только _значки"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Быстрая справка"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "В_ыход"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Вид _переключателя"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Параметры _синхронизации..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_Только текст"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Окно"
 
@@ -22418,37 +22571,10 @@ msgstr "Тип обзора"
 msgid "Type of view:"
 msgstr "Тип обзора:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u байт"
-msgstr[1] "%u байта"
-msgstr[2] "%u байт"
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f КБ"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f МБ"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f ГБ"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Панель вложений"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-msgid "Recent Docu_ments"
-msgstr "Недавние доку_менты"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22527,16 +22653,16 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Минимальная ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Минимальная ширина"
 
@@ -22803,6 +22929,14 @@ msgstr ""
 "Интерактивная карта для выбора часового пояса при помощи мыши. При помощи "
 "клавиатуры можно выбрать часовой пояс из выпадающего списка ниже."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "В сети"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "Состояние кнопки - «в сети»"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Синхронизировать с:"
@@ -22827,61 +22961,61 @@ msgstr "Reflow model"
 msgid "Column width"
 msgstr "Ширина столбца"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Поиск"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Нажмите, чтобы изменить тип поиска"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "П_оиск"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Найти сейчас"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "О_чистить"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID элемента"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Текст"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "По_казать: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "_Искать: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " в "
 
-#: ../widgets/misc/e-selection-model-array.c:574
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Строка с курсором"
 
-#: ../widgets/misc/e-selection-model-array.c:581
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Столбец с курсором"
@@ -22922,10 +23056,6 @@ msgstr "<b>Отслеживание состояния</b>"
 msgid "A_uto-delete sent item"
 msgstr "А_втоматически удалять отправленные элементы"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Классификация"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Создать отправленный элемент для отслеживания информации"
@@ -23032,14 +23162,14 @@ msgid "_When opened:"
 msgstr "_Когда открыто:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
@@ -23257,81 +23387,81 @@ msgstr[0] "%s (%d элемент)"
 msgstr[1] "%s (%d элемента)"
 msgstr[2] "%s (%d элементов)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Альтернативные цвета строки"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Горизонтальная таблица для рисования"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Вертикальная таблица для рисования"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Фокус рисования"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Режим курсора"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Модель выделения"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Порог длины"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Общая высота строки"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Заморожена"
 
@@ -23407,24 +23537,24 @@ msgstr "Информация по сортировке"
 msgid "Tree"
 msgstr "Дерево"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Заголовок таблицы"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Модель таблицы"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Строка с курсором"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Всегда искать"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Использовать щелчок для добавления"
 
@@ -23543,3 +23673,4 @@ msgstr "Контекст метода ввода (IM)"
 #: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Обрабатывать всплывающие окна"
+
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7c9dbea21e..6ecd53c350 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,76 @@
+2008-08-07  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #467115
+
+	* e-component-registry.h:
+	Replace button and menu icon pixbufs with an icon name string.
+
+	* e-component-registry.c (query_components):
+	No need to create pixbufs, just save the icon name.
+
+	* e-sidebar.c:
+	Remember a default icon name rather than a default pixbuf.
+
+	* e-sidebar.c (e_sidebar_add_button), (e_sidebar_change_button_icon):
+	* e-shell-window.c (e_shell_window_change_component_button_icon):
+	Take an icon name instead of a pixbuf.
+
+	* e-shell-window.c (switch_view):
+	Call gtk_window_set_icon_name() instead of gtk_window_set_icon().
+
+	* e-shell-window.c (setup_widgets):
+	Change XML from pixtype="pixbuf" to pixbuf="filename" and derive
+	an appropriate filename from the icon name.
+
+2008-08-06  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #249844
+
+	* test/evolution-test-component.c: (impl__get_userCreatableItems):
+	Do not let compiler claim.
+
+2008-08-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #249844
+
+	* test/evolution-test-component.c (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro. 
+	Use fully qualified names for "New" submenu entries. 
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #544862
+
+	* apps_evolution_shell.scheams.in:
+	Clarify description of "use_authentication" key.
+
+2008-07-22  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #544022
+
+	* e-shell-window-commands.c: (char *authors[]):
+	Break the escape sequence properly (compiler warning cleanup).
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	** Fixes bug #542828
+
+	* e-shell-window-commands.c:
+	update and fix list of contributors. Patch by Maxim Ermilov.
+
+2008-07-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #542587
+
+	* e-shell-window.c: Use new EOnlineButton widget.
+
+2008-07-19  Tor Lillqvist  <tml@novell.com>
+
+	Bug 543758 - Never mark empty strings for translations
+
+	* main.c (main): Change _("") to explicit gettext ("") to avoid
+	potentially confusing translation tools or translators.
+
 2008-17-14  Paolo Borelli  <pborelli@katamail.com>
 
 	** Fix for bug #542889
diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in
index 8587ecc220..76ac78e8dd 100644
--- a/shell/apps_evolution_shell.schemas.in
+++ b/shell/apps_evolution_shell.schemas.in
@@ -314,7 +314,7 @@
       <type>bool</type>
       <locale name="C">
         <short>Authenticate proxy server connections</short>
-        <long>If true, then connections to the proxy server require authentication. The username/password combo is defined by "/apps/evolution/shell/network_config/authentication_user" and locally stored password in .gnome2_private/.</long>
+        <long>If true, then connections to the proxy server require authentication. The username is retrieved from the "/apps/evolution/shell/network_config/authentication_user" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file.</long>
       </locale>
     </schema>
 
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index ebb4cd9b9c..146ceb26a6 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -54,9 +54,8 @@ component_info_new (const char *id,
 	  	    const char *button_tooltips,
 		    const char *menu_label,
 		    const char *menu_accelerator,
-		    int sort_order,
-		    GdkPixbuf *button_icon,
-		    GdkPixbuf *menu_icon)
+                    const char *icon_name,
+		    int sort_order)
 {
 	EComponentInfo *info = g_new0 (EComponentInfo, 1);
 
@@ -67,16 +66,9 @@ component_info_new (const char *id,
 	info->button_tooltips = g_strdup (button_tooltips);
 	info->menu_label = g_strdup (menu_label);
 	info->menu_accelerator = g_strdup (menu_accelerator);
+        info->icon_name = g_strdup (icon_name);
 	info->sort_order = sort_order;
 
-	info->button_icon = button_icon;
-	if (info->button_icon)
-		g_object_ref (info->button_icon);
-
-	info->menu_icon = menu_icon;
-	if (info->menu_icon)
-		g_object_ref (info->menu_icon);
-
 	return info;
 }
 
@@ -90,12 +82,6 @@ component_info_free (EComponentInfo *info)
 	g_free (info->menu_label);
 	g_free (info->menu_accelerator);
 
-	if (info->button_icon)
-		g_object_unref (info->button_icon);
-
-	if (info->menu_icon)
-		g_object_unref (info->menu_icon);
-
 	if (info->iface != NULL)
 		bonobo_object_release_unref (info->iface, NULL);
 
@@ -183,7 +169,6 @@ query_components (EComponentRegistry *registry)
 		const char *icon_name;
 		const char *sort_order_string;
 		const char *tooltips;
-		GdkPixbuf *icon = NULL, *menuicon = NULL;
 		EComponentInfo *info;
 		int sort_order;
 		GNOME_Evolution_Component iface;
@@ -211,10 +196,6 @@ query_components (EComponentRegistry *registry)
 		alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL);
 
 		icon_name = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_icon", NULL);
-		if (icon_name) {
-			icon = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_LARGE_TOOLBAR);
-			menuicon = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_MENU);
-		}
 
 		sort_order_string = bonobo_server_info_prop_lookup (& info_list->_buffer[i],
 								    "evolution:button_sort_order", NULL);
@@ -224,15 +205,11 @@ query_components (EComponentRegistry *registry)
 			sort_order = atoi (sort_order_string);
 
 		info = component_info_new (id, iface, alias, label, tooltips, menu_label,
-					   menu_accelerator, sort_order, icon, menuicon);
+					   menu_accelerator, icon_name, sort_order);
 		set_schemas (info, & info_list->_buffer [i]);
 
 		registry->priv->infos = g_slist_prepend (registry->priv->infos, info);
 
-		if (icon != NULL)
-			g_object_unref (icon);
-		if (menuicon != NULL)
-			g_object_unref (menuicon);
 		bonobo_object_release_unref(iface, NULL);
 	}
 	g_slist_free(languages);
diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
index 0c7ff03b0e..1d5943537c 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.h
@@ -73,10 +73,9 @@ struct _EComponentInfo {
 
 	char *button_label;
 	char *button_tooltips;
-	GdkPixbuf *button_icon;
 	char *menu_label;
 	char *menu_accelerator;
-	GdkPixbuf *menu_icon;
+	char *icon_name;
 
 	int sort_order;
 
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 4097a92314..5a8215df97 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -323,8 +323,8 @@ switch_view (EShellWindow *window, ComponentView *component_view)
 	} else
 		gtk_window_set_title (GTK_WINDOW (window), component_view->title);
 
-	if (info->button_icon)
-		gtk_window_set_icon (GTK_WINDOW (window), info->button_icon);
+	if (info->icon_name)
+		gtk_window_set_icon_name (GTK_WINDOW (window), info->icon_name);
 
 	gconf_client_set_string (gconf_client, "/apps/evolution/shell/view_defaults/component_id",
 				 (component_view->component_alias != NULL
diff --git a/shell/main.c b/shell/main.c
index 4cc2962494..f363d3bdd9 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -680,7 +680,7 @@ main (int argc, char **argv)
 				      NULL);
 
 #ifdef G_OS_WIN32
-	if (strcmp (_(""), "") == 0) {
+	if (strcmp (gettext (""), "") == 0) {
 		/* No message catalog installed for the current locale language,
 		 * so don't bother with the localisations provided by other things then
 		 * either. Reset thread locale to "en-US" and C library locale to "C".
diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c
index 3f2b39278c..88a7b05bf9 100644
--- a/shell/test/evolution-test-component.c
+++ b/shell/test/evolution-test-component.c
@@ -105,7 +105,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_TEST_ID;
 	list->_buffer[0].description = _("New Test");
-	list->_buffer[0].menuDescription = _("_Test");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Test");
 	list->_buffer[0].tooltip = _("Create a new test item");
 	list->_buffer[0].menuShortcut = 'i';
 	list->_buffer[0].iconName = "";
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 0e592dd46f..b6402cb979 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,26 @@
+2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #546788
+
+	* evolution-mail-message.xml: Drop unused "ViewNormal" cmd entry.
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #517825
+
+	* evolution.xml:
+	Fix duplicate mnemonic.  "_Work Offline" -> "Work _Offline"
+
+2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #542125
+
+	* evolution-editor.xml:
+	* evolution-event-editor.xml:
+	* evolution-memo-editor.xml:
+	* evolution-task-editor.xml:
+	Remove these files from source control.
+
 2008-06-21  Roshan Kumar Singh  <roshan.singh08@yahoo.com>
 
 	** Fix for bug #395636
diff --git a/ui/evolution-editor.xml b/ui/evolution-editor.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ui/evolution-editor.xml
+++ /dev/null
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ui/evolution-event-editor.xml
+++ /dev/null
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 5b0a29c57d..0acbc44647 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -214,10 +214,6 @@
      _tip="Force images in HTML mail to be loaded"
      accel="*Control*i" pixtype="pixbuf"/>
 
-    <cmd name="ViewNormal"
-     _tip="Show messages in the normal style"
-     type="radio" group="message_display"/>
-
     <cmd name="ViewSource"
      _tip="Show the raw email source of the message"
      accel="*Control*u"/>
diff --git a/ui/evolution-memo-editor.xml b/ui/evolution-memo-editor.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ui/evolution-memo-editor.xml
+++ /dev/null
diff --git a/ui/evolution-task-editor.xml b/ui/evolution-task-editor.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ui/evolution-task-editor.xml
+++ /dev/null
diff --git a/ui/evolution.xml b/ui/evolution.xml
index b17f6050ce..9b4231e888 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -52,7 +52,7 @@
     <cmd name="Settings" pixtype="stock" pixname="gtk-preferences"/>
 
     <cmd name="ToggleOffline" 
-      _label="_Work Offline"
+      _label="Work _Offline"
       _tip="Toggle whether we are working offline."/>
 
     <cmd name="HelpAbout" _label="About Evolution..."
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 3649c5b274..6833cf44d6 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,21 @@
+2008-07-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #543943
+
+	* e-activity-handler.c: (e_activity_handler_operation_set_error):
+	* e-task-bar.c: (e_task_bar_class_init), (impl_finalize):
+	Leak fix.
+
+2008-07-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #542587
+
+	* e-online-button.c:
+	* e-online-button.h:
+	New widget implements the online/offline button used in the main
+	window.  The button just maintains an "online" flag and displays
+	the appropriate button image for the flag.
+
 2008-17-14  Paolo Borelli  <pborelli@katamail.com>
 
 	** Fix for bug #542889
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 8500f72f61..04861b1b8f 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -612,6 +612,7 @@ e_activity_handler_operation_set_error(EActivityHandler *activity_handler,
 	activity_info->error = error;
 	activity_info->error_time = time (NULL);
 	activity_info->error_type = E_LOG_ERROR;
+	g_free (activity_info->information);
 	activity_info->information = g_strdup (g_object_get_data ((GObject *) error, "primary"));
 	for (sp = priv->task_bars; sp != NULL; sp = sp->next) {
 		ETaskBar *task_bar;
diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c
index c05c7d8999..9093f89d58 100644
--- a/widgets/misc/e-task-bar.c
+++ b/widgets/misc/e-task-bar.c
@@ -82,9 +82,15 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar)
 }
 #endif 
 
+
+static void impl_finalize (GObject *object);
+
 static void
 e_task_bar_class_init (ETaskBarClass *klass)
 {
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = impl_finalize;
 }
 
 static void
@@ -114,6 +120,20 @@ e_task_bar_init (ETaskBar *task_bar)
 	gtk_widget_set_size_request (GTK_WIDGET (task_bar), -1, height * 2);
 }
 
+static void
+impl_finalize (GObject *object)
+{
+	ETaskBar *task_bar;
+	ETaskBarPrivate *priv;
+
+	task_bar = E_TASK_BAR (object);
+	priv = task_bar->priv;
+
+	g_free (priv);
+
+	(* G_OBJECT_CLASS (e_task_bar_parent_class)->finalize) (object);
+}
+
 
 void
 e_task_bar_construct (ETaskBar *task_bar)
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 0798a43363..d5fe462ccd 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,22 @@
+2008-07-15  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #329821
+
+	* e-table-item.c: (find_cell): Do not consider last row's height
+	till the bottom.
+	* e-table-item.h: (e_table_item_compute_mouse_over):
+	* e-table-item.c: (e_table_item_compute_mouse_over):
+	* e-table-group-container.c: (etgc_compute_mouse_over),
+	(etgc_class_init):
+	* e-table-group-leaf.c: (etgl_compute_mouse_over), (etgl_class_init):
+	* e-table.h: (e_table_get_mouse_over_cell):
+	* e-table.c: (e_table_get_mouse_over_cell):
+	* e-table-group.h: (struct ETableGroupClass),
+	(e_table_group_compute_mouse_over):
+	* e-table-group.c: (e_table_group_compute_mouse_over),
+	(etg_class_init): Be able to calculate mouse-over position correctly,
+	relatively to the ETableItem.
+
 2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* e-table-example-1.c: (main):
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 56562fd5b6..2c61eee775 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -689,6 +689,32 @@ etgc_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
 }
 
 static void
+etgc_compute_mouse_over (ETableGroup *etg, int x, int y, int *row, int *col)
+{
+	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
+
+	if (row)
+		*row = -1;
+	if (col)
+		*col = -1;
+
+	x -= GROUP_INDENT;
+	y -= TITLE_HEIGHT;
+
+	if (x >= 0 && y >= 0 && etgc->children) {
+		GList *list;
+		for (list = etgc->children; list; list = list->next) {
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroup *child = child_node->child;
+
+			e_table_group_compute_mouse_over (child, x, y, row, col);
+			if ((*row != -1) && (*col != -1))
+				return;
+		}
+	}
+}
+
+static void
 etgc_get_cell_geometry (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
@@ -889,6 +915,7 @@ etgc_class_init (ETableGroupContainerClass *klass)
 	e_group_class->get_focus_column = etgc_get_focus_column;
 	e_group_class->get_printable = etgc_get_printable;
 	e_group_class->compute_location = etgc_compute_location;
+	e_group_class->compute_mouse_over = etgc_compute_mouse_over;
 	e_group_class->get_cell_geometry = etgc_get_cell_geometry;
 
 	g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS,
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index ce244d6e04..906208b62d 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -408,6 +408,14 @@ etgl_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
 }
 
 static void
+etgl_compute_mouse_over (ETableGroup *etg, int x, int y, int *row, int *col)
+{
+	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
+
+	e_table_item_compute_mouse_over (etgl->item, x, y, row, col);
+}
+
+static void
 etgl_get_cell_geometry (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
@@ -565,6 +573,7 @@ etgl_class_init (ETableGroupLeafClass *klass)
 	e_group_class->get_focus_column = etgl_get_focus_column;
 	e_group_class->get_printable = etgl_get_printable;
 	e_group_class->compute_location = etgl_compute_location;
+	e_group_class->compute_mouse_over = etgl_compute_mouse_over;
 	e_group_class->get_cell_geometry = etgl_get_cell_geometry;
 
 	g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS,
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 7316db8134..0c83c5f608 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -382,6 +382,16 @@ e_table_group_compute_location (ETableGroup *etg, int *x, int *y, int *row, int
 	ETG_CLASS (etg)->compute_location (etg, x, y, row, col);
 }
 
+void
+e_table_group_compute_mouse_over (ETableGroup *etg, int x, int y, int *row, int *col)
+{
+	g_return_if_fail (etg != NULL);
+	g_return_if_fail (E_IS_TABLE_GROUP (etg));
+
+	g_return_if_fail (ETG_CLASS (etg)->compute_mouse_over != NULL);
+	ETG_CLASS (etg)->compute_mouse_over (etg, x, y, row, col);
+}
+
 /**
  * e_table_group_get_position
  * @eti: %ETableGroup to look in.
@@ -639,6 +649,7 @@ etg_class_init (ETableGroupClass *klass)
 	klass->get_focus = etg_get_focus;
 	klass->get_printable = NULL;
 	klass->compute_location = NULL;
+	klass->compute_mouse_over = NULL;
 	klass->get_cell_geometry = NULL;
 
 	etg_signals [CURSOR_CHANGE] =
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index 490baf6dfa..c6bfd85096 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -90,6 +90,7 @@ typedef struct {
 	gint        (*get_focus_column)      (ETableGroup *etg);
 	EPrintable *(*get_printable)         (ETableGroup *etg);
 	void        (*compute_location)      (ETableGroup *etg, int *x, int *y, int *row, int *col);
+	void        (*compute_mouse_over)    (ETableGroup *etg, int x, int y, int *row, int *col);
 	void        (*get_cell_geometry)     (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height);
 
 } ETableGroupClass;
@@ -122,6 +123,11 @@ void          e_table_group_compute_location  (ETableGroup       *etg,
 					       int               *y,
 					       int               *row,
 					       int               *col);
+void          e_table_group_compute_mouse_over(ETableGroup       *etg,
+					       int                x,
+					       int                y,
+					       int               *row,
+					       int               *col);
 void          e_table_group_get_cell_geometry (ETableGroup       *etg,
 					       int               *row,
 					       int               *col,
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 3e29680574..a4ec641cc0 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -2171,12 +2171,15 @@ find_cell (ETableItem *eti, double x, double y, int *view_col_res, int *view_row
 		y1 = y2 = height_extra;
 		if (y < height_extra)
 			return FALSE;
-		for (row = 0; row < rows - 1; row++, y1 = y2){
+		for (row = 0; row < rows; row++, y1 = y2) {
 			y2 += ETI_ROW_HEIGHT (eti, row) + height_extra;
 
 			if (y <= y2)
 				break;
 		}
+
+		if (row == rows)
+			return FALSE;
 	}
 	*view_col_res = col;
 	if (x1_res)
@@ -3442,6 +3445,37 @@ e_table_item_compute_location (ETableItem        *eti,
 	eti->grabbed_row = grabbed_row;
 }
 
+/**
+ * e_table_item_compute_mouse_over:
+ * Similar to e_table_item_compute_location, only here recalculating
+ * the position inside the item too.
+ **/
+void
+e_table_item_compute_mouse_over (ETableItem        *eti,
+				 int                x,
+				 int                y,
+				 int               *row,
+				 int               *col)
+{
+	double realx, realy;
+	/* Save the grabbed row but make sure that we don't get flawed
+           results because the cursor is grabbed. */
+	int grabbed_row = eti->grabbed_row;
+	eti->grabbed_row = -1;
+
+	realx = x;
+	realy = y;
+
+	gnome_canvas_item_w2i (GNOME_CANVAS_ITEM (eti), &realx, &realy);
+
+	if (!find_cell (eti, (int)realx, (int)realy, col, row, NULL, NULL)) {
+		*row = -1;
+		*col = -1;
+	}
+
+	eti->grabbed_row = grabbed_row;
+}
+
 void
 e_table_item_get_cell_geometry   (ETableItem        *eti,
 				  int               *row,
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 39a5533837..ef3f4a542a 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -214,6 +214,11 @@ void        e_table_item_compute_location    (ETableItem        *eti,
 					      int               *y,
 					      int               *row,
 					      int               *col);
+void        e_table_item_compute_mouse_over  (ETableItem        *eti,
+					      int                x,
+					      int                y,
+					      int               *row,
+					      int               *col);
 void        e_table_item_get_cell_geometry   (ETableItem        *eti,
 					      int               *row,
 					      int               *col,
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 6ee1a93cbd..c260199ecb 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -2414,6 +2414,24 @@ e_table_get_cell_geometry (ETable *table,
 }
 
 /**
+ * e_table_get_mouse_over_cell:
+ * Similar to e_table_get_cell_at, only here we recalculate x,y relatively to each item.
+ **/
+void
+e_table_get_mouse_over_cell (ETable *table, int x, int y, int *row, int *col)
+{
+	g_return_if_fail (table != NULL);
+	g_return_if_fail (E_IS_TABLE (table));
+
+	x += GTK_LAYOUT (table->table_canvas)->hadjustment->value;
+	y += GTK_LAYOUT (table->table_canvas)->vadjustment->value;
+
+	y -= E_TABLE_HEADER_ITEM (table->header_item)->height;
+
+	e_table_group_compute_mouse_over (table->group, x, y, row, col);
+}
+
+/**
  * e_table_get_selection_model:
  * @table: The #ETable to query
  *
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index acfbc0d879..1dd873e04e 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -283,6 +283,7 @@ void             e_table_get_cell_at               (ETable               *table,
 						    int                   y,
 						    int                  *row_return,
 						    int                  *col_return);
+void e_table_get_mouse_over_cell (ETable *table, int x, int y, int *row, int *col);
 void             e_table_get_cell_geometry         (ETable               *table,
 						    int                   row,
 						    int                   col,